diff --git a/components/idescout/idescoutoptions.lfm b/components/idescout/idescoutoptions.lfm
index 9a8fdbaee0..664100be08 100644
--- a/components/idescout/idescoutoptions.lfm
+++ b/components/idescout/idescoutoptions.lfm
@@ -11,22 +11,24 @@ object IDEScoutOptionsFrame: TIDEScoutOptionsFrame
   DesignTop = 164
   object CGSearch: TCheckGroup
     Left = 0
-    Height = 168
+    Height = 151
     Top = 0
     Width = 427
     Align = alTop
     AutoFill = True
+    AutoSize = True
     Caption = 'Search in'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
+    ChildSizing.VerticalSpacing = 6
     ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
     ChildSizing.EnlargeVertical = crsHomogenousChildResize
     ChildSizing.ShrinkHorizontal = crsScaleChilds
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 150
-    ClientWidth = 425
+    ClientHeight = 131
+    ClientWidth = 423
     Items.Strings = (
       'Commands'
       'Recent Projects'
@@ -34,7 +36,6 @@ object IDEScoutOptionsFrame: TIDEScoutOptionsFrame
       'Recent Packages'
       'Components'
     )
-    OnClick = CGSearchClick
     OnItemClick = CGSearchItemClick
     TabOrder = 0
     Data = {
@@ -43,73 +44,100 @@ object IDEScoutOptionsFrame: TIDEScoutOptionsFrame
   end
   object Options: TGroupBox
     Left = 0
-    Height = 105
-    Top = 168
+    Height = 76
+    Top = 151
     Width = 427
     Align = alTop
+    AutoSize = True
     Caption = 'Options'
-    ClientHeight = 87
-    ClientWidth = 425
+    ClientHeight = 56
+    ClientWidth = 423
     TabOrder = 1
     object CBShowShortCut: TCheckBox
-      Left = 8
-      Height = 22
-      Top = 39
-      Width = 190
+      AnchorSideLeft.Control = Options
+      AnchorSideTop.Control = Options
+      Left = 6
+      Height = 19
+      Top = 6
+      Width = 178
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
       Caption = 'Show Sh&ortcut when available'
       TabOrder = 0
     end
     object CBShowCategory: TCheckBox
-      Left = 8
-      Height = 22
-      Top = 8
-      Width = 194
+      AnchorSideLeft.Control = Options
+      AnchorSideTop.Control = CBShowShortCut
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 19
+      Top = 31
+      Width = 181
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
       Caption = 'Show &Category when available'
       TabOrder = 1
     end
   end
   object Colors: TGroupBox
     Left = 0
-    Height = 100
-    Top = 273
+    Height = 69
+    Top = 227
     Width = 427
     Align = alTop
+    AutoSize = True
     Caption = 'Colors'
-    ClientHeight = 82
-    ClientWidth = 425
+    ClientHeight = 49
+    ClientWidth = 423
     TabOrder = 2
     object CBMatchColor: TColorBox
-      Left = 96
-      Height = 31
-      Top = 16
-      Width = 100
+      AnchorSideLeft.Control = LCBMatchColor
+      AnchorSideTop.Control = LCBMatchColor
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 22
+      Top = 21
+      Width = 150
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbCustomColors]
-      ItemHeight = 0
+      ItemHeight = 16
       TabOrder = 0
     end
     object CBShortCutColor: TColorBox
-      Left = 96
-      Height = 31
-      Top = 48
-      Width = 100
+      AnchorSideLeft.Control = LCBShortCut
+      AnchorSideTop.Control = LCBShortCut
+      AnchorSideTop.Side = asrBottom
+      Left = 174
+      Height = 22
+      Top = 21
+      Width = 150
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbCustomColors]
-      ItemHeight = 0
+      BorderSpacing.Bottom = 6
+      ItemHeight = 16
       TabOrder = 1
     end
     object LCBMatchColor: TLabel
-      Left = 8
-      Height = 17
-      Top = 16
-      Width = 48
+      AnchorSideLeft.Control = Colors
+      AnchorSideTop.Control = Colors
+      Left = 6
+      Height = 15
+      Top = 6
+      Width = 45
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
       Caption = '&Matches'
       FocusControl = CBMatchColor
       ParentColor = False
     end
     object LCBShortCut: TLabel
-      Left = 8
-      Height = 17
-      Top = 48
-      Width = 69
+      AnchorSideLeft.Control = CBMatchColor
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = LCBMatchColor
+      Left = 174
+      Height = 15
+      Top = 6
+      Width = 66
+      BorderSpacing.Left = 18
       Caption = '&Shortcut key'
       FocusControl = CBShortCutColor
       ParentColor = False
