diff --git a/applications/lazstats/LazStats.chm b/applications/lazstats/LazStats.chm
index a54f141de..4d54ed286 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 6450abdd8..9f1e59735 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/analysis/descriptive/groupfrequnit.lfm b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.lfm
index 46d8caf50..eb8b2c189 100644
--- a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.lfm
+++ b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.lfm
@@ -1,31 +1,43 @@
 inherited GroupFreqForm: TGroupFreqForm
+  Left = 665
   Height = 279
+  Top = 202
   Width = 673
+  HelpType = htKeyword
+  HelpKeyword = 'html/GroupFrequencyAnalysis.htm'
   Caption = 'Group Frequency Analysis'
   ClientHeight = 279
   ClientWidth = 673
   inherited ParamsPanel: TPanel
     Height = 263
+    Width = 260
     ClientHeight = 263
+    ClientWidth = 260
     inherited CloseBtn: TButton
+      Left = 205
       Top = 238
       TabOrder = 8
     end
     inherited ComputeBtn: TButton
+      Left = 121
       Top = 238
       TabOrder = 3
     end
     inherited ResetBtn: TButton
+      Left = 59
       Top = 238
       TabOrder = 7
     end
     inherited HelpBtn: TButton
       Tag = 162
+      Left = 0
       Top = 238
       TabOrder = 6
+      Visible = False
     end
     inherited ButtonBevel: TBevel
       Top = 222
+      Width = 260
     end
     object Label1: TLabel[5]
       AnchorSideLeft.Control = ParamsPanel
@@ -46,7 +58,7 @@ inherited GroupFreqForm: TGroupFreqForm
       Left = 0
       Height = 205
       Top = 17
-      Width = 126
+      Width = 111
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Top = 2
       BorderSpacing.Right = 6
@@ -59,7 +71,7 @@ inherited GroupFreqForm: TGroupFreqForm
       AnchorSideLeft.Control = ParamsPanel
       AnchorSideLeft.Side = asrCenter
       AnchorSideTop.Control = VarList
-      Left = 132
+      Left = 117
       Height = 26
       Top = 17
       Width = 26
@@ -74,7 +86,7 @@ inherited GroupFreqForm: TGroupFreqForm
       AnchorSideLeft.Side = asrCenter
       AnchorSideTop.Control = GrpInBtn
       AnchorSideTop.Side = asrBottom
-      Left = 132
+      Left = 117
       Height = 26
       Top = 47
       Width = 26
@@ -88,7 +100,7 @@ inherited GroupFreqForm: TGroupFreqForm
     object Label2: TLabel[9]
       AnchorSideLeft.Control = GrpVarEdit
       AnchorSideBottom.Control = GrpVarEdit
-      Left = 164
+      Left = 149
       Height = 15
       Top = 21
       Width = 77
@@ -105,10 +117,10 @@ inherited GroupFreqForm: TGroupFreqForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = GrpOutBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 164
+      Left = 149
       Height = 23
       Top = 38
-      Width = 127
+      Width = 111
       Anchors = [akLeft, akRight, akBottom]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 2
@@ -121,15 +133,18 @@ inherited GroupFreqForm: TGroupFreqForm
       AnchorSideLeft.Control = GrpInBtn
       AnchorSideTop.Control = GrpOutBtn
       AnchorSideTop.Side = asrBottom
-      Left = 132
-      Height = 79
+      AnchorSideRight.Control = ParamsPanel
+      AnchorSideRight.Side = asrBottom
+      Left = 117
+      Height = 81
       Top = 97
-      Width = 147
+      Width = 143
+      Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Top = 24
       Caption = 'Plot Options'
-      ClientHeight = 59
-      ClientWidth = 143
+      ClientHeight = 61
+      ClientWidth = 139
       TabOrder = 5
       object VertBarsBtn: TSpeedButton
         AnchorSideLeft.Control = PlotOptionsGroup
@@ -140,7 +155,7 @@ inherited GroupFreqForm: TGroupFreqForm
         Width = 23
         BorderSpacing.Left = 12
         BorderSpacing.Top = 4
