diff --git a/applications/lazstats/LazStats.chm b/applications/lazstats/LazStats.chm
index 8f3265f4f..f98372c09 100644
Binary files a/applications/lazstats/LazStats.chm and b/applications/lazstats/LazStats.chm differ
diff --git a/applications/lazstats/docs/HelpNDoc/LazStats.hnd b/applications/lazstats/docs/HelpNDoc/LazStats.hnd
index 0183a4891..448532c4c 100644
Binary files a/applications/lazstats/docs/HelpNDoc/LazStats.hnd and b/applications/lazstats/docs/HelpNDoc/LazStats.hnd differ
diff --git a/applications/lazstats/source/forms/simulations/corsimunit.lfm b/applications/lazstats/source/forms/simulations/corsimunit.lfm
index e0da63fb7..e89a69d31 100644
--- a/applications/lazstats/source/forms/simulations/corsimunit.lfm
+++ b/applications/lazstats/source/forms/simulations/corsimunit.lfm
@@ -31,8 +31,9 @@ inherited CorSimForm: TCorSimForm
     inherited HelpBtn: TButton
       Left = 7
       Top = 406
+      HelpType = htKeyword
+      HelpKeyword = 'html/BivariateScatterPlot.htm'
       TabOrder = 7
-      Visible = False
     end
     inherited ButtonBevel: TBevel
       Top = 390
@@ -42,18 +43,18 @@ inherited CorSimForm: TCorSimForm
       AnchorSideLeft.Control = ParamsPanel
       AnchorSideTop.Control = MeanXEdit
       AnchorSideTop.Side = asrCenter
-      Left = 0
+      Left = 12
       Height = 15
       Top = 4
-      Width = 43
-      Caption = 'Mean X:'
-      ParentColor = False
+      Width = 40
+      BorderSpacing.Left = 12
+      Caption = 'Mean X'
     end
     object MeanXEdit: TEdit[6]
       AnchorSideLeft.Control = Label1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ParamsPanel
-      Left = 51
+      Left = 60
       Height = 23
       Top = 0
       Width = 60
@@ -66,12 +67,12 @@ inherited CorSimForm: TCorSimForm
       AnchorSideLeft.Control = ParamsPanel
       AnchorSideTop.Control = MeanYEdit
       AnchorSideTop.Side = asrCenter
-      Left = 0
+      Left = 12
       Height = 15
       Top = 35
-      Width = 43
-      Caption = 'Mean Y:'
-      ParentColor = False
+      Width = 40
+      BorderSpacing.Left = 12
+      Caption = 'Mean Y'
     end
     object MeanYEdit: TEdit[8]
       AnchorSideLeft.Control = MeanXEdit
@@ -79,7 +80,7 @@ inherited CorSimForm: TCorSimForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = MeanXEdit
       AnchorSideRight.Side = asrBottom
-      Left = 51
+      Left = 60
       Height = 23
       Top = 31
       Width = 60
@@ -90,28 +91,32 @@ inherited CorSimForm: TCorSimForm
       Text = 'MeanYEdit'
     end
     object Label3: TLabel[9]
-      AnchorSideLeft.Control = MeanXEdit
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = StdDevXEdit
       AnchorSideTop.Side = asrCenter
-      Left = 135
+      AnchorSideRight.Control = StdDevXEdit
+      Left = 134
       Height = 15
       Top = 4
-      Width = 50
+      Width = 53
+      Anchors = [akTop, akRight]
       BorderSpacing.Left = 24
-      Caption = 'Std.Dev.X'
-      ParentColor = False
+      Caption = 'Std.Dev. X'
     end
     object StdDevXEdit: TEdit[10]
       AnchorSideLeft.Control = Label3
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ParamsPanel
-      Left = 193
+      AnchorSideRight.Control = ParamsPanel
+      AnchorSideRight.Side = asrBottom
+      Left = 195
       Height = 23
       Top = 0
       Width = 60
       Alignment = taRightJustify