@@ -117,56 +145,81 @@ object IDEScoutOptionsFrame: TIDEScoutOptionsFrame
   end
   object GBComponents: TGroupBox
     Left = 0
-    Height = 105
-    Top = 373
+    Height = 80
+    Top = 296
     Width = 427
     Align = alTop
+    AutoSize = True
     Caption = 'Components'
-    ClientHeight = 87
-    ClientWidth = 425
+    ClientHeight = 60
+    ClientWidth = 423
     TabOrder = 3
     object CBSelectComponent: TCheckBox
-      Left = 8
-      Height = 22
-      Top = 16
-      Width = 210
+      AnchorSideLeft.Control = GBComponents
+      AnchorSideTop.Control = GBComponents
+      Left = 6
+      Height = 19
+      Top = 6
+      Width = 199
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
       Caption = 'Only select on component palette'
       TabOrder = 0
     end
     object SEComponentDefaultWidth: TSpinEdit
-      Left = 98
-      Height = 27
-      Top = 58
+      AnchorSideLeft.Control = LSEComponentDefaultWidth
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = CBSelectComponent
+      AnchorSideTop.Side = asrBottom
+      Left = 83
+      Height = 23
+      Top = 31
       Width = 54
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
       TabOrder = 1
     end
-    object Label1: TLabel
-      Left = 8
-      Height = 27
-      Top = 58
-      Width = 80
+    object LSEComponentDefaultWidth: TLabel
+      AnchorSideLeft.Control = CBSelectComponent
+      AnchorSideTop.Control = SEComponentDefaultWidth
+      AnchorSideTop.Side = asrCenter
+      Left = 6
+      Height = 15
+      Top = 35
+      Width = 71
       Alignment = taRightJustify
-      AutoSize = False
+      BorderSpacing.Bottom = 6
       Caption = 'Default width'
       Layout = tlCenter
       ParentColor = False
     end
-    object LComponentheight: TLabel
-      Left = 163
-      Height = 27
-      Top = 58
-      Width = 53
+    object LSEComponentDefaultHeight: TLabel
+      AnchorSideLeft.Control = SEComponentDefaultWidth
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = LSEComponentDefaultWidth
+      AnchorSideTop.Side = asrCenter
+      Left = 155
+      Height = 15
+      Top = 35
+      Width = 75
       Alignment = taRightJustify
-      AutoSize = False
-      Caption = 'height'
+      BorderSpacing.Left = 18
+      BorderSpacing.Bottom = 6
+      Caption = 'Default height'
       Layout = tlCenter
       ParentColor = False
     end
     object SEComponentDefaultHeight: TSpinEdit
-      Left = 224
-      Height = 27
-      Top = 58
+      AnchorSideLeft.Control = LSEComponentDefaultHeight
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = LSEComponentDefaultHeight
+      AnchorSideTop.Side = asrCenter
+      Left = 236
+      Height = 23
+      Top = 31
       Width = 66
+      BorderSpacing.Left = 6
       TabOrder = 2
     end
   end
diff --git a/components/idescout/idescoutoptions.pas b/components/idescout/idescoutoptions.pas
index 668267ca00..30916efbba 100644
--- a/components/idescout/idescoutoptions.pas
+++ b/components/idescout/idescoutoptions.pas
@@ -39,7 +39,7 @@ uses
   // LCL
   Forms, StdCtrls, Dialogs, Spin, ExtCtrls, ColorBox,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, IDEUtils, frmScout;
+  IDEOptionsIntf, IDEOptEditorIntf, frmScout;
 
 
 Type
@@ -54,14 +54,13 @@ Type
     CBSelectComponent: TCheckBox;
     Colors: TGroupBox;
     GBComponents: TGroupBox;
-    Label1: TLabel;
-    LComponentheight: TLabel;
+    LSEComponentDefaultWidth: TLabel;
+    LSEComponentDefaultHeight: TLabel;
     LCBShortCut: TLabel;
     LCBMatchColor: TLabel;
     Options: TGroupBox;
     SEComponentDefaultWidth: TSpinEdit;
     SEComponentDefaultHeight: TSpinEdit;
-    procedure CGSearchClick(Sender: TObject);
     procedure CGSearchItemClick(Sender: TObject; Index: integer);
   private
   public
@@ -78,11 +77,6 @@ implementation
 
 { TIDEScoutOptionsFrame }
 
-procedure TIDEScoutOptionsFrame.CGSearchClick(Sender: TObject);
-begin
-
-end;
-
 procedure TIDEScoutOptionsFrame.CGSearchItemClick(Sender: TObject;
   Index: integer);
 begin