-        BorderSpacing.Bottom = 6
+        BorderSpacing.Bottom = 8
         Down = True
         GroupIndex = 1
         Images = MainDataModule.ImageList
@@ -180,7 +195,7 @@ inherited GroupFreqForm: TGroupFreqForm
         AnchorSideTop.Side = asrBottom
         Left = 12
         Height = 19
-        Top = 32
+        Top = 34
         Width = 123
         BorderSpacing.Right = 8
         BorderSpacing.Bottom = 8
@@ -190,6 +205,7 @@ inherited GroupFreqForm: TGroupFreqForm
     end
   end
   inherited ParamsSplitter: TSplitter
+    Left = 272
     Height = 279
   end
 end
diff --git a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
index 768c7af0b..2f7b1affe 100644
--- a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
+++ b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
@@ -71,15 +71,14 @@ end;
 procedure TGroupFreqForm.AdjustConstraints;
 begin
   ParamsPanel.Constraints.MinWidth := MaxValueI( [
-    4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
-    (PlotOptionsGroup.Width - GrpInBtn.Width div 2 + GrpVarEdit.BorderSpacing.Left)*2,
-    (Max(Label1.Width, Label2.Width) + GrpvarEdit.BorderSpacing.Left) * 2
+    CountUsedButtons*CloseBtn.Width + (CountUsedButtons-1)*CloseBtn.BorderSpacing.Left,
+    PlotOptionsGroup.Width*2 - GrpInBtn.Width + GrpVaredit.BorderSpacing.Left,
+    (Max(Label1.Width, Label2.Width) + GrpVarEdit.BorderSpacing.Left) * 2
   ]);
-  ParamsPanel.Constraints.MinHeight :=  PlotOptionsGroup.Top + PlotOptionsGroup.Height +
-    ButtonBevel.Height + CloseBtn.BorderSpacing.Top + CloseBtn.Height;
 
-  Constraints.MinWidth := ParamsPanel.Constraints.MinWidth + 300;
-  Constraints.MinHeight := ParamsPanel.Constraints.MinHeight + ParamsPanel.BorderSpacing.Top * 2;
+  ParamsPanel.Constraints.MinHeight :=
+    PlotOptionsGroup.Top + PlotOptionsGroup.Height +
+    ButtonBevel.Height + CloseBtn.BorderSpacing.Top + CloseBtn.Height;
 end;
 
 
@@ -168,7 +167,7 @@ var
   YTitle: String;
   i: Integer;
 begin
-  // Erase the chart, if it has already been used.
+  // Erase the chart, if it already has been used.
   FChartFrame.Clear;
   FLabelsSource.Clear;
 
diff --git a/applications/lazstats/source/forms/mainunit.lfm b/applications/lazstats/source/forms/mainunit.lfm
index fc21451f6..11db3e4b0 100644
--- a/applications/lazstats/source/forms/mainunit.lfm
+++ b/applications/lazstats/source/forms/mainunit.lfm
@@ -460,7 +460,7 @@ object OS3MainFrm: TOS3MainFrm
           OnClick = mnuAnalysisDescr_FreqClick
         end
         object mnuAnalysisDescr_GrpFreq: TMenuItem
-          Caption = 'Plot Group Frequencies'
+          Caption = 'Group Frequency Analysis'
           OnClick = mnuAnalysisDescr_GrpFreqClick
         end
         object mnuAnalysisDescr_Separator2: TMenuItem
diff --git a/applications/lazstats/source/units/utils.pas b/applications/lazstats/source/units/utils.pas
index 776524605..7023d20d9 100644
--- a/applications/lazstats/source/units/utils.pas
+++ b/applications/lazstats/source/units/utils.pas
@@ -180,7 +180,7 @@ begin
 end;
 
 
-// reimplements MaxValue of unit Math which cannot be compiled on 64 bit due
+// Reimplements MaxValue of unit Math which cannot be compiled on 64 bit due
 // to "Can't determine which overloaded function to call".
 function MaxValueI(const AData: array of Integer): Integer;
 var
@@ -188,7 +188,7 @@ var
 begin
   Result := -MaxInt;
   for i := 0 to High(AData) do
-    if Result > AData[i] then
+    if Result < AData[i] then
       Result := AData[i];
 end;