+      Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
+      BorderSpacing.Right = 12
       TabOrder = 1
       Text = 'StdDevXEdit'
     end
@@ -119,19 +124,18 @@ inherited CorSimForm: TCorSimForm
       AnchorSideLeft.Control = Label3
       AnchorSideTop.Control = StdDevYEdit
       AnchorSideTop.Side = asrCenter
-      Left = 135
+      Left = 134
       Height = 15
       Top = 35
-      Width = 50
-      Caption = 'Std.Dev.Y'
-      ParentColor = False
+      Width = 53
+      Caption = 'Std.Dev. Y'
     end
     object StdDevYEdit: TEdit[12]
       AnchorSideLeft.Control = StdDevXEdit
       AnchorSideTop.Control = MeanYEdit
       AnchorSideRight.Control = StdDevXEdit
       AnchorSideRight.Side = asrBottom
-      Left = 193
+      Left = 195
       Height = 23
       Top = 31
       Width = 60
@@ -145,7 +149,7 @@ inherited CorSimForm: TCorSimForm
       AnchorSideTop.Control = CorrEdit
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = CorrEdit
-      Left = 51
+      Left = 62
       Height = 15
       Top = 82
       Width = 76
@@ -153,13 +157,13 @@ inherited CorSimForm: TCorSimForm
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
       Caption = 'Correlation XY'
-      ParentColor = False
     end
     object CorrEdit: TEdit[14]
-      AnchorSideLeft.Control = Label3
+      AnchorSideLeft.Control = Bevel1
+      AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = MeanYEdit
       AnchorSideTop.Side = asrBottom
-      Left = 135
+      Left = 146
       Height = 23
       Top = 78
       Width = 60
@@ -173,7 +177,7 @@ inherited CorSimForm: TCorSimForm
       AnchorSideTop.Control = NumObsEdit
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = NumObsEdit
-      Left = 92
+      Left = 103
       Height = 15
       Top = 113
       Width = 35
@@ -181,7 +185,6 @@ inherited CorSimForm: TCorSimForm
       BorderSpacing.Left = 16
       BorderSpacing.Right = 8
       Caption = 'N Size:'
-      ParentColor = False
     end
     object NumObsEdit: TEdit[16]
       AnchorSideLeft.Control = CorrEdit
@@ -189,7 +192,7 @@ inherited CorSimForm: TCorSimForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = CorrEdit
       AnchorSideRight.Side = asrBottom
-      Left = 135
+      Left = 146
       Height = 23
       Top = 109
       Width = 60
@@ -203,32 +206,34 @@ inherited CorSimForm: TCorSimForm
       AnchorSideLeft.Control = ParamsPanel
       AnchorSideTop.Control = NumObsEdit
       AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = ParamsPanel
+      AnchorSideRight.Side = asrBottom
       Left = 0
       Height = 140
       Top = 148
-      Width = 220
+      Width = 267
+      Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Top = 16
       Caption = 'Plot options'
       ClientHeight = 120
-      ClientWidth = 216
+      ClientWidth = 263
       TabOrder = 6
       object NumBinsEdit: TSpinEdit
         AnchorSideLeft.Control = Label7
         AnchorSideLeft.Side = asrBottom
-        AnchorSideTop.Control = BinCountChk
+        AnchorSideTop.Control = OptionsBevel
         AnchorSideTop.Side = asrBottom
         Left = 107
         Height = 23
-        Top = 85
+        Top = 62
         Width = 55
         BorderSpacing.Left = 8
-        BorderSpacing.Top = 4
+        BorderSpacing.Top = 8
         BorderSpacing.Right = 12
-        BorderSpacing.Bottom = 12
         MinValue = 2
         OnChange = NumBinsEditChange
-        TabOrder = 0
+        TabOrder = 2
         Value = 2
       end
       object Label7: TLabel
@@ -237,26 +242,25 @@ inherited CorSimForm: TCorSimForm
         AnchorSideTop.Side = asrCenter
         Left = 16
         Height = 15
