diff --git a/components/nicegrid/demos/Basic Demo/common/main.lfm b/components/nicegrid/demos/Basic Demo/common/main.lfm
index 51da4e8fb..0aa297cbf 100644
--- a/components/nicegrid/demos/Basic Demo/common/main.lfm	
+++ b/components/nicegrid/demos/Basic Demo/common/main.lfm	
@@ -102,11 +102,14 @@ object MainForm: TMainForm
     TabOrder = 1
   end
   object CheckBox2: TCheckBox
-    Left = 88
+    AnchorSideLeft.Control = CheckBox1
+    AnchorSideLeft.Side = asrBottom
+    Left = 69
     Height = 19
     Top = 464
     Width = 93
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = 'System Colors'
     Checked = True
     OnClick = CheckBox2Click
@@ -114,31 +117,40 @@ object MainForm: TMainForm
     TabOrder = 2
   end
   object CheckBox3: TCheckBox
-    Left = 192
+    AnchorSideLeft.Control = CheckBox2
+    AnchorSideLeft.Side = asrBottom
+    Left = 178
     Height = 19
     Top = 464
     Width = 80
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = 'Fit to Width'
     OnClick = CheckBox3Click
     TabOrder = 3
   end
   object CheckBox4: TCheckBox
-    Left = 288
+    AnchorSideLeft.Control = CheckBox3
+    AnchorSideLeft.Side = asrBottom
+    Left = 274
     Height = 19
     Top = 464
     Width = 125
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = 'Auto Column Width'
     OnClick = CheckBox4Click
     TabOrder = 4
   end
   object CheckBox5: TCheckBox
-    Left = 424
+    AnchorSideLeft.Control = CheckBox4
+    AnchorSideLeft.Side = asrBottom
+    Left = 415
     Height = 19
     Top = 464
     Width = 77
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = 'Show Grids'
     Checked = True
     OnClick = CheckBox5Click
@@ -146,11 +158,14 @@ object MainForm: TMainForm
     TabOrder = 5
   end
   object Button1: TButton
-    Left = 272
+    AnchorSideLeft.Control = Button3
+    AnchorSideLeft.Side = asrBottom
+    Left = 284
     Height = 25
     Top = 501
     Width = 129
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = '&Hide 3rd Column'
     OnClick = Button1Click
     TabOrder = 8
@@ -159,39 +174,50 @@ object MainForm: TMainForm
     Left = 16
     Height = 25
     Top = 501
-    Width = 121
+    Width = 108
     Anchors = [akLeft, akBottom]
+    AutoSize = True
     Caption = '&Insert New Row'
     OnClick = Button2Click
     TabOrder = 6
   end
   object Button3: TButton
-    Left = 144
+    AnchorSideLeft.Control = Button2
+    AnchorSideLeft.Side = asrBottom
+    Left = 140
     Height = 25
     Top = 501
-    Width = 121
+    Width = 128
     Anchors = [akLeft, akBottom]
+    AutoSize = True
+    BorderSpacing.Left = 16
     Caption = '&Delete Current Row'
     OnClick = Button3Click
     TabOrder = 7
   end
   object Button4: TButton
-    Left = 416
+    AnchorSideLeft.Control = Button1
+    AnchorSideLeft.Side = asrBottom
+    Left = 429
     Height = 25
     Top = 501
     Width = 182
     Anchors = [akLeft, akBottom]
     AutoSize = True
+    BorderSpacing.Left = 16
     Caption = 'Toggle ReadOnly 3rd Column'
     OnClick = Button4Click
     TabOrder = 9
   end
   object CheckBox6: TCheckBox
-    Left = 528
+    AnchorSideLeft.Control = CheckBox5
+    AnchorSideLeft.Side = asrBottom
+    Left = 508
     Height = 19
     Top = 464
     Width = 84
     Anchors = [akLeft, akBottom]
+    BorderSpacing.Left = 16
     Caption = 'Show Footer'
     OnClick = CheckBox6Click
     TabOrder = 10