diff --git a/src/Connected.Components/Components/ModalDialog.razor b/src/Connected.Components/Components/ModalDialog.razor
index 52125cb..8e84da8 100644
--- a/src/Connected.Components/Components/ModalDialog.razor
+++ b/src/Connected.Components/Components/ModalDialog.razor
@@ -3,9 +3,12 @@
     <div class="modal fade show" tabindex="-1" @onclick="@CloseIfEnabled" @onkeydown="@(e => CheckEscape(e))">
         <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered" >
             <div class="modal-content" @onclick="PreventClose">
-                <div class="modal-header" >
-                    <h3 class="modal-title">@Title</h3>
+                @if (!ModalOptions.NoHeader)
+                {
+                    <div class="modal-header" >
+                        <h3 class="modal-title">@Title</h3>
                 </div>
+                }
                 <div class="modal-body">
                     @Content
                 </div>
diff --git a/src/Connected.Components/Components/ModalDialog.razor.cs b/src/Connected.Components/Components/ModalDialog.razor.cs
index 5bc0c58..e918da2 100644
--- a/src/Connected.Components/Components/ModalDialog.razor.cs
+++ b/src/Connected.Components/Components/ModalDialog.razor.cs
@@ -13,7 +13,11 @@ public partial class ModalDialog: IDisposable
 	protected RenderFragment? Content { get; set; }
 
 	protected bool OverlayClickToClose { get; set; } = true;
-	protected Event OnConfirm { get; set; }
+	protected Event? OnOk { get; set; }
+
+	protected Event? OnClose { get; set; }
+
+	protected ModalOptions? ModalOptions { get; set; }
 
 	protected override void OnInitialized()
 	{
@@ -22,7 +26,7 @@ public partial class ModalDialog: IDisposable
 	}
 
 
-	public void ShowModal(string title, RenderFragment content, Event onConfirm, string CancelButtonText = "Cancel", string OKButtonText = "OK")
+	public void ShowModal(string title, RenderFragment content, Event OnOk = null, Event OnClose = null, ModalOptions options = null, string CancelButtonText = "Cancel", string OKButtonText = "OK")
 	{
 		Title = title;
 		Content = content;
@@ -31,7 +35,10 @@ public partial class ModalDialog: IDisposable
 		this.OKButtonText = OKButtonText;
 		this.CancelButtonText = CancelButtonText;
 
-		OnConfirm = onConfirm;
+		ModalOptions = options;
+
+		this.OnOk = OnOk;
+		this.OnClose = OnClose;
 
 		StateHasChanged();
 	}
@@ -42,7 +49,16 @@ public partial class ModalDialog: IDisposable
 		Title = "";
 		Content = null;
 		if (OkClicked)
-			OnConfirm.Delegate.DynamicInvoke(OnConfirm.args);
+		{
+			if (OnOk is not null)
+				OnOk.Delegate.DynamicInvoke(OnOk.args);
+		}
+		else
+		{
+			if (OnClose is not null)
+				OnClose.Delegate.DynamicInvoke(OnClose.args);
+		}
+
 		StateHasChanged();
 	}
 
diff --git a/src/Connected.Components/Services/Modal/ModalDialogService.cs b/src/Connected.Components/Services/Modal/ModalDialogService.cs
index 7bd145d..83bc365 100644
--- a/src/Connected.Components/Services/Modal/ModalDialogService.cs
+++ b/src/Connected.Components/Services/Modal/ModalDialogService.cs
@@ -3,18 +3,18 @@
 namespace Connected.Services.Modal;
 public class ModalDialogService
 {
-	public event Action<string, RenderFragment, Event, string, string> OnShow;
+	public event Action<string, RenderFragment, Event, Event, ModalOptions, string, string> OnShow;
 	public event Action<bool> OnClose;
 
-	public void ShowDialog(string title, RenderFragment content, Event OnConfirm, string CancelButtonText="Cancel", string OKButtonText="OK")
+	public void ShowDialog(string title, RenderFragment content, Event OnConfirm, Event OnCancel, ModalOptions options, string CancelButtonText="Cancel", string OKButtonText="OK")
 	{
-		OnShow?.Invoke(title, content, OnConfirm, OKButtonText, CancelButtonText);
+		OnShow?.Invoke(title, content, OnConfirm, OnCancel, options, OKButtonText, CancelButtonText);
 	}
 
-	public void ShowDialog(string title, MarkupString contentMarkup, Event OnConfirm, string CancelButtonText = "Cancel", string OKButtonText = "OK")
+	public void ShowDialog(string title, MarkupString contentMarkup, Event OnConfirm, Event OnCancel, ModalOptions options, string CancelButtonText = "Cancel", string OKButtonText = "OK")
 	{
 		var content = new RenderFragment(x => x.AddContent(1, contentMarkup));
-		OnShow?.Invoke(title, content, OnConfirm, OKButtonText, CancelButtonText);
+		OnShow?.Invoke(title, content, OnConfirm, OnCancel, options, OKButtonText, CancelButtonText);
 	}
 
 	public void Close(bool OkClicked)
diff --git a/src/Connected.Components/Services/Modal/ModalOptions.cs b/src/Connected.Components/Services/Modal/ModalOptions.cs
new file mode 100644
index 0000000..7f44f94
--- /dev/null
+++ b/src/Connected.Components/Services/Modal/ModalOptions.cs
@@ -0,0 +1,9 @@
+namespace Connected.Services.Modal;
+public class ModalOptions
+{
+	public bool CloseOnEscKey { get; set; } = true;
+	public bool DisableBackdropCLick { get; set; } = false;
+	public bool NoHeader { get; set; } = false;
+
+
+}