diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs
index 385c2ea..e939fc9 100644
--- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs
+++ b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.Designer.cs
@@ -31,10 +31,10 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlyoutDialogBase));
             radButton_Cancel = new global::Telerik.WinControls.UI.RadButton();
             radButton_Confirm = new global::Telerik.WinControls.UI.RadButton();
-            panel_ActionButtons = new System.Windows.Forms.Panel();
+            tableLayoutPanel_ActionButtons = new TableLayoutPanel();
             ((System.ComponentModel.ISupportInitialize)radButton_Cancel).BeginInit();
             ((System.ComponentModel.ISupportInitialize)radButton_Confirm).BeginInit();
-            panel_ActionButtons.SuspendLayout();
+            tableLayoutPanel_ActionButtons.SuspendLayout();
             SuspendLayout();
             // 
             // radButton_Cancel
@@ -49,22 +49,22 @@
             radButton_Confirm.Name = "radButton_Confirm";
             radButton_Confirm.Click += RadButton_Confirm_Click;
             // 
-            // panel_ActionButtons
+            // tableLayoutPanel_ActionButtons
             // 
-            panel_ActionButtons.Controls.Add(radButton_Cancel);
-            panel_ActionButtons.Controls.Add(radButton_Confirm);
-            resources.ApplyResources(panel_ActionButtons, "panel_ActionButtons");
-            panel_ActionButtons.Name = "panel_ActionButtons";
+            resources.ApplyResources(tableLayoutPanel_ActionButtons, "tableLayoutPanel_ActionButtons");
+            tableLayoutPanel_ActionButtons.Controls.Add(radButton_Confirm, 1, 0);
+            tableLayoutPanel_ActionButtons.Controls.Add(radButton_Cancel, 2, 0);
+            tableLayoutPanel_ActionButtons.Name = "tableLayoutPanel_ActionButtons";
             // 
             // FlyoutDialogBase
             // 
             resources.ApplyResources(this, "$this");
-            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            Controls.Add(panel_ActionButtons);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(tableLayoutPanel_ActionButtons);
             Name = "FlyoutDialogBase";
             ((System.ComponentModel.ISupportInitialize)radButton_Cancel).EndInit();
             ((System.ComponentModel.ISupportInitialize)radButton_Confirm).EndInit();
-            panel_ActionButtons.ResumeLayout(false);
+            tableLayoutPanel_ActionButtons.ResumeLayout(false);
             ResumeLayout(false);
         }
 
@@ -72,6 +72,6 @@
 
         private global::Telerik.WinControls.UI.RadButton radButton_Cancel;
         private global::Telerik.WinControls.UI.RadButton radButton_Confirm;
-        private System.Windows.Forms.Panel panel_ActionButtons;
+        private TableLayoutPanel tableLayoutPanel_ActionButtons;
     }
 }
diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs
index 1f08bf2..303d188 100644
--- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs
+++ b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.cs
@@ -26,8 +26,14 @@ namespace Pilz.UI.Telerik.Dialogs
 
         protected bool ActionPanelVisible
         {
-            get => panel_ActionButtons.Visible;
-            set => panel_ActionButtons.Visible = value;
+            get => tableLayoutPanel_ActionButtons.Visible;
+            set => tableLayoutPanel_ActionButtons.Visible = value;
+        }
+
+        protected bool CancelButtonVisible
+        {
+            get => radButton_Cancel.Visible;
+            set => radButton_Cancel.Visible = value;
         }
 
         protected bool CancelButtonEnable
diff --git a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx
index ce650cc..4b80548 100644
--- a/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx
+++ b/Pilz.UI.Telerik/Dialogs/FlyoutDialogBase.resx
@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>
@@ -151,10 +151,10 @@
     <value>Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
   </data>
   <data name="&gt;&gt;radButton_Cancel.Parent" xml:space="preserve">
-    <value>panel_ActionButtons</value>
+    <value>tableLayoutPanel_ActionButtons</value>
   </data>
   <data name="&gt;&gt;radButton_Cancel.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="radButton_Confirm.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -187,35 +187,44 @@
     <value>Telerik.WinControls.UI.RadButton, Telerik.WinControls.UI, Culture=neutral, PublicKeyToken=5bb2a467cbec794e</value>
   </data>
   <data name="&gt;&gt;radButton_Confirm.Parent" xml:space="preserve">
-    <value>panel_ActionButtons</value>
+    <value>tableLayoutPanel_ActionButtons</value>
   </data>
   <data name="&gt;&gt;radButton_Confirm.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>0</value>
   </data>
-  <data name="panel_ActionButtons.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="tableLayoutPanel_ActionButtons.ColumnCount" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="tableLayoutPanel_ActionButtons.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Bottom</value>
   </data>
-  <data name="panel_ActionButtons.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="tableLayoutPanel_ActionButtons.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 120</value>
   </data>
-  <data name="panel_ActionButtons.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tableLayoutPanel_ActionButtons.RowCount" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="tableLayoutPanel_ActionButtons.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 30</value>
   </data>
-  <data name="panel_ActionButtons.TabIndex" type="System.Int32, mscorlib">
+  <data name="tableLayoutPanel_ActionButtons.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="&gt;&gt;panel_ActionButtons.Name" xml:space="preserve">
-    <value>panel_ActionButtons</value>
+  <data name="&gt;&gt;tableLayoutPanel_ActionButtons.Name" xml:space="preserve">
+    <value>tableLayoutPanel_ActionButtons</value>
   </data>
-  <data name="&gt;&gt;panel_ActionButtons.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;tableLayoutPanel_ActionButtons.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;panel_ActionButtons.Parent" xml:space="preserve">
+  <data name="&gt;&gt;tableLayoutPanel_ActionButtons.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;panel_ActionButtons.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;tableLayoutPanel_ActionButtons.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="tableLayoutPanel_ActionButtons.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="radButton_Confirm" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radButton_Cancel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Absolute,30" /&gt;&lt;/TableLayoutSettings&gt;</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>