-        Top = 89
+        Top = 66
         Width = 83
         BorderSpacing.Left = 16
         Caption = 'Number of bins'
-        ParentColor = False
       end
       object BinCountChk: TCheckBox
         AnchorSideLeft.Control = Label7
-        AnchorSideTop.Control = OptionsBevel
+        AnchorSideTop.Control = NumBinsEdit
         AnchorSideTop.Side = asrBottom
         Left = 16
         Height = 19
-        Top = 62
+        Top = 89
         Width = 188
-        BorderSpacing.Top = 8
+        BorderSpacing.Top = 4
         BorderSpacing.Right = 12
-        BorderSpacing.Bottom = 4
+        BorderSpacing.Bottom = 12
         Caption = 'Show frequencies in histograms'
         OnChange = BinCountChkChange
-        TabOrder = 1
+        TabOrder = 3
       end
       object RegressionLineChk: TCheckBox
         AnchorSideLeft.Control = PlotOptionsGroup
@@ -272,7 +276,7 @@ inherited CorSimForm: TCorSimForm
         Checked = True
         OnChange = RegressionLineChkChange
         State = cbChecked
-        TabOrder = 2
+        TabOrder = 1
       end
       object OptionsBevel: TBevel
         AnchorSideLeft.Control = PlotOptionsGroup
@@ -283,7 +287,7 @@ inherited CorSimForm: TCorSimForm
         Left = 12
         Height = 8
         Top = 46
-        Width = 192
+        Width = 239
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 12
         BorderSpacing.Right = 12
@@ -302,9 +306,18 @@ inherited CorSimForm: TCorSimForm
         Checked = True
         OnChange = RegressionResultsChkChange
         State = cbChecked
-        TabOrder = 3
+        TabOrder = 0
       end
     end
+    object Bevel1: TBevel[18]
+      AnchorSideLeft.Control = ParamsPanel
+      AnchorSideLeft.Side = asrCenter
+      Left = 121
+      Height = 15
+      Top = 56
+      Width = 25
+      Shape = bsSpacer
+    end
   end
   inherited ParamsSplitter: TSplitter
     Left = 279
@@ -314,6 +327,5 @@ inherited CorSimForm: TCorSimForm
     Left = 288
     Height = 431
     Width = 561
-    TabOrder = 1
   end
 end
diff --git a/applications/lazstats/source/forms/simulations/corsimunit.pas b/applications/lazstats/source/forms/simulations/corsimunit.pas
index 8d09bc977..032492683 100644
--- a/applications/lazstats/source/forms/simulations/corsimunit.pas
+++ b/applications/lazstats/source/forms/simulations/corsimunit.pas
@@ -23,6 +23,7 @@ type
   { TCorSimForm }
 
   TCorSimForm = class(TBasicStatsReportAndChartForm)
+    Bevel1: TBevel;
     BinCountChk: TCheckBox;
     RegressionResultsChk: TCheckBox;
     OptionsBevel: TBevel;
@@ -124,6 +125,7 @@ begin
   begin
     BarBrush.Color := DATA_COLORS[1];
     MarkPositions := lmpPositive;
+    Marks.LinkPen.Color := clGrayText;
   end;
   XHistogramChart.AddSeries(XHistogramSeries);
 
@@ -155,6 +157,7 @@ begin
     AxisIndexY := 1;
     BarBrush.Color := DATA_COLORS[2];
     MarkPositions := lmpPositive;
+    Marks.LinkPen.Color := clGrayText;
   end;
   YHistogramChart.AddSeries(YHistogramSeries);
 
@@ -179,7 +182,7 @@ begin
   inherited;
 
   ParamsPanel.Constraints.MinWidth := Max(
-    3*CloseBtn.Width + 2*CloseBtn.BorderSpacing.Left,
+    4*CloseBtn.Width + 4*CloseBtn.BorderSpacing.Left,
     StdDevXEdit.Left + StdDevXEdit.Width
   );
   ParamsPanel.Constraints.MinHeight :=