diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lfm b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lfm
index 1849fd0d33..d581f17d4a 100644
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lfm
+++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lfm
@@ -3,22 +3,34 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
   Width = 345
   ClientHeight = 337
   ClientWidth = 345
+  OnResize = FrameResize
+  TabOrder = 0
   DesignLeft = 492
   DesignTop = 329
   object Label1: TLabel[0]
-    Left = 8
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
     Height = 14
-    Top = 4
+    Top = 6
     Width = 148
+    BorderSpacing.Around = 6
     Caption = 'Block styles: use a new line at:'
     ParentColor = False
   end
   object rgLabelBegin: TRadioGroup[1]
-    Left = 8
-    Height = 89
-    Top = 30
-    Width = 149
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = rgLabel
+    Left = 6
+    Height = 81
+    Top = 26
+    Width = 157
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Label with begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -28,8 +40,8 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
-    ClientWidth = 145
+    ClientHeight = 63
+    ClientWidth = 153
     Items.Strings = (
       'Always'
       'Leave as is'
@@ -38,11 +50,20 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     TabOrder = 0
   end
   object rgLabel: TRadioGroup[2]
-    Left = 163
-    Height = 89
-    Top = 30
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = rgLabelBegin
+    AnchorSideBottom.Side = asrBottom
+    Left = 169
+    Height = 81
+    Top = 26
     Width = 170
+    Anchors = [akTop, akRight, akBottom]
     AutoFill = True
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'Label without begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -52,7 +73,7 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
+    ClientHeight = 63
     ClientWidth = 166
     Items.Strings = (
       'Always'
@@ -62,11 +83,21 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     TabOrder = 1
   end
   object rgCaseLabel: TRadioGroup[3]
-    Left = 163
-    Height = 89
-    Top = 125
+    AnchorSideLeft.Control = rgLabel
+    AnchorSideTop.Control = rgLabel
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = rgCaseBegin
+    AnchorSideBottom.Side = asrBottom
+    Left = 169
+    Height = 81
+    Top = 113
     Width = 170
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'Case without begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -76,7 +107,7 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
+    ClientHeight = 63
     ClientWidth = 166
     Items.Strings = (
       'Always'
@@ -86,11 +117,21 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     TabOrder = 3
   end
   object rgElseCase: TRadioGroup[4]
-    Left = 163
-    Height = 89
-    Top = 220
+    AnchorSideLeft.Control = rgLabel
+    AnchorSideTop.Control = rgCaseLabel
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = rgCaseElseBegin
+    AnchorSideBottom.Side = asrBottom
+    Left = 169
+    Height = 81
+    Top = 200
     Width = 170
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'Else case without begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -100,7 +141,7 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
+    ClientHeight = 63
     ClientWidth = 166
     Items.Strings = (
       'Always'
@@ -110,11 +151,18 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     TabOrder = 5
   end
   object rgCaseBegin: TRadioGroup[5]
-    Left = 8
-    Height = 89
-    Top = 125
-    Width = 149
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = rgLabelBegin
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = rgLabel
+    Left = 6
+    Height = 81
+    Top = 113
+    Width = 157
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Case with begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -124,8 +172,8 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
-    ClientWidth = 145
+    ClientHeight = 63
+    ClientWidth = 153
     Items.Strings = (
       'Always'
       'Leave as is'
@@ -134,11 +182,18 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     TabOrder = 2
   end
   object rgCaseElseBegin: TRadioGroup[6]
-    Left = 8
-    Height = 89
-    Top = 220
-    Width = 149
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = rgCaseBegin
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = rgLabel
+    Left = 6
+    Height = 81
+    Top = 200
+    Width = 157
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Else case with begin'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -148,8 +203,8 @@ inherited fClarifyCaseBlocks: TfClarifyCaseBlocks
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 71
-    ClientWidth = 145
+    ClientHeight = 63
+    ClientWidth = 153
     Items.Strings = (
       'Always'
       'Leave as is'
diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
index c51f142ab8..47312bdb02 100644
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
@@ -47,6 +47,7 @@ type
     rgElseCase: TRadioGroup;
     rgCaseBegin: TRadioGroup;
     rgCaseElseBegin: TRadioGroup;
+    procedure FrameResize(Sender:TObject);
   public
     constructor Create(AOwner: TComponent); override;
 
@@ -64,6 +65,11 @@ implementation
 uses
   JcfSettings, SettingsTypes, JcfHelp, jcfuiconsts;
 
+procedure TfClarifyCaseBlocks.FrameResize(Sender:TObject);
+begin
+  rgLabel.Width := (Width-18) div 2;
+end;
+
 constructor TfClarifyCaseBlocks.Create(AOwner: TComponent);
 begin
   inherited;