diff --git a/instat/dlgCircularDensityPlot.vb b/instat/dlgCircularDensityPlot.vb
index a6f05c3fafe..7861799a9ab 100644
--- a/instat/dlgCircularDensityPlot.vb
+++ b/instat/dlgCircularDensityPlot.vb
@@ -39,7 +39,7 @@ Public Class dlgCircularDensityPlot
     Private Sub InitialiseDialog()
         Dim dctKernel As New Dictionary(Of String, String)
         Dim dctUnits As New Dictionary(Of String, String)
-
+        ucrBase.iHelpTopicID = 181
         ucrBase.clsRsyntax.iCallType = 3
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 
diff --git a/instat/dlgClimaticNCMPCountRecords.vb b/instat/dlgClimaticNCMPCountRecords.vb
index c895af73bf3..70eb836e87c 100644
--- a/instat/dlgClimaticNCMPCountRecords.vb
+++ b/instat/dlgClimaticNCMPCountRecords.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPCountRecords
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=631
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
diff --git a/instat/dlgClimaticNCMPIndices.vb b/instat/dlgClimaticNCMPIndices.vb
index bbf3d064731..58b7769ad50 100644
--- a/instat/dlgClimaticNCMPIndices.vb
+++ b/instat/dlgClimaticNCMPIndices.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPIndices
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID=627
         ucrSelectorIndices.SetParameter(New RParameter("df", 0))
         ucrSelectorIndices.SetParameterIsrfunction()
 
diff --git a/instat/dlgClimaticNCMPRegionAverage.vb b/instat/dlgClimaticNCMPRegionAverage.vb
index 941ff1b02ea..7ba410056e9 100644
--- a/instat/dlgClimaticNCMPRegionAverage.vb
+++ b/instat/dlgClimaticNCMPRegionAverage.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPRegionAverage
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=629
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
diff --git a/instat/dlgClimaticNCMPSummaryFile.vb b/instat/dlgClimaticNCMPSummaryFile.vb
index 2cca33d94e8..1b6f59b16c0 100644
--- a/instat/dlgClimaticNCMPSummaryFile.vb
+++ b/instat/dlgClimaticNCMPSummaryFile.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPSummaryFile
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=632
         ucrSelectorA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorA2.SetParameterIsRFunction()
         ucrSelectorA2.lblDataFrame.Text = "Indices Data Frame:"
diff --git a/instat/dlgClimaticNCMPTrendGraphs.vb b/instat/dlgClimaticNCMPTrendGraphs.vb
index 28f6234e488..e8194c3c444 100644
--- a/instat/dlgClimaticNCMPTrendGraphs.vb
+++ b/instat/dlgClimaticNCMPTrendGraphs.vb
@@ -41,6 +41,7 @@ Public Class dlgClimaticNCMPTrendGraphs
     Private Sub InitialiseDialog()
         Dim dctResolution As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID=630
         ucrSelectorForA2.SetParameter(New RParameter("a2", 0))
         ucrSelectorForA2.SetParameterIsrfunction()
         ucrSelectorForA2.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
diff --git a/instat/dlgClimaticNCMPVariogram.vb b/instat/dlgClimaticNCMPVariogram.vb
index c3ffc8f2e19..af9a46f3c16 100644
--- a/instat/dlgClimaticNCMPVariogram.vb
+++ b/instat/dlgClimaticNCMPVariogram.vb
@@ -39,6 +39,7 @@ Public Class dlgClimaticNCMPVariogram
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID=628
         ucrSelectorVariogram.SetParameter(New RParameter("a2", 0))
         ucrSelectorVariogram.SetParameterIsrfunction()
         ucrSelectorVariogram.ucrAvailableDataFrames.lblDataFrame.Text = "Indices Data Frame:"
diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb
index feb295067e3..7d27f489804 100644
--- a/instat/dlgClimaticStationMaps.vb
+++ b/instat/dlgClimaticStationMaps.vb
@@ -64,7 +64,7 @@ Public Class dlgClimaticStationMaps
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 558
+        ucrBase.iHelpTopicID = 645
         ucrBase.clsRsyntax.iCallType = 3
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 
diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb
index 3501003091b..ea5865dfdf1 100644
--- a/instat/dlgColumnStats.Designer.vb
+++ b/instat/dlgColumnStats.Designer.vb
@@ -48,7 +48,6 @@ Partial Class dlgColumnStats
         Me.ucrChkPrintOutput = New instat.ucrCheck()
         Me.ucrChkDropUnusedLevels = New instat.ucrCheck()
         Me.cmdSummaries = New System.Windows.Forms.Button()
-        Me.cmdProportionsPercentages = New System.Windows.Forms.Button()
         Me.ucrChkWeights = New instat.ucrCheck()
         Me.ucrReceiverWeights = New instat.ucrReceiverSingle()
         Me.ucrReceiverByFactor = New instat.ucrReceiverMultiple()
@@ -62,9 +61,10 @@ Partial Class dlgColumnStats
         '
         Me.lblSelectedVariables.AutoSize = True
         Me.lblSelectedVariables.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblSelectedVariables.Location = New System.Drawing.Point(273, 9)
+        Me.lblSelectedVariables.Location = New System.Drawing.Point(410, 14)
+        Me.lblSelectedVariables.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblSelectedVariables.Name = "lblSelectedVariables"
-        Me.lblSelectedVariables.Size = New System.Drawing.Size(125, 13)
+        Me.lblSelectedVariables.Size = New System.Drawing.Size(191, 20)
         Me.lblSelectedVariables.TabIndex = 1
         Me.lblSelectedVariables.Text = "Variable(s) to Summarise:"
         '
@@ -72,9 +72,10 @@ Partial Class dlgColumnStats
         '
         Me.lblSummariseBy.AutoSize = True
         Me.lblSummariseBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblSummariseBy.Location = New System.Drawing.Point(272, 176)
+        Me.lblSummariseBy.Location = New System.Drawing.Point(408, 264)
+        Me.lblSummariseBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblSummariseBy.Name = "lblSummariseBy"
-        Me.lblSummariseBy.Size = New System.Drawing.Size(76, 13)
+        Me.lblSummariseBy.Size = New System.Drawing.Size(115, 20)
         Me.lblSummariseBy.TabIndex = 5
         Me.lblSummariseBy.Text = "Summarise By:"
         '
@@ -86,9 +87,11 @@ Partial Class dlgColumnStats
         Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing)
         Me.grpOptions.Controls.Add(Me.ucrChkPrintOutput)
         Me.grpOptions.Controls.Add(Me.ucrChkDropUnusedLevels)
-        Me.grpOptions.Location = New System.Drawing.Point(10, 196)
+        Me.grpOptions.Location = New System.Drawing.Point(15, 294)
+        Me.grpOptions.Margin = New System.Windows.Forms.Padding(4)
         Me.grpOptions.Name = "grpOptions"
-        Me.grpOptions.Size = New System.Drawing.Size(258, 155)
+        Me.grpOptions.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpOptions.Size = New System.Drawing.Size(387, 232)
         Me.grpOptions.TabIndex = 7
         Me.grpOptions.TabStop = False
         Me.grpOptions.Text = "Options"
@@ -96,9 +99,10 @@ Partial Class dlgColumnStats
         'cmdMissingOptions
         '
         Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.cmdMissingOptions.Location = New System.Drawing.Point(190, 114)
+        Me.cmdMissingOptions.Location = New System.Drawing.Point(285, 174)
+        Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4)
         Me.cmdMissingOptions.Name = "cmdMissingOptions"
-        Me.cmdMissingOptions.Size = New System.Drawing.Size(62, 26)
+        Me.cmdMissingOptions.Size = New System.Drawing.Size(93, 39)
         Me.cmdMissingOptions.TabIndex = 20
         Me.cmdMissingOptions.Tag = "MissingOptions"
         Me.cmdMissingOptions.Text = "Options"
@@ -108,87 +112,83 @@ Partial Class dlgColumnStats
         '
         Me.ucrChkOriginalLevel.AutoSize = True
         Me.ucrChkOriginalLevel.Checked = False
-        Me.ucrChkOriginalLevel.Location = New System.Drawing.Point(25, 42)
+        Me.ucrChkOriginalLevel.Location = New System.Drawing.Point(38, 63)
+        Me.ucrChkOriginalLevel.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkOriginalLevel.Name = "ucrChkOriginalLevel"
-        Me.ucrChkOriginalLevel.Size = New System.Drawing.Size(218, 23)
+        Me.ucrChkOriginalLevel.Size = New System.Drawing.Size(327, 34)
         Me.ucrChkOriginalLevel.TabIndex = 1
         '
         'ucrChkStoreResults
         '
         Me.ucrChkStoreResults.AutoSize = True
         Me.ucrChkStoreResults.Checked = False
-        Me.ucrChkStoreResults.Location = New System.Drawing.Point(6, 17)
+        Me.ucrChkStoreResults.Location = New System.Drawing.Point(9, 26)
+        Me.ucrChkStoreResults.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkStoreResults.Name = "ucrChkStoreResults"
-        Me.ucrChkStoreResults.Size = New System.Drawing.Size(237, 23)
+        Me.ucrChkStoreResults.Size = New System.Drawing.Size(356, 51)
         Me.ucrChkStoreResults.TabIndex = 0
         '
         'ucrChkOmitMissing
         '
         Me.ucrChkOmitMissing.AutoSize = True
         Me.ucrChkOmitMissing.Checked = False
-        Me.ucrChkOmitMissing.Location = New System.Drawing.Point(6, 117)
+        Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 176)
+        Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing"
-        Me.ucrChkOmitMissing.Size = New System.Drawing.Size(178, 23)
+        Me.ucrChkOmitMissing.Size = New System.Drawing.Size(267, 51)
         Me.ucrChkOmitMissing.TabIndex = 4
         '
         'ucrChkPrintOutput
         '
         Me.ucrChkPrintOutput.AutoSize = True
         Me.ucrChkPrintOutput.Checked = False
-        Me.ucrChkPrintOutput.Location = New System.Drawing.Point(6, 67)
+        Me.ucrChkPrintOutput.Location = New System.Drawing.Point(9, 100)
+        Me.ucrChkPrintOutput.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkPrintOutput.Name = "ucrChkPrintOutput"
-        Me.ucrChkPrintOutput.Size = New System.Drawing.Size(246, 23)
+        Me.ucrChkPrintOutput.Size = New System.Drawing.Size(369, 34)
         Me.ucrChkPrintOutput.TabIndex = 2
         '
         'ucrChkDropUnusedLevels
         '
         Me.ucrChkDropUnusedLevels.AutoSize = True
         Me.ucrChkDropUnusedLevels.Checked = False
-        Me.ucrChkDropUnusedLevels.Location = New System.Drawing.Point(6, 92)
+        Me.ucrChkDropUnusedLevels.Location = New System.Drawing.Point(9, 138)
+        Me.ucrChkDropUnusedLevels.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkDropUnusedLevels.Name = "ucrChkDropUnusedLevels"
-        Me.ucrChkDropUnusedLevels.Size = New System.Drawing.Size(237, 23)
+        Me.ucrChkDropUnusedLevels.Size = New System.Drawing.Size(356, 34)
         Me.ucrChkDropUnusedLevels.TabIndex = 3
         '
         'cmdSummaries
         '
         Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.cmdSummaries.Location = New System.Drawing.Point(274, 302)
+        Me.cmdSummaries.Location = New System.Drawing.Point(411, 453)
+        Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4)
         Me.cmdSummaries.Name = "cmdSummaries"
-        Me.cmdSummaries.Size = New System.Drawing.Size(134, 23)
+        Me.cmdSummaries.Size = New System.Drawing.Size(201, 34)
         Me.cmdSummaries.TabIndex = 8
         Me.cmdSummaries.Tag = "Summaries"
         Me.cmdSummaries.Text = "Summaries..."
         Me.cmdSummaries.UseVisualStyleBackColor = True
         '
-        'cmdProportionsPercentages
-        '
-        Me.cmdProportionsPercentages.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.cmdProportionsPercentages.Location = New System.Drawing.Point(274, 328)
-        Me.cmdProportionsPercentages.Name = "cmdProportionsPercentages"
-        Me.cmdProportionsPercentages.Size = New System.Drawing.Size(134, 23)
-        Me.cmdProportionsPercentages.TabIndex = 9
-        Me.cmdProportionsPercentages.Tag = "Proportions/Percentages..."
-        Me.cmdProportionsPercentages.Text = "Prop. and Percentages..."
-        Me.cmdProportionsPercentages.UseVisualStyleBackColor = True
-        '
         'ucrChkWeights
         '
         Me.ucrChkWeights.AutoSize = True
         Me.ucrChkWeights.Checked = False
-        Me.ucrChkWeights.Location = New System.Drawing.Point(274, 127)
+        Me.ucrChkWeights.Location = New System.Drawing.Point(411, 190)
+        Me.ucrChkWeights.Margin = New System.Windows.Forms.Padding(9)
         Me.ucrChkWeights.Name = "ucrChkWeights"
-        Me.ucrChkWeights.Size = New System.Drawing.Size(119, 23)
+        Me.ucrChkWeights.Size = New System.Drawing.Size(178, 34)
         Me.ucrChkWeights.TabIndex = 3
         '
         'ucrReceiverWeights
         '
         Me.ucrReceiverWeights.AutoSize = True
         Me.ucrReceiverWeights.frmParent = Me
-        Me.ucrReceiverWeights.Location = New System.Drawing.Point(274, 150)
+        Me.ucrReceiverWeights.Location = New System.Drawing.Point(411, 225)
         Me.ucrReceiverWeights.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrReceiverWeights.Name = "ucrReceiverWeights"
         Me.ucrReceiverWeights.Selector = Nothing
-        Me.ucrReceiverWeights.Size = New System.Drawing.Size(120, 20)
+        Me.ucrReceiverWeights.Size = New System.Drawing.Size(180, 30)
         Me.ucrReceiverWeights.strNcFilePath = ""
         Me.ucrReceiverWeights.TabIndex = 4
         Me.ucrReceiverWeights.ucrSelector = Nothing
@@ -197,11 +197,11 @@ Partial Class dlgColumnStats
         '
         Me.ucrReceiverByFactor.AutoSize = True
         Me.ucrReceiverByFactor.frmParent = Me
-        Me.ucrReceiverByFactor.Location = New System.Drawing.Point(274, 190)
+        Me.ucrReceiverByFactor.Location = New System.Drawing.Point(411, 285)
         Me.ucrReceiverByFactor.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrReceiverByFactor.Name = "ucrReceiverByFactor"
         Me.ucrReceiverByFactor.Selector = Nothing
-        Me.ucrReceiverByFactor.Size = New System.Drawing.Size(133, 100)
+        Me.ucrReceiverByFactor.Size = New System.Drawing.Size(200, 150)
         Me.ucrReceiverByFactor.strNcFilePath = ""
         Me.ucrReceiverByFactor.TabIndex = 6
         Me.ucrReceiverByFactor.ucrSelector = Nothing
@@ -210,11 +210,11 @@ Partial Class dlgColumnStats
         '
         Me.ucrReceiverSelectedVariables.AutoSize = True
         Me.ucrReceiverSelectedVariables.frmParent = Me
-        Me.ucrReceiverSelectedVariables.Location = New System.Drawing.Point(274, 24)
+        Me.ucrReceiverSelectedVariables.Location = New System.Drawing.Point(411, 36)
         Me.ucrReceiverSelectedVariables.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrReceiverSelectedVariables.Name = "ucrReceiverSelectedVariables"
         Me.ucrReceiverSelectedVariables.Selector = Nothing
-        Me.ucrReceiverSelectedVariables.Size = New System.Drawing.Size(133, 100)
+        Me.ucrReceiverSelectedVariables.Size = New System.Drawing.Size(200, 150)
         Me.ucrReceiverSelectedVariables.strNcFilePath = ""
         Me.ucrReceiverSelectedVariables.TabIndex = 2
         Me.ucrReceiverSelectedVariables.ucrSelector = Nothing
@@ -225,30 +225,30 @@ Partial Class dlgColumnStats
         Me.ucrSelectorForColumnStatistics.bDropUnusedFilterLevels = False
         Me.ucrSelectorForColumnStatistics.bShowHiddenColumns = False
         Me.ucrSelectorForColumnStatistics.bUseCurrentFilter = True
-        Me.ucrSelectorForColumnStatistics.Location = New System.Drawing.Point(10, 10)
+        Me.ucrSelectorForColumnStatistics.Location = New System.Drawing.Point(15, 15)
         Me.ucrSelectorForColumnStatistics.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrSelectorForColumnStatistics.Name = "ucrSelectorForColumnStatistics"
-        Me.ucrSelectorForColumnStatistics.Size = New System.Drawing.Size(213, 183)
+        Me.ucrSelectorForColumnStatistics.Size = New System.Drawing.Size(320, 274)
         Me.ucrSelectorForColumnStatistics.TabIndex = 0
         '
         'ucrBase
         '
         Me.ucrBase.AutoSize = True
         Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrBase.Location = New System.Drawing.Point(6, 363)
+        Me.ucrBase.Location = New System.Drawing.Point(9, 544)
+        Me.ucrBase.Margin = New System.Windows.Forms.Padding(6)
         Me.ucrBase.Name = "ucrBase"
-        Me.ucrBase.Size = New System.Drawing.Size(405, 52)
+        Me.ucrBase.Size = New System.Drawing.Size(611, 77)
         Me.ucrBase.TabIndex = 10
         '
         'dlgColumnStats
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(416, 419)
+        Me.ClientSize = New System.Drawing.Size(624, 628)
         Me.Controls.Add(Me.ucrChkWeights)
         Me.Controls.Add(Me.ucrReceiverWeights)
-        Me.Controls.Add(Me.cmdProportionsPercentages)
         Me.Controls.Add(Me.cmdSummaries)
         Me.Controls.Add(Me.grpOptions)
         Me.Controls.Add(Me.ucrReceiverByFactor)
@@ -258,6 +258,7 @@ Partial Class dlgColumnStats
         Me.Controls.Add(Me.ucrSelectorForColumnStatistics)
         Me.Controls.Add(Me.ucrBase)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.Margin = New System.Windows.Forms.Padding(4)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "dlgColumnStats"
@@ -283,7 +284,6 @@ Partial Class dlgColumnStats
     Friend WithEvents ucrChkOmitMissing As ucrCheck
     Friend WithEvents ucrChkPrintOutput As ucrCheck
     Friend WithEvents ucrChkDropUnusedLevels As ucrCheck
-    Friend WithEvents cmdProportionsPercentages As Button
     Friend WithEvents ucrChkOriginalLevel As ucrCheck
     Friend WithEvents ucrChkWeights As ucrCheck
     Friend WithEvents ucrReceiverWeights As ucrReceiverSingle
diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb
index ddc5d469a6b..98e43b2340a 100644
--- a/instat/dlgColumnStats.vb
+++ b/instat/dlgColumnStats.vb
@@ -177,13 +177,6 @@ Public Class dlgColumnStats
         TestOKEnabled()
     End Sub
 
-    Private Sub cmdProportionsPercentages_Click(sender As Object, e As EventArgs) Handles cmdProportionsPercentages.Click
-        sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog)
-        sdgProportionsPercentages.ShowDialog()
-        bResetSubdialog = False
-        TestOKEnabled()
-    End Sub
-
     Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged
         If clsSummariesList.ContainsParameter("summary_cor") OrElse clsSummariesList.ContainsParameter("summary_cov") Then
             clsDefaultFunction.AddParameter("use", Chr(34) & "'na.or.complete'" & Chr(34))
diff --git a/instat/dlgCompare.vb b/instat/dlgCompare.vb
index 9851a2d8f11..0b60a5fe4ac 100644
--- a/instat/dlgCompare.vb
+++ b/instat/dlgCompare.vb
@@ -48,7 +48,7 @@ Public Class dlgCompare
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 562
+        ucrBase.iHelpTopicID = 634
         ucrPnlCompare.AddRadioButton(rdoDifferences)
         ucrPnlCompare.AddRadioButton(rdoAnomalies)
         ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False)
diff --git a/instat/dlgCompareSummary.vb b/instat/dlgCompareSummary.vb
index 7ea211a743d..8a0f84d41e6 100644
--- a/instat/dlgCompareSummary.vb
+++ b/instat/dlgCompareSummary.vb
@@ -37,6 +37,7 @@ Public Class dlgCompareSummary
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 635
         ucrSelectorVerificationSummary.SetParameter(New RParameter("data_name", 0))
         ucrSelectorVerificationSummary.SetParameterIsString()
 
diff --git a/instat/dlgConditionalQuantilePlot.vb b/instat/dlgConditionalQuantilePlot.vb
index 96a6fef7d6e..e3ceb9deef0 100644
--- a/instat/dlgConditionalQuantilePlot.vb
+++ b/instat/dlgConditionalQuantilePlot.vb
@@ -42,6 +42,7 @@ Public Class dlgConditionalQuantilePlot
         Dim dctLegendPosition As New Dictionary(Of String, String)
         Dim dctStatistics As New Dictionary(Of String, String)
         ucrBase.clsRsyntax.iCallType = 3
+        ucrBase.iHelpTopicID = 642
 
         ucrConditionalQuantilePlotSelector.SetParameter(New RParameter("mydata", 0))
         ucrConditionalQuantilePlotSelector.SetParameterIsrfunction()
diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb
index 07d77df1015..45a346662f0 100644
--- a/instat/dlgCumulativeDistribution.Designer.vb
+++ b/instat/dlgCumulativeDistribution.Designer.vb
@@ -54,6 +54,11 @@ Partial Class dlgCumulativeDistribution
         Me.ucrFactorReceiver = New instat.ucrReceiverSingle()
         Me.ucrCumDistSelector = New instat.ucrSelectorByDataFrameAddRemove()
         Me.ucrBase = New instat.ucrButtons()
+        Me.ucrInputStation = New instat.ucrInputComboBox()
+        Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
+        Me.lblFacetBy = New System.Windows.Forms.Label()
+        Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
+        Me.ucrChkLegend = New instat.ucrCheck()
         Me.SuspendLayout()
         '
         'lblFactors
@@ -162,7 +167,7 @@ Partial Class dlgCumulativeDistribution
         '
         Me.ucrPnlOption.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.ucrPnlOption.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrPnlOption.Location = New System.Drawing.Point(101, 9)
+        Me.ucrPnlOption.Location = New System.Drawing.Point(101, 7)
         Me.ucrPnlOption.Name = "ucrPnlOption"
         Me.ucrPnlOption.Size = New System.Drawing.Size(211, 38)
         Me.ucrPnlOption.TabIndex = 0
@@ -188,7 +193,7 @@ Partial Class dlgCumulativeDistribution
         'ucrSaveCumDist
         '
         Me.ucrSaveCumDist.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrSaveCumDist.Location = New System.Drawing.Point(10, 327)
+        Me.ucrSaveCumDist.Location = New System.Drawing.Point(10, 373)
         Me.ucrSaveCumDist.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.ucrSaveCumDist.Name = "ucrSaveCumDist"
         Me.ucrSaveCumDist.Size = New System.Drawing.Size(320, 24)
@@ -236,17 +241,77 @@ Partial Class dlgCumulativeDistribution
         '
         Me.ucrBase.AutoSize = True
         Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrBase.Location = New System.Drawing.Point(10, 354)
+        Me.ucrBase.Location = New System.Drawing.Point(10, 402)
         Me.ucrBase.Name = "ucrBase"
-        Me.ucrBase.Size = New System.Drawing.Size(405, 52)
+        Me.ucrBase.Size = New System.Drawing.Size(408, 52)
         Me.ucrBase.TabIndex = 15
         '
+        'ucrInputStation
+        '
+        Me.ucrInputStation.AddQuotesIfUnrecognised = True
+        Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputStation.GetSetSelectedIndex = -1
+        Me.ucrInputStation.IsReadOnly = False
+        Me.ucrInputStation.Location = New System.Drawing.Point(313, 336)
+        Me.ucrInputStation.Name = "ucrInputStation"
+        Me.ucrInputStation.Size = New System.Drawing.Size(101, 21)
+        Me.ucrInputStation.TabIndex = 101
+        '
+        'ucr1stFactorReceiver
+        '
+        Me.ucr1stFactorReceiver.AutoSize = True
+        Me.ucr1stFactorReceiver.frmParent = Me
+        Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(202, 337)
+        Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
+        Me.ucr1stFactorReceiver.Selector = Nothing
+        Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26)
+        Me.ucr1stFactorReceiver.strNcFilePath = ""
+        Me.ucr1stFactorReceiver.TabIndex = 100
+        Me.ucr1stFactorReceiver.ucrSelector = Nothing
+        '
+        'lblFacetBy
+        '
+        Me.lblFacetBy.AutoSize = True
+        Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.lblFacetBy.Location = New System.Drawing.Point(204, 322)
+        Me.lblFacetBy.Name = "lblFacetBy"
+        Me.lblFacetBy.Size = New System.Drawing.Size(52, 13)
+        Me.lblFacetBy.TabIndex = 99
+        Me.lblFacetBy.Tag = ""
+        Me.lblFacetBy.Text = "Facet By:"
+        '
+        'ucrInputLegendPosition
+        '
+        Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True
+        Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputLegendPosition.GetSetSelectedIndex = -1
+        Me.ucrInputLegendPosition.IsReadOnly = False
+        Me.ucrInputLegendPosition.Location = New System.Drawing.Point(88, 336)
+        Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
+        Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21)
+        Me.ucrInputLegendPosition.TabIndex = 103
+        '
+        'ucrChkLegend
+        '
+        Me.ucrChkLegend.AutoSize = True
+        Me.ucrChkLegend.Checked = False
+        Me.ucrChkLegend.Location = New System.Drawing.Point(9, 337)
+        Me.ucrChkLegend.Name = "ucrChkLegend"
+        Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24)
+        Me.ucrChkLegend.TabIndex = 102
+        '
         'dlgCumulativeDistribution
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(415, 410)
+        Me.ClientSize = New System.Drawing.Size(415, 458)
+        Me.Controls.Add(Me.ucrInputStation)
+        Me.Controls.Add(Me.ucr1stFactorReceiver)
+        Me.Controls.Add(Me.lblFacetBy)
+        Me.Controls.Add(Me.ucrInputLegendPosition)
+        Me.Controls.Add(Me.ucrChkLegend)
         Me.Controls.Add(Me.rdoExceedance)
         Me.Controls.Add(Me.rdoCumulative)
         Me.Controls.Add(Me.ucrNudBy)
@@ -291,4 +356,9 @@ Partial Class dlgCumulativeDistribution
     Friend WithEvents lblNudby As Label
     Friend WithEvents rdoExceedance As RadioButton
     Friend WithEvents rdoCumulative As RadioButton
+    Friend WithEvents ucrInputStation As ucrInputComboBox
+    Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle
+    Friend WithEvents lblFacetBy As Label
+    Friend WithEvents ucrInputLegendPosition As ucrInputComboBox
+    Friend WithEvents ucrChkLegend As ucrCheck
 End Class
diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb
index dbf8902b5ae..cd123316452 100644
--- a/instat/dlgCumulativeDistribution.vb
+++ b/instat/dlgCumulativeDistribution.vb
@@ -41,6 +41,21 @@ Public Class dlgCumulativeDistribution
     Private clsSequence As New RFunction
     Private bReset As Boolean = True
 
+    Private clsFacetFunction As New RFunction
+    Private clsFacetVariablesOperator As New ROperator
+    Private clsFacetRowOp As New ROperator
+    Private clsFacetColOp As New ROperator
+    Private clsPipeOperator As New ROperator
+    Private clsGroupByFunction As New RFunction
+
+    Private ReadOnly strNone As String = "None"
+    Private ReadOnly strFacetWrap As String = "Facet Wrap"
+    Private ReadOnly strFacetRow As String = "Facet Row"
+    Private ReadOnly strFacetCol As String = "Facet Column"
+
+    Private bUpdateComboOptions As Boolean = True
+    Private bUpdatingParameters As Boolean = False
+
     Private strFirstParameterName As String = "stat_ecdf"
     Private strFirstPointParameterName As String = "stat_ecdf2"
     Private strYScleParameterName As String = "YscaleContinous"
@@ -65,6 +80,7 @@ Public Class dlgCumulativeDistribution
 
     Private Sub InitaliseDialog()
         Dim dctScalesPairs As New Dictionary(Of String, String)
+        Dim dctLegendPosition As New Dictionary(Of String, String)
 
         ucrChkCountsOnYAxis.Enabled = False ' temporary What should this do?
 
@@ -120,6 +136,32 @@ Public Class dlgCumulativeDistribution
         'ucrInputComboPad.SetDropDownStyleAsNonEditable()
         'ucrInputComboPad.SetRDefault("TRUE")
 
+        ucrChkLegend.SetText("Legend:")
+        ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None")
+        ucrInputLegendPosition.SetDropDownStyleAsNonEditable()
+        ucrInputLegendPosition.SetParameter(New RParameter("legend.position"))
+        dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34))
+        dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34))
+        dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34))
+        dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34))
+        dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34))
+        ucrInputLegendPosition.SetItems(dctLegendPosition)
+        ucrChkLegend.AddParameterPresentCondition(True, "legend.position")
+        ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False)
+
+        ucr1stFactorReceiver.SetParameter(New RParameter("var1"))
+        ucr1stFactorReceiver.Selector = ucrCumDistSelector
+        ucr1stFactorReceiver.SetIncludedDataTypes({"factor"})
+        ucr1stFactorReceiver.strSelectorHeading = "Factors"
+        ucr1stFactorReceiver.bWithQuotes = False
+        ucr1stFactorReceiver.SetParameterIsString()
+        ucr1stFactorReceiver.SetValuesToIgnore({"."})
+        ucr1stFactorReceiver.SetParameterPosition(1)
+        ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy)
+
+        ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone})
+        ucrInputStation.SetDropDownStyleAsNonEditable()
+
         ucrSaveCumDist.SetSaveTypeAsGraph()
         ucrSaveCumDist.SetDataFrameSelector(ucrCumDistSelector.ucrAvailableDataFrames)
         ucrSaveCumDist.SetCheckBoxText("Save Graph")
@@ -136,6 +178,16 @@ Public Class dlgCumulativeDistribution
         clsRggplotFunction = New RFunction
         clsStatECDFAesFunction = New RFunction
         clsStatECDFPointAesFunction = New RFunction
+        clsFacetFunction = New RFunction
+        clsFacetVariablesOperator = New ROperator
+        clsFacetRowOp = New ROperator
+        clsFacetColOp = New ROperator
+        clsPipeOperator = New ROperator
+        clsGroupByFunction = New RFunction
+
+        ucrInputStation.SetName(strFacetWrap)
+        ucrInputStation.bUpdateRCodeFromControl = True
+
 
         clsSequence = New RFunction
         clsSequence.SetRCommand("seq")
@@ -185,6 +237,22 @@ Public Class dlgCumulativeDistribution
         clsLabsFunction.SetRCommand("labs")
         clsLabsFunction.AddParameter("y", "NULL")
 
+        clsFacetFunction.SetPackageName("ggplot2")
+        clsFacetRowOp.SetOperation("+")
+        clsFacetRowOp.bBrackets = False
+        clsFacetColOp.SetOperation("+")
+        clsFacetColOp.bBrackets = False
+        clsFacetVariablesOperator.SetOperation("~")
+        clsFacetVariablesOperator.bForceIncludeOperation = True
+        clsFacetVariablesOperator.bBrackets = False
+        clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0)
+
+        clsPipeOperator.SetOperation("%>%")
+        SetPipeAssignTo()
+
+        clsGroupByFunction.SetPackageName("dplyr")
+        clsGroupByFunction.SetRCommand("group_by")
+
         clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone())
         clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone()
         clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone()
@@ -224,6 +292,9 @@ Public Class dlgCumulativeDistribution
 
         ucrChkIncludePoints.SetRCode(clsStatECDFPointFunction, bReset)
 
+        ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+        ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+
         ucrNudBy.SetRCode(clsSequence, bReset)
 
     End Sub
@@ -246,7 +317,7 @@ Public Class dlgCumulativeDistribution
         sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction,
                           clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction,
                           clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction,
-                          clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, ucrNewBaseSelector:=ucrCumDistSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction,
+                          clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, ucrNewBaseSelector:=ucrCumDistSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator,
                           clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction,
                            clsNewAnnotateFunction:=clsAnnotateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()
@@ -275,4 +346,173 @@ Public Class dlgCumulativeDistribution
             clsBaseOperator.RemoveParameterByName(strFirstPointParameterName)
         End If
     End Sub
+
+    Private Sub AddRemoveTheme()
+        If clsThemeFunction.iParameterCount > 0 Then
+            clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15)
+        Else
+            clsBaseOperator.RemoveParameterByName("theme")
+        End If
+    End Sub
+
+    Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged
+        AddRemoveTheme()
+    End Sub
+
+    Private Sub AutoFacetStation()
+        Dim currentReceiver As ucrReceiver = ucrCumDistSelector.CurrentReceiver
+
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
+        End If
+    End Sub
+    Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged
+        If Not bUpdateComboOptions Then
+            Exit Sub
+        End If
+        Dim strChangedText As String = ucrChangedControl.GetText()
+        If strChangedText <> strNone Then
+            If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso
+                    Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then
+                bUpdateComboOptions = False
+                ucrInputStation.SetName(strNone)
+                bUpdateComboOptions = True
+            End If
+            If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso
+                    ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso
+                    ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then
+                ucrInputStation.SetName(strNone)
+            End If
+        End If
+        UpdateParameters()
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub UpdateParameters()
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
+        clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
+        clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        bUpdatingParameters = True
+        ucr1stFactorReceiver.SetRCode(Nothing)
+        Select Case ucrInputStation.GetText()
+            Case strFacetWrap
+                ucr1stFactorReceiver.ChangeParameterName("var1")
+                ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator)
+            Case strFacetCol
+                ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetColOp)
+            Case strFacetRow
+                ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetRowOp)
+        End Select
+        If Not clsRaesFunction.ContainsParameter("x") Then
+            clsRaesFunction.AddParameter("x", Chr(34) & Chr(34))
+        End If
+        bUpdatingParameters = False
+    End Sub
+
+    Private Sub AddRemoveFacets()
+        Dim bWrap As Boolean = False
+        Dim bCol As Boolean = False
+        Dim bRow As Boolean = False
+
+        If bUpdatingParameters Then
+            Exit Sub
+        End If
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        If Not ucr1stFactorReceiver.IsEmpty Then
+            Select Case ucrInputStation.GetText()
+                Case strFacetWrap
+                    bWrap = True
+                Case strFacetCol
+                    bCol = True
+                Case strFacetRow
+                    bRow = True
+            End Select
+        End If
+
+        If bWrap OrElse bRow OrElse bCol Then
+            clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction)
+        End If
+        If bWrap Then
+            clsFacetFunction.SetRCommand("facet_wrap")
+        End If
+        If bRow OrElse bCol Then
+            clsFacetFunction.SetRCommand("facet_grid")
+        End If
+        If bRow Then
+            clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0)
+        ElseIf bCol AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("left")
+        End If
+        If bCol Then
+            clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1)
+        ElseIf bRow AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("right")
+        End If
+    End Sub
+
+    Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrVariablesAsFactorforCumDist.ControlValueChanged
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub GetParameterValue(clsOperator As ROperator)
+        Dim i As Integer = 0
+        For Each clsTempParam As RParameter In clsOperator.clsParameters
+            If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then
+                clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i)
+                i = i + 1
+            End If
+        Next
+    End Sub
+
+    Private Sub AddRemoveGroupBy()
+        If clsPipeOperator.ContainsParameter("mutate") Then
+            clsGroupByFunction.ClearParameters()
+            If clsBaseOperator.ContainsParameter("facets") Then
+                Select Case ucrInputStation.GetText()
+                    Case strFacetWrap
+                        GetParameterValue(clsFacetVariablesOperator)
+                    Case strFacetCol
+                        GetParameterValue(clsFacetColOp)
+                    Case strFacetRow
+                        GetParameterValue(clsFacetRowOp)
+                End Select
+            End If
+
+            If clsGroupByFunction.iParameterCount > 0 Then
+                clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1)
+            Else
+                clsPipeOperator.RemoveParameterByName("group_by")
+            End If
+        Else
+            clsPipeOperator.RemoveParameterByName("group_by")
+        End If
+
+        SetPipeAssignTo()
+    End Sub
+
+    Private Sub SetPipeAssignTo()
+        If ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then
+            clsPipeOperator.SetAssignTo(ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
+        Else
+            clsPipeOperator.RemoveAssignTo()
+        End If
+    End Sub
+
+    Private Sub ucrCumDistSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCumDistSelector.ControlValueChanged
+        AutoFacetStation()
+        SetPipeAssignTo()
+    End Sub
 End Class
\ No newline at end of file
diff --git a/instat/dlgExtremes.vb b/instat/dlgExtremes.vb
index cc0ad564449..122ebf33a53 100644
--- a/instat/dlgExtremes.vb
+++ b/instat/dlgExtremes.vb
@@ -47,6 +47,7 @@ clsInitialListFunction, clsOmitMissingFunction As New RFunction
     Private Sub InitialiseDialog()
         Dim dctFevdTypes As New Dictionary(Of String, String)
 
+        ucrBase.iHelpTopicID = 488
         ucrInputExtremes.SetParameter(New RParameter("type", 1))
         dctFevdTypes.Add("GEV", Chr(34) & "GEV" & Chr(34))
         dctFevdTypes.Add("GP", Chr(34) & "GP" & Chr(34))
diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb
index 83bc3139f89..a175bff8c64 100644
--- a/instat/dlgGeneralForGraphics.Designer.vb
+++ b/instat/dlgGeneralForGraphics.Designer.vb
@@ -491,7 +491,7 @@ Partial Class dlgGeneralForGraphics
         Me.ucrInputAddCode.IsReadOnly = False
         Me.ucrInputAddCode.Location = New System.Drawing.Point(159, 362)
         Me.ucrInputAddCode.Name = "ucrInputAddCode"
-        Me.ucrInputAddCode.Size = New System.Drawing.Size(267, 21)
+        Me.ucrInputAddCode.Size = New System.Drawing.Size(316, 21)
         Me.ucrInputAddCode.TabIndex = 218
         '
         'ucrChkAddCode
diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb
index 3db68c1e86d..04112a21464 100644
--- a/instat/dlgGeneralForGraphics.vb
+++ b/instat/dlgGeneralForGraphics.vb
@@ -167,7 +167,7 @@ Public Class dlgGeneralForGraphics
 
         ucrChkAddCode.SetText("Add Code:")
         ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="")
-        ucrInputAddCode.SetItems({"geom_hline(yintercept=20)", "geom_vline(xintercept = 5)", "geom_vline(xintercept = 5)", "scale_x_binned()", "scale_x_binned(n.breaks=20)"})
+        ucrInputAddCode.SetItems({"scale_colour_manual(values=c(" & Chr(34) & "red" & Chr(34) & "," & Chr(34) & "blue" & Chr(34) & "," & Chr(34) & "green" & Chr(34) & "," & Chr(34) & "black" & Chr(34) & "," & Chr(34) & "brown" & Chr(34) & "))", "scale_fill_manual(values = c(" & Chr(34) & "coral" & Chr(34) & "," & Chr(34) & "bisque4" & Chr(34) & "," & Chr(34) & "gold" & Chr(34) & "," & Chr(34) & "cyan" & Chr(34) & "," & Chr(34) & "khaki" & Chr(34) & "," & Chr(34) & "orange" & Chr(34) & "," & Chr(34) & "orchid" & Chr(34) & "))", "geom_hline(yintercept=20)", "geom_vline(xintercept=5) + geom_hline(yintercept = 1)", "geom_vline(xintercept=c(1,3,5),colour=" & Chr(34) & "green" & Chr(34) & ")", "scale_x_binned()", "scale_x_binned(n.breaks=20)", "scale_y_continuous(trans=" & Chr(34) & "log10" & Chr(34) & ", label=scales::dollar)"})
 
         ucrSave.SetPrefix("graph")
         ucrSave.SetIsComboBox()
@@ -272,6 +272,14 @@ Public Class dlgGeneralForGraphics
         TestOKEnabled()
     End Sub
 
+    Private Sub SetCalculationHistory()
+        Dim newItem As String = ucrInputAddCode.GetText().Trim()
+
+        If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddCode.cboInput.Items.Contains(newItem) Then
+            ucrInputAddCode.AddItems({newItem})
+        End If
+    End Sub
+
     Private Sub SetRCodeForControls(bReset As Boolean)
         ucrReceiverX.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("y", ucrReceiverX.GetVariableNames(False), bNewIncludeArgumentName:=False), iAdditionalPairNo:=1)
         ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset)
@@ -670,7 +678,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub UpdateParameters()
-        clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputStation.Name)
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
         clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
         clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
 
@@ -794,6 +802,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub ucrChkAddCode_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddCode.ControlValueChanged, ucrInputAddCode.ControlValueChanged
+        SetCalculationHistory()
         If ucrChkAddCode.Checked AndAlso Not ucrInputAddCode.IsEmpty Then
             clsAddCodeOperator.AddParameter("code1", ucrInputAddCode.GetText(), bIncludeArgumentName:=False, iPosition:=1)
             clsBaseOperator.AddParameter("newcode", clsROperatorParameter:=clsAddCodeOperator, bIncludeArgumentName:=False)
diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb
index dd78aa726a6..9ff7ff37d50 100644
--- a/instat/dlgHeatMapPlot.Designer.vb
+++ b/instat/dlgHeatMapPlot.Designer.vb
@@ -54,6 +54,18 @@ Partial Class dlgHeatMapPlot
         Me.lblLongitude = New System.Windows.Forms.Label()
         Me.lblLatitude = New System.Windows.Forms.Label()
         Me.lblFillChoropleth = New System.Windows.Forms.Label()
+        Me.lblGroup = New System.Windows.Forms.Label()
+        Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem()
+        Me.toolStripMenuItemTileOptions = New System.Windows.Forms.ToolStripMenuItem()
+        Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem()
+        Me.lblFacetBy = New System.Windows.Forms.Label()
+        Me.ucrInputStation = New instat.ucrInputComboBox()
+        Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
+        Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
+        Me.ucrChkLegend = New instat.ucrCheck()
+        Me.cmdOptions = New instat.ucrSplitButton()
+        Me.ucrChkPoints = New instat.ucrCheck()
         Me.ucrChkFlipCoordinates = New instat.ucrCheck()
         Me.ucrReceiverPointsHeatMap = New instat.ucrReceiverSingle()
         Me.ucrNudShapeHeatMap = New instat.ucrNud()
@@ -71,18 +83,11 @@ Partial Class dlgHeatMapPlot
         Me.ucrVariableAsFactorForHeatMap = New instat.ucrVariablesAsFactor()
         Me.ucrInputReorderVariableX = New instat.ucrInputComboBox()
         Me.ucrInputSize = New instat.ucrInputComboBox()
-        Me.ucrChkAddLabels = New instat.ucrCheck()
         Me.ucrInputPosition = New instat.ucrInputComboBox()
         Me.ucrInputColour = New instat.ucrInputComboBox()
         Me.ucrReceiverX = New instat.ucrReceiverSingle()
         Me.ucrReceiverGroup = New instat.ucrReceiverSingle()
-        Me.lblGroup = New System.Windows.Forms.Label()
-        Me.ucrChkPoints = New instat.ucrCheck()
-        Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem()
-        Me.toolStripMenuItemTileOptions = New System.Windows.Forms.ToolStripMenuItem()
-        Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cmdOptions = New instat.ucrSplitButton()
+        Me.ucrChkAddLabels = New instat.ucrCheck()
         Me.contextMenuStripOptions.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -174,6 +179,84 @@ Partial Class dlgHeatMapPlot
         Me.lblFillChoropleth.Name = "lblFillChoropleth"
         Me.lblFillChoropleth.Tag = "fill"
         '
+        'lblGroup
+        '
+        resources.ApplyResources(Me.lblGroup, "lblGroup")
+        Me.lblGroup.Name = "lblGroup"
+        '
+        'contextMenuStripOptions
+        '
+        Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions})
+        Me.contextMenuStripOptions.Name = "contextMenuStripOk"
+        resources.ApplyResources(Me.contextMenuStripOptions, "contextMenuStripOptions")
+        '
+        'toolStripMenuItemPlotOptions
+        '
+        Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions"
+        resources.ApplyResources(Me.toolStripMenuItemPlotOptions, "toolStripMenuItemPlotOptions")
+        '
+        'toolStripMenuItemTileOptions
+        '
+        Me.toolStripMenuItemTileOptions.Name = "toolStripMenuItemTileOptions"
+        resources.ApplyResources(Me.toolStripMenuItemTileOptions, "toolStripMenuItemTileOptions")
+        '
+        'toolStripMenuItemPolygonOptions
+        '
+        Me.toolStripMenuItemPolygonOptions.Name = "toolStripMenuItemPolygonOptions"
+        resources.ApplyResources(Me.toolStripMenuItemPolygonOptions, "toolStripMenuItemPolygonOptions")
+        '
+        'lblFacetBy
+        '
+        resources.ApplyResources(Me.lblFacetBy, "lblFacetBy")
+        Me.lblFacetBy.Name = "lblFacetBy"
+        Me.lblFacetBy.Tag = ""
+        '
+        'ucrInputStation
+        '
+        Me.ucrInputStation.AddQuotesIfUnrecognised = True
+        resources.ApplyResources(Me.ucrInputStation, "ucrInputStation")
+        Me.ucrInputStation.GetSetSelectedIndex = -1
+        Me.ucrInputStation.IsReadOnly = False
+        Me.ucrInputStation.Name = "ucrInputStation"
+        '
+        'ucr1stFactorReceiver
+        '
+        resources.ApplyResources(Me.ucr1stFactorReceiver, "ucr1stFactorReceiver")
+        Me.ucr1stFactorReceiver.frmParent = Me
+        Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
+        Me.ucr1stFactorReceiver.Selector = Nothing
+        Me.ucr1stFactorReceiver.strNcFilePath = ""
+        Me.ucr1stFactorReceiver.ucrSelector = Nothing
+        '
+        'ucrInputLegendPosition
+        '
+        Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True
+        resources.ApplyResources(Me.ucrInputLegendPosition, "ucrInputLegendPosition")
+        Me.ucrInputLegendPosition.GetSetSelectedIndex = -1
+        Me.ucrInputLegendPosition.IsReadOnly = False
+        Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
+        '
+        'ucrChkLegend
+        '
+        resources.ApplyResources(Me.ucrChkLegend, "ucrChkLegend")
+        Me.ucrChkLegend.Checked = False
+        Me.ucrChkLegend.Name = "ucrChkLegend"
+        '
+        'cmdOptions
+        '
+        resources.ApplyResources(Me.cmdOptions, "cmdOptions")
+        Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions
+        Me.cmdOptions.Name = "cmdOptions"
+        Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions
+        Me.cmdOptions.Tag = "Plot Options"
+        Me.cmdOptions.UseVisualStyleBackColor = True
+        '
+        'ucrChkPoints
+        '
+        resources.ApplyResources(Me.ucrChkPoints, "ucrChkPoints")
+        Me.ucrChkPoints.Checked = False
+        Me.ucrChkPoints.Name = "ucrChkPoints"
+        '
         'ucrChkFlipCoordinates
         '
         resources.ApplyResources(Me.ucrChkFlipCoordinates, "ucrChkFlipCoordinates")
@@ -306,12 +389,6 @@ Partial Class dlgHeatMapPlot
         Me.ucrInputSize.IsReadOnly = False
         Me.ucrInputSize.Name = "ucrInputSize"
         '
-        'ucrChkAddLabels
-        '
-        resources.ApplyResources(Me.ucrChkAddLabels, "ucrChkAddLabels")
-        Me.ucrChkAddLabels.Checked = False
-        Me.ucrChkAddLabels.Name = "ucrChkAddLabels"
-        '
         'ucrInputPosition
         '
         Me.ucrInputPosition.AddQuotesIfUnrecognised = True
@@ -346,56 +423,24 @@ Partial Class dlgHeatMapPlot
         Me.ucrReceiverGroup.strNcFilePath = ""
         Me.ucrReceiverGroup.ucrSelector = Nothing
         '
-        'lblGroup
-        '
-        resources.ApplyResources(Me.lblGroup, "lblGroup")
-        Me.lblGroup.Name = "lblGroup"
-        '
-        'ucrChkPoints
-        '
-        resources.ApplyResources(Me.ucrChkPoints, "ucrChkPoints")
-        Me.ucrChkPoints.Checked = False
-        Me.ucrChkPoints.Name = "ucrChkPoints"
-        '
-        'contextMenuStripOptions
-        '
-        Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions})
-        Me.contextMenuStripOptions.Name = "contextMenuStripOk"
-        resources.ApplyResources(Me.contextMenuStripOptions, "contextMenuStripOptions")
-        '
-        'toolStripMenuItemPlotOptions
-        '
-        Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions"
-        resources.ApplyResources(Me.toolStripMenuItemPlotOptions, "toolStripMenuItemPlotOptions")
-        '
-        'toolStripMenuItemTileOptions
-        '
-        Me.toolStripMenuItemTileOptions.Name = "toolStripMenuItemTileOptions"
-        resources.ApplyResources(Me.toolStripMenuItemTileOptions, "toolStripMenuItemTileOptions")
-        '
-        'toolStripMenuItemPolygonOptions
-        '
-        Me.toolStripMenuItemPolygonOptions.Name = "toolStripMenuItemPolygonOptions"
-        resources.ApplyResources(Me.toolStripMenuItemPolygonOptions, "toolStripMenuItemPolygonOptions")
-        '
-        'cmdOptions
+        'ucrChkAddLabels
         '
-        resources.ApplyResources(Me.cmdOptions, "cmdOptions")
-        Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions
-        Me.cmdOptions.Name = "cmdOptions"
-        Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions
-        Me.cmdOptions.Tag = "Plot Options"
-        Me.cmdOptions.UseVisualStyleBackColor = True
+        resources.ApplyResources(Me.ucrChkAddLabels, "ucrChkAddLabels")
+        Me.ucrChkAddLabels.Checked = False
+        Me.ucrChkAddLabels.Name = "ucrChkAddLabels"
         '
         'dlgHeatMapPlot
         '
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.ucrInputStation)
+        Me.Controls.Add(Me.ucr1stFactorReceiver)
+        Me.Controls.Add(Me.lblFacetBy)
+        Me.Controls.Add(Me.ucrInputLegendPosition)
+        Me.Controls.Add(Me.ucrChkLegend)
         Me.Controls.Add(Me.cmdOptions)
-        Me.Controls.Add(Me.ucrChkPoints)
         Me.Controls.Add(Me.lblGroup)
         Me.Controls.Add(Me.lblFillChoropleth)
-        Me.Controls.Add(Me.ucrChkFlipCoordinates)
         Me.Controls.Add(Me.rdoChoroplethMap)
         Me.Controls.Add(Me.rdoHeatMap)
         Me.Controls.Add(Me.lblPointsOptional)
@@ -430,6 +475,8 @@ Partial Class dlgHeatMapPlot
         Me.Controls.Add(Me.lblReorderVariableX)
         Me.Controls.Add(Me.ucrReceiverGroup)
         Me.Controls.Add(Me.ucrChkAddLabels)
+        Me.Controls.Add(Me.ucrChkPoints)
+        Me.Controls.Add(Me.ucrChkFlipCoordinates)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
         Me.MaximizeBox = False
         Me.MinimizeBox = False
@@ -482,4 +529,9 @@ Partial Class dlgHeatMapPlot
     Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem
     Friend WithEvents toolStripMenuItemTileOptions As ToolStripMenuItem
     Friend WithEvents toolStripMenuItemPolygonOptions As ToolStripMenuItem
+    Friend WithEvents ucrInputStation As ucrInputComboBox
+    Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle
+    Friend WithEvents lblFacetBy As Label
+    Friend WithEvents ucrInputLegendPosition As ucrInputComboBox
+    Friend WithEvents ucrChkLegend As ucrCheck
 End Class
\ No newline at end of file
diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx
index 0aac402b5a0..3835b0a3259 100644
--- a/instat/dlgHeatMapPlot.resx
+++ b/instat/dlgHeatMapPlot.resx
@@ -148,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblXVariable.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>26</value>
   </data>
   <data name="lblFill.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -178,7 +178,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblFill.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>17</value>
   </data>
   <data name="lblLabelPosition.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -187,7 +187,7 @@
     <value>NoControl</value>
   </data>
   <data name="lblLabelPosition.Location" type="System.Drawing.Point, System.Drawing">
-    <value>126, 413</value>
+    <value>126, 391</value>
   </data>
   <data name="lblLabelPosition.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 13</value>
@@ -208,7 +208,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLabelPosition.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>34</value>
   </data>
   <data name="lblLabelColour.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -217,7 +217,7 @@
     <value>NoControl</value>
   </data>
   <data name="lblLabelColour.Location" type="System.Drawing.Point, System.Drawing">
-    <value>229, 413</value>
+    <value>229, 391</value>
   </data>
   <data name="lblLabelColour.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 13</value>
@@ -238,7 +238,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLabelColour.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>36</value>
   </data>
   <data name="lblLabelSize.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -247,7 +247,7 @@
     <value>NoControl</value>
   </data>
   <data name="lblLabelSize.Location" type="System.Drawing.Point, System.Drawing">
-    <value>322, 413</value>
+    <value>322, 391</value>
   </data>
   <data name="lblLabelSize.Size" type="System.Drawing.Size, System.Drawing">
     <value>30, 13</value>
@@ -268,7 +268,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLabelSize.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>38</value>
   </data>
   <data name="lblPointsOptional.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -298,7 +298,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblPointsOptional.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>11</value>
   </data>
   <data name="lblPointsSize.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -328,7 +328,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblPointsSize.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>12</value>
   </data>
   <data name="lblReorderVariableX.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -358,7 +358,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblReorderVariableX.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>40</value>
   </data>
   <data name="lblReorderValue.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -388,7 +388,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblReorderValue.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>29</value>
   </data>
   <data name="rdoChoroplethMap.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
     <value>Button</value>
@@ -424,7 +424,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;rdoChoroplethMap.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>9</value>
   </data>
   <data name="rdoHeatMap.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
     <value>Button</value>
@@ -460,7 +460,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;rdoHeatMap.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>10</value>
   </data>
   <data name="lblLongitude.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -490,7 +490,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLongitude.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>24</value>
   </data>
   <data name="lblLatitude.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -520,7 +520,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLatitude.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>28</value>
   </data>
   <data name="lblFillChoropleth.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -550,33 +550,123 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblFillChoropleth.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>8</value>
   </data>
-  <data name="ucrChkFlipCoordinates.AutoSize" type="System.Boolean, mscorlib">
+  <data name="lblGroup.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="ucrChkFlipCoordinates.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 379</value>
+  <data name="lblGroup.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="ucrChkFlipCoordinates.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 23</value>
+  <data name="lblGroup.Location" type="System.Drawing.Point, System.Drawing">
+    <value>273, 197</value>
   </data>
-  <data name="ucrChkFlipCoordinates.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
+  <data name="lblGroup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>55, 13</value>
   </data>
-  <data name="&gt;&gt;ucrChkFlipCoordinates.Name" xml:space="preserve">
-    <value>ucrChkFlipCoordinates</value>
+  <data name="lblGroup.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
   </data>
-  <data name="&gt;&gt;ucrChkFlipCoordinates.Type" xml:space="preserve">
-    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  <data name="lblGroup.Text" xml:space="preserve">
+    <value>Group/ID:</value>
   </data>
-  <data name="&gt;&gt;ucrChkFlipCoordinates.Parent" xml:space="preserve">
+  <data name="&gt;&gt;lblGroup.Name" xml:space="preserve">
+    <value>lblGroup</value>
+  </data>
+  <data name="&gt;&gt;lblGroup.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblGroup.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;ucrChkFlipCoordinates.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="&gt;&gt;lblGroup.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
-  <data name="ucrReceiverPointsHeatMap.AutoSize" type="System.Boolean, mscorlib">
+  <metadata name="contextMenuStripOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="contextMenuStripOptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>164, 70</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripOptions.Name" xml:space="preserve">
+    <value>contextMenuStripOptions</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripOptions.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripMenuItemPlotOptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 22</value>
+  </data>
+  <data name="toolStripMenuItemPlotOptions.Text" xml:space="preserve">
+    <value>Plot Options</value>
+  </data>
+  <data name="toolStripMenuItemTileOptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 22</value>
+  </data>
+  <data name="toolStripMenuItemTileOptions.Text" xml:space="preserve">
+    <value>Tile Options</value>
+  </data>
+  <data name="toolStripMenuItemPolygonOptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 22</value>
+  </data>
+  <data name="toolStripMenuItemPolygonOptions.Text" xml:space="preserve">
+    <value>Polygon Options</value>
+  </data>
+  <data name="lblFacetBy.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblFacetBy.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="lblFacetBy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>207, 411</value>
+  </data>
+  <data name="lblFacetBy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>52, 13</value>
+  </data>
+  <data name="lblFacetBy.TabIndex" type="System.Int32, mscorlib">
+    <value>89</value>
+  </data>
+  <data name="lblFacetBy.Text" xml:space="preserve">
+    <value>Facet By:</value>
+  </data>
+  <data name="&gt;&gt;lblFacetBy.Name" xml:space="preserve">
+    <value>lblFacetBy</value>
+  </data>
+  <data name="&gt;&gt;lblFacetBy.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblFacetBy.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblFacetBy.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="ucrInputStation.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="ucrInputStation.Location" type="System.Drawing.Point, System.Drawing">
+    <value>316, 425</value>
+  </data>
+  <data name="ucrInputStation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>101, 21</value>
+  </data>
+  <data name="ucrInputStation.TabIndex" type="System.Int32, mscorlib">
+    <value>91</value>
+  </data>
+  <data name="&gt;&gt;ucrInputStation.Name" xml:space="preserve">
+    <value>ucrInputStation</value>
+  </data>
+  <data name="&gt;&gt;ucrInputStation.Type" xml:space="preserve">
+    <value>instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrInputStation.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrInputStation.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="ucr1stFactorReceiver.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -586,22 +676,61 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>420, 562</value>
+    <value>420, 538</value>
   </data>
-  <data name="cmdOptions.AutoSize" type="System.Boolean, mscorlib">
+  <data name="ucrInputLegendPosition.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="ucrInputLegendPosition.Location" type="System.Drawing.Point, System.Drawing">
+    <value>86, 425</value>
+  </data>
+  <data name="ucrInputLegendPosition.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 21</value>
+  </data>
+  <data name="ucrInputLegendPosition.TabIndex" type="System.Int32, mscorlib">
+    <value>93</value>
+  </data>
+  <data name="&gt;&gt;ucrInputLegendPosition.Name" xml:space="preserve">
+    <value>ucrInputLegendPosition</value>
+  </data>
+  <data name="&gt;&gt;ucrInputLegendPosition.Type" xml:space="preserve">
+    <value>instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrInputLegendPosition.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrInputLegendPosition.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="ucrChkLegend.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <metadata name="contextMenuStripOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="contextMenuStripOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>164, 70</value>
+  <data name="ucrChkLegend.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 426</value>
   </data>
-  <data name="&gt;&gt;contextMenuStripOptions.Name" xml:space="preserve">
-    <value>contextMenuStripOptions</value>
+  <data name="ucrChkLegend.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 24</value>
   </data>
-  <data name="&gt;&gt;contextMenuStripOptions.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="ucrChkLegend.TabIndex" type="System.Int32, mscorlib">
+    <value>92</value>
+  </data>
+  <data name="&gt;&gt;ucrChkLegend.Name" xml:space="preserve">
+    <value>ucrChkLegend</value>
+  </data>
+  <data name="&gt;&gt;ucrChkLegend.Type" xml:space="preserve">
+    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrChkLegend.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrChkLegend.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="cmdOptions.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cmdOptions.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="cmdOptions.Location" type="System.Drawing.Point, System.Drawing">
     <value>8, 247</value>
@@ -625,58 +754,34 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmdOptions.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="ucrChkPoints.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ucrChkPoints.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 379</value>
-  </data>
-  <data name="ucrChkPoints.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 23</value>
-  </data>
-  <data name="ucrChkPoints.TabIndex" type="System.Int32, mscorlib">
-    <value>39</value>
-  </data>
-  <data name="&gt;&gt;ucrChkPoints.Name" xml:space="preserve">
-    <value>ucrChkPoints</value>
-  </data>
-  <data name="&gt;&gt;ucrChkPoints.Type" xml:space="preserve">
-    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;ucrChkPoints.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ucrChkPoints.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>6</value>
   </data>
-  <data name="lblGroup.AutoSize" type="System.Boolean, mscorlib">
+  <data name="ucrReceiverPointsHeatMap.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="lblGroup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>273, 197</value>
+  <data name="ucrReceiverPointsHeatMap.Location" type="System.Drawing.Point, System.Drawing">
+    <value>273, 343</value>
   </data>
-  <data name="lblGroup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>55, 13</value>
+  <data name="ucrReceiverPointsHeatMap.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 0, 0, 0</value>
   </data>
-  <data name="lblGroup.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
+  <data name="ucrReceiverPointsHeatMap.Size" type="System.Drawing.Size, System.Drawing">
+    <value>125, 20</value>
   </data>
-  <data name="lblGroup.Text" xml:space="preserve">
-    <value>Group/ID:</value>
+  <data name="ucrReceiverPointsHeatMap.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
   </data>
-  <data name="&gt;&gt;lblGroup.Name" xml:space="preserve">
-    <value>lblGroup</value>
+  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Name" xml:space="preserve">
+    <value>ucrReceiverPointsHeatMap</value>
   </data>
-  <data name="&gt;&gt;lblGroup.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Type" xml:space="preserve">
+    <value>instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;lblGroup.Parent" xml:space="preserve">
+  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;lblGroup.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="&gt;&gt;ucrReceiverPointsHeatMap.ZOrder" xml:space="preserve">
+    <value>13</value>
   </data>
   <data name="ucrNudShapeHeatMap.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -700,13 +805,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrNudShapeHeatMap.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>14</value>
   </data>
   <data name="ucrChkColourPalette.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="ucrChkColourPalette.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 439</value>
+    <value>8, 346</value>
   </data>
   <data name="ucrChkColourPalette.Size" type="System.Drawing.Size, System.Drawing">
     <value>128, 23</value>
@@ -724,13 +829,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrChkColourPalette.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>15</value>
   </data>
   <data name="ucrInputColourPalette.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrInputColourPalette.Location" type="System.Drawing.Point, System.Drawing">
-    <value>141, 439</value>
+    <value>142, 346</value>
   </data>
   <data name="ucrInputColourPalette.Size" type="System.Drawing.Size, System.Drawing">
     <value>63, 21</value>
@@ -748,7 +853,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputColourPalette.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>16</value>
   </data>
   <data name="ucrReceiverFill.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -775,13 +880,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverFill.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>18</value>
   </data>
   <data name="ucrSaveGraph.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrSaveGraph.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 470</value>
+    <value>8, 453</value>
   </data>
   <data name="ucrSaveGraph.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 5, 4, 5</value>
@@ -802,13 +907,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrSaveGraph.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>19</value>
   </data>
   <data name="ucrBase.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 510</value>
+    <value>8, 487</value>
   </data>
   <data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
     <value>410, 58</value>
@@ -826,7 +931,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>20</value>
   </data>
   <data name="ucrPnlOptions.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
@@ -850,7 +955,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrPnlOptions.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>21</value>
   </data>
   <data name="ucrInputReorderValue.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
@@ -874,7 +979,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputReorderValue.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>22</value>
   </data>
   <data name="ucrHeatMapSelector.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -901,7 +1006,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrHeatMapSelector.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>23</value>
   </data>
   <data name="ucrReceiverLongitude.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -928,7 +1033,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverLongitude.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>25</value>
   </data>
   <data name="ucrReceiverLatitude.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -955,7 +1060,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverLatitude.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>27</value>
   </data>
   <data name="ucrReceiverFillChoropleth.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -982,7 +1087,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverFillChoropleth.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>30</value>
   </data>
   <data name="ucrVariableAsFactorForHeatMap.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1006,7 +1111,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrVariableAsFactorForHeatMap.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>31</value>
   </data>
   <data name="ucrInputReorderVariableX.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
@@ -1030,13 +1135,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputReorderVariableX.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>32</value>
   </data>
   <data name="ucrInputSize.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrInputSize.Location" type="System.Drawing.Point, System.Drawing">
-    <value>349, 409</value>
+    <value>349, 387</value>
   </data>
   <data name="ucrInputSize.Size" type="System.Drawing.Size, System.Drawing">
     <value>59, 23</value>
@@ -1054,13 +1159,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputSize.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>33</value>
   </data>
   <data name="ucrInputPosition.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrInputPosition.Location" type="System.Drawing.Point, System.Drawing">
-    <value>173, 409</value>
+    <value>173, 387</value>
   </data>
   <data name="ucrInputPosition.Size" type="System.Drawing.Size, System.Drawing">
     <value>52, 23</value>
@@ -1078,13 +1183,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputPosition.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>35</value>
   </data>
   <data name="ucrInputColour.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
   <data name="ucrInputColour.Location" type="System.Drawing.Point, System.Drawing">
-    <value>269, 409</value>
+    <value>269, 387</value>
   </data>
   <data name="ucrInputColour.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
@@ -1102,7 +1207,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrInputColour.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>37</value>
   </data>
   <data name="ucrReceiverX.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1129,7 +1234,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverX.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>39</value>
   </data>
   <data name="ucrReceiverGroup.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1156,13 +1261,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrReceiverGroup.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>41</value>
   </data>
   <data name="ucrChkAddLabels.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="ucrChkAddLabels.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 409</value>
+    <value>8, 387</value>
   </data>
   <data name="ucrChkAddLabels.Size" type="System.Drawing.Size, System.Drawing">
     <value>128, 23</value>
@@ -1180,8 +1285,59 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;ucrChkAddLabels.ZOrder" xml:space="preserve">
+    <value>42</value>
+  </data>
+  <data name="ucrChkPoints.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ucrChkPoints.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 314</value>
+  </data>
+  <data name="ucrChkPoints.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 23</value>
+  </data>
+  <data name="ucrChkPoints.TabIndex" type="System.Int32, mscorlib">
     <value>39</value>
   </data>
+  <data name="&gt;&gt;ucrChkPoints.Name" xml:space="preserve">
+    <value>ucrChkPoints</value>
+  </data>
+  <data name="&gt;&gt;ucrChkPoints.Type" xml:space="preserve">
+    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrChkPoints.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrChkPoints.ZOrder" xml:space="preserve">
+    <value>43</value>
+  </data>
+  <data name="ucrChkFlipCoordinates.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ucrChkFlipCoordinates.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 315</value>
+  </data>
+  <data name="ucrChkFlipCoordinates.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 23</value>
+  </data>
+  <data name="ucrChkFlipCoordinates.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="&gt;&gt;ucrChkFlipCoordinates.Name" xml:space="preserve">
+    <value>ucrChkFlipCoordinates</value>
+  </data>
+  <data name="&gt;&gt;ucrChkFlipCoordinates.Type" xml:space="preserve">
+    <value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ucrChkFlipCoordinates.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ucrChkFlipCoordinates.ZOrder" xml:space="preserve">
+    <value>44</value>
+  </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
@@ -1212,46 +1368,28 @@
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="ucrReceiverPointsHeatMap.Location" type="System.Drawing.Point, System.Drawing">
-    <value>273, 343</value>
+  <data name="ucr1stFactorReceiver.Location" type="System.Drawing.Point, System.Drawing">
+    <value>204, 426</value>
   </data>
-  <data name="ucrReceiverPointsHeatMap.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="ucr1stFactorReceiver.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
-  <data name="ucrReceiverPointsHeatMap.Size" type="System.Drawing.Size, System.Drawing">
-    <value>125, 20</value>
+  <data name="ucr1stFactorReceiver.Size" type="System.Drawing.Size, System.Drawing">
+    <value>110, 26</value>
   </data>
-  <data name="ucrReceiverPointsHeatMap.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+  <data name="ucr1stFactorReceiver.TabIndex" type="System.Int32, mscorlib">
+    <value>90</value>
   </data>
-  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Name" xml:space="preserve">
-    <value>ucrReceiverPointsHeatMap</value>
+  <data name="&gt;&gt;ucr1stFactorReceiver.Name" xml:space="preserve">
+    <value>ucr1stFactorReceiver</value>
   </data>
-  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Type" xml:space="preserve">
+  <data name="&gt;&gt;ucr1stFactorReceiver.Type" xml:space="preserve">
     <value>instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;ucrReceiverPointsHeatMap.Parent" xml:space="preserve">
+  <data name="&gt;&gt;ucr1stFactorReceiver.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;ucrReceiverPointsHeatMap.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="toolStripMenuItemPlotOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 22</value>
-  </data>
-  <data name="toolStripMenuItemPlotOptions.Text" xml:space="preserve">
-    <value>Plot Options</value>
-  </data>
-  <data name="toolStripMenuItemTileOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 22</value>
-  </data>
-  <data name="toolStripMenuItemTileOptions.Text" xml:space="preserve">
-    <value>Tile Options</value>
-  </data>
-  <data name="toolStripMenuItemPolygonOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 22</value>
-  </data>
-  <data name="toolStripMenuItemPolygonOptions.Text" xml:space="preserve">
-    <value>Polygon Options</value>
+  <data name="&gt;&gt;ucr1stFactorReceiver.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb
index 7ebeb13f287..e27f4c5f5d8 100644
--- a/instat/dlgHeatMapPlot.vb
+++ b/instat/dlgHeatMapPlot.vb
@@ -30,6 +30,18 @@ Public Class dlgHeatMapPlot
     Private ReadOnly strReverse As String = "Reverse"
     Private ReadOnly strNone As String = "None"
 
+    Private clsFacetFunction As New RFunction
+    Private clsFacetVariablesOperator As New ROperator
+    Private clsFacetRowOp As New ROperator
+    Private clsFacetColOp As New ROperator
+
+    Private ReadOnly strFacetWrap As String = "Facet Wrap"
+    Private ReadOnly strFacetRow As String = "Facet Row"
+    Private ReadOnly strFacetCol As String = "Facet Column"
+
+    Private bUpdateComboOptions As Boolean = True
+    Private bUpdatingParameters As Boolean = False
+
     Private clsCoordPolarStartOperator, clsBaseOperator, clsPipeOperator As New ROperator
 
     Private clsCoordPolarFunction, clsAnnotateFunction, clsLocalRaesFunction, clsXScaleDateFunction, clsYScaleDateFunction,
@@ -65,6 +77,7 @@ Public Class dlgHeatMapPlot
         Dim dctLabelPositions As New Dictionary(Of String, String)
         Dim dctLabelSizes As New Dictionary(Of String, String)
         Dim dctColourPallette As New Dictionary(Of String, String)
+        Dim dctLegendPosition As New Dictionary(Of String, String)
 
         ucrBase.iHelpTopicID = 476
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
@@ -202,6 +215,32 @@ Public Class dlgHeatMapPlot
         ucrInputReorderVariableX.SetDropDownStyleAsNonEditable()
         ucrInputReorderVariableX.SetLinkedDisplayControl(lblReorderVariableX)
 
+        ucrChkLegend.SetText("Legend:")
+        ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None")
+        ucrInputLegendPosition.SetDropDownStyleAsNonEditable()
+        ucrInputLegendPosition.SetParameter(New RParameter("legend.position"))
+        dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34))
+        dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34))
+        dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34))
+        dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34))
+        dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34))
+        ucrInputLegendPosition.SetItems(dctLegendPosition)
+        ucrChkLegend.AddParameterPresentCondition(True, "legend.position")
+        ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False)
+
+        ucr1stFactorReceiver.SetParameter(New RParameter("var1"))
+        ucr1stFactorReceiver.Selector = ucrHeatMapSelector
+        ucr1stFactorReceiver.SetIncludedDataTypes({"factor"})
+        ucr1stFactorReceiver.strSelectorHeading = "Factors"
+        ucr1stFactorReceiver.bWithQuotes = False
+        ucr1stFactorReceiver.SetParameterIsString()
+        ucr1stFactorReceiver.SetValuesToIgnore({"."})
+        ucr1stFactorReceiver.SetParameterPosition(1)
+        ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy)
+
+        ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone})
+        ucrInputStation.SetDropDownStyleAsNonEditable()
+
         clsCoordFlipFunction.SetPackageName("ggplot2")
         clsCoordFlipFunction.SetRCommand("coord_flip")
         clsCoordFlipParam.SetArgumentName("coord_flip")
@@ -240,6 +279,13 @@ Public Class dlgHeatMapPlot
         clsGroupByFunction = New RFunction
         clsSummariseFunction = New RFunction
         clsDummyFunction = New RFunction
+        clsFacetFunction = New RFunction
+        clsFacetVariablesOperator = New ROperator
+        clsFacetRowOp = New ROperator
+        clsFacetColOp = New ROperator
+
+        ucrInputStation.SetName(strFacetWrap)
+        ucrInputStation.bUpdateRCodeFromControl = True
 
         ucrSaveGraph.Reset()
         ucrVariableAsFactorForHeatMap.SetMeAsReceiver()
@@ -362,6 +408,22 @@ Public Class dlgHeatMapPlot
         clsSizeChoroplethAesFunction.AddParameter("x", "x", iPosition:=0)
         clsSizeChoroplethAesFunction.AddParameter("y", "y", iPosition:=1)
 
+        clsFacetFunction.SetPackageName("ggplot2")
+        clsFacetRowOp.SetOperation("+")
+        clsFacetRowOp.bBrackets = False
+        clsFacetColOp.SetOperation("+")
+        clsFacetColOp.bBrackets = False
+        clsFacetVariablesOperator.SetOperation("~")
+        clsFacetVariablesOperator.bForceIncludeOperation = True
+        clsFacetVariablesOperator.bBrackets = False
+        clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0)
+
+        ' clsPipeOperator.SetOperation("%>%")
+        SetPipeAssignTo()
+
+        'clsGroupByFunction.SetPackageName("dplyr")
+        'clsGroupByFunction.SetRCommand("group_by")
+
 
         clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone())
         clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone()
@@ -425,6 +487,8 @@ Public Class dlgHeatMapPlot
         ucrReceiverPointsHeatMap.SetRCode(clsSizeHeatMapAesFunction, bReset)
         ucrNudShapeHeatMap.SetRCode(clsGeomPointShapeHeatMapFunction, bReset)
         ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset)
+        ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+        ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
         bRCodeSet = True
 
         UnstackColumns()
@@ -454,6 +518,18 @@ Public Class dlgHeatMapPlot
         TestOkEnabled()
     End Sub
 
+    Private Sub AddRemoveTheme()
+        If clsThemeFunction.iParameterCount > 0 Then
+            clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15)
+        Else
+            clsBaseOperator.RemoveParameterByName("theme")
+        End If
+    End Sub
+
+    Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged
+        AddRemoveTheme()
+    End Sub
+
     Private Sub ucrChkAddLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLabels.ControlValueChanged
         If ucrChkAddLabels.Checked Then
             clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextFunction, iPosition:=5)
@@ -476,7 +552,7 @@ Public Class dlgHeatMapPlot
         sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction,
              clsNewGlobalAesFunction:=If(rdoHeatMap.Checked, clsHeatmapAesFunction, clsChoroplethAesFunction), clsNewXLabsTitleFunction:=clsXlabsFunction,
              clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction,
-             clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrHeatMapSelector,
+             clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrHeatMapSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator,
              strMainDialogGeomParameterNames:=strGeomParameterNames, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator,
              clsNewAnnotateFunction:=clsAnnotateFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()
@@ -655,8 +731,163 @@ Public Class dlgHeatMapPlot
         End If
     End Sub
 
+    Private Sub AutoFacetStation()
+        Dim currentReceiver As ucrReceiver = ucrHeatMapSelector.CurrentReceiver
+
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
+        End If
+    End Sub
+
+    Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged
+        If Not bUpdateComboOptions Then
+            Exit Sub
+        End If
+        Dim strChangedText As String = ucrChangedControl.GetText()
+        If strChangedText <> strNone Then
+            If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso
+                    Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then
+                bUpdateComboOptions = False
+                ucrInputStation.SetName(strNone)
+                bUpdateComboOptions = True
+            End If
+            If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso
+                    ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso
+                    ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then
+                ucrInputStation.SetName(strNone)
+            End If
+        End If
+        UpdateParameters()
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub UpdateParameters()
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
+        clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
+        clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        bUpdatingParameters = True
+        ucr1stFactorReceiver.SetRCode(Nothing)
+        Select Case ucrInputStation.GetText()
+            Case strFacetWrap
+                ucr1stFactorReceiver.ChangeParameterName("var1")
+                ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator)
+            Case strFacetCol
+                ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetColOp)
+            Case strFacetRow
+                ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetRowOp)
+        End Select
+        If Not clsHeatmapAesFunction.ContainsParameter("x") Then
+            clsHeatmapAesFunction.AddParameter("x", Chr(34) & Chr(34))
+        End If
+        bUpdatingParameters = False
+    End Sub
+
+    Private Sub AddRemoveFacets()
+        Dim bWrap As Boolean = False
+        Dim bCol As Boolean = False
+        Dim bRow As Boolean = False
+
+        If bUpdatingParameters Then
+            Exit Sub
+        End If
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        If Not ucr1stFactorReceiver.IsEmpty Then
+            Select Case ucrInputStation.GetText()
+                Case strFacetWrap
+                    bWrap = True
+                Case strFacetCol
+                    bCol = True
+                Case strFacetRow
+                    bRow = True
+            End Select
+        End If
+
+        If bWrap OrElse bRow OrElse bCol Then
+            clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction)
+        End If
+        If bWrap Then
+            clsFacetFunction.SetRCommand("facet_wrap")
+        End If
+        If bRow OrElse bCol Then
+            clsFacetFunction.SetRCommand("facet_grid")
+        End If
+        If bRow Then
+            clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0)
+        ElseIf bCol AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("left")
+        End If
+        If bCol Then
+            clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1)
+        ElseIf bRow AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("right")
+        End If
+    End Sub
+
+    Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub GetParameterValue(clsOperator As ROperator)
+        Dim i As Integer = 0
+        For Each clsTempParam As RParameter In clsOperator.clsParameters
+            If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then
+                clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i)
+                i = i + 1
+            End If
+        Next
+    End Sub
+
+    Private Sub AddRemoveGroupBy()
+        If clsPipeOperator.ContainsParameter("mutate") Then
+            clsGroupByFunction.ClearParameters()
+            If clsBaseOperator.ContainsParameter("facets") Then
+                Select Case ucrInputStation.GetText()
+                    Case strFacetWrap
+                        GetParameterValue(clsFacetVariablesOperator)
+                    Case strFacetCol
+                        GetParameterValue(clsFacetColOp)
+                    Case strFacetRow
+                        GetParameterValue(clsFacetRowOp)
+                End Select
+            End If
+
+            If clsGroupByFunction.iParameterCount > 0 Then
+                clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1)
+            Else
+                clsPipeOperator.RemoveParameterByName("group_by")
+            End If
+        Else
+            clsPipeOperator.RemoveParameterByName("group_by")
+        End If
+
+        SetPipeAssignTo()
+    End Sub
+
+    Private Sub SetPipeAssignTo()
+        If ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then
+            clsPipeOperator.SetAssignTo(ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
+        Else
+            clsPipeOperator.RemoveAssignTo()
+        End If
+    End Sub
+
     Private Sub ucrHeatMapSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrHeatMapSelector.ControlValueChanged
         clsPipeOperator.AddParameter("data", ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0)
+        AutoFacetStation()
+        SetPipeAssignTo()
     End Sub
 
     Private Sub AddRemoveGeomParameter()
diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb
index 75e3de42232..76d0d340272 100644
--- a/instat/dlgHistogram.vb
+++ b/instat/dlgHistogram.vb
@@ -337,8 +337,21 @@ Public Class dlgHistogram
         If rdoHistogram.Checked Then
             If ucrChkDisplayAsDotPlot.Checked Then
                 clsRgeomPlotFunction.SetRCommand("geom_dotplot")
+                clsRgeomPlotFunction.RemoveParameterByName("mapping")
+                If Not ucrFactorReceiver.IsEmpty Then
+                    clsRgeomPlotFunction.AddParameter("binpositions", Chr(34) & "all" & Chr(34), iPosition:=0)
+                    clsRgeomPlotFunction.AddParameter("stackgroups", "TRUE", iPosition:=1)
+                Else
+                    clsRgeomPlotFunction.RemoveParameterByName("binpositions")
+                    clsRgeomPlotFunction.RemoveParameterByName("stackgroups")
+                End If
             Else
                 clsRgeomPlotFunction.SetRCommand("geom_histogram")
+                clsRgeomPlotFunction.AddParameter("mapping", clsRFunctionParameter:=clsHistAesFunction)
+                If Not ucrFactorReceiver.IsEmpty Then
+                    clsRgeomPlotFunction.RemoveParameterByName("binpositions")
+                    clsRgeomPlotFunction.RemoveParameterByName("stackgroups")
+                End If
             End If
             ucrFactorReceiver.ChangeParameterName("fill")
             If Not ucrSaveHist.bUserTyped Then ucrSaveHist.SetPrefix("histogram")
diff --git a/instat/dlgIDFCurves.vb b/instat/dlgIDFCurves.vb
index d0e3ce284eb..215c4e7b639 100644
--- a/instat/dlgIDFCurves.vb
+++ b/instat/dlgIDFCurves.vb
@@ -37,6 +37,7 @@ Public Class dlgIDFCurves
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 523
         ucrBase.clsRsyntax.bSeparateThread = False
 
         ucrIDFCurvesSelector.SetParameter(New RParameter("prdat", 0))
diff --git a/instat/dlgLocatingPointsInShapeFile.vb b/instat/dlgLocatingPointsInShapeFile.vb
index 21dcf12d695..2ce99100279 100644
--- a/instat/dlgLocatingPointsInShapeFile.vb
+++ b/instat/dlgLocatingPointsInShapeFile.vb
@@ -44,6 +44,7 @@ Public Class dlgLocatingPointsInShapeFile
     End Sub
 
     Private Sub InitiliseDialog()
+        ucrBase.iHelpTopicID=622
         ucrSelectorStationFile.SetParameter(New RParameter("x", 0))
         ucrSelectorStationFile.SetParameterIsrfunction()
 
diff --git a/instat/dlgMosaicPlot.Designer.vb b/instat/dlgMosaicPlot.Designer.vb
index 17023502c43..dfe34001258 100644
--- a/instat/dlgMosaicPlot.Designer.vb
+++ b/instat/dlgMosaicPlot.Designer.vb
@@ -43,6 +43,11 @@ Partial Class dlgMosaicPlot
         Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem()
         Me.toolStripMenuItemMosaicOptions = New System.Windows.Forms.ToolStripMenuItem()
         Me.cmdOptions = New instat.ucrSplitButton()
+        Me.ucrInputStation = New instat.ucrInputComboBox()
+        Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
+        Me.lblFacetBy = New System.Windows.Forms.Label()
+        Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
+        Me.ucrChkLegend = New instat.ucrCheck()
         Me.contextMenuStripOptions.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -101,7 +106,7 @@ Partial Class dlgMosaicPlot
         Me.ucrNudXAxisLabelsAngle.AutoSize = True
         Me.ucrNudXAxisLabelsAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
         Me.ucrNudXAxisLabelsAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0})
-        Me.ucrNudXAxisLabelsAngle.Location = New System.Drawing.Point(183, 301)
+        Me.ucrNudXAxisLabelsAngle.Location = New System.Drawing.Point(183, 326)
         Me.ucrNudXAxisLabelsAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
         Me.ucrNudXAxisLabelsAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
         Me.ucrNudXAxisLabelsAngle.Name = "ucrNudXAxisLabelsAngle"
@@ -124,7 +129,7 @@ Partial Class dlgMosaicPlot
         '
         Me.ucrChkOmitMissing.AutoSize = True
         Me.ucrChkOmitMissing.Checked = False
-        Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 269)
+        Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 278)
         Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing"
         Me.ucrChkOmitMissing.Size = New System.Drawing.Size(224, 23)
         Me.ucrChkOmitMissing.TabIndex = 13
@@ -184,7 +189,7 @@ Partial Class dlgMosaicPlot
         'ucrSaveMosaicPlot
         '
         Me.ucrSaveMosaicPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrSaveMosaicPlot.Location = New System.Drawing.Point(9, 385)
+        Me.ucrSaveMosaicPlot.Location = New System.Drawing.Point(9, 422)
         Me.ucrSaveMosaicPlot.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.ucrSaveMosaicPlot.Name = "ucrSaveMosaicPlot"
         Me.ucrSaveMosaicPlot.Size = New System.Drawing.Size(317, 24)
@@ -194,7 +199,7 @@ Partial Class dlgMosaicPlot
         '
         Me.ucrChkXAxisLabelAngle.AutoSize = True
         Me.ucrChkXAxisLabelAngle.Checked = False
-        Me.ucrChkXAxisLabelAngle.Location = New System.Drawing.Point(9, 301)
+        Me.ucrChkXAxisLabelAngle.Location = New System.Drawing.Point(9, 326)
         Me.ucrChkXAxisLabelAngle.Name = "ucrChkXAxisLabelAngle"
         Me.ucrChkXAxisLabelAngle.Size = New System.Drawing.Size(168, 23)
         Me.ucrChkXAxisLabelAngle.TabIndex = 14
@@ -215,7 +220,7 @@ Partial Class dlgMosaicPlot
         '
         Me.ucrBase.AutoSize = True
         Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrBase.Location = New System.Drawing.Point(12, 418)
+        Me.ucrBase.Location = New System.Drawing.Point(12, 455)
         Me.ucrBase.Name = "ucrBase"
         Me.ucrBase.Size = New System.Drawing.Size(408, 52)
         Me.ucrBase.TabIndex = 17
@@ -252,12 +257,72 @@ Partial Class dlgMosaicPlot
         Me.cmdOptions.Text = "Plot Options"
         Me.cmdOptions.UseVisualStyleBackColor = True
         '
+        'ucrInputStation
+        '
+        Me.ucrInputStation.AddQuotesIfUnrecognised = True
+        Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputStation.GetSetSelectedIndex = -1
+        Me.ucrInputStation.IsReadOnly = False
+        Me.ucrInputStation.Location = New System.Drawing.Point(321, 381)
+        Me.ucrInputStation.Name = "ucrInputStation"
+        Me.ucrInputStation.Size = New System.Drawing.Size(101, 21)
+        Me.ucrInputStation.TabIndex = 96
+        '
+        'ucr1stFactorReceiver
+        '
+        Me.ucr1stFactorReceiver.AutoSize = True
+        Me.ucr1stFactorReceiver.frmParent = Me
+        Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(209, 382)
+        Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
+        Me.ucr1stFactorReceiver.Selector = Nothing
+        Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26)
+        Me.ucr1stFactorReceiver.strNcFilePath = ""
+        Me.ucr1stFactorReceiver.TabIndex = 95
+        Me.ucr1stFactorReceiver.ucrSelector = Nothing
+        '
+        'lblFacetBy
+        '
+        Me.lblFacetBy.AutoSize = True
+        Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.lblFacetBy.Location = New System.Drawing.Point(212, 367)
+        Me.lblFacetBy.Name = "lblFacetBy"
+        Me.lblFacetBy.Size = New System.Drawing.Size(52, 13)
+        Me.lblFacetBy.TabIndex = 94
+        Me.lblFacetBy.Tag = ""
+        Me.lblFacetBy.Text = "Facet By:"
+        '
+        'ucrInputLegendPosition
+        '
+        Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True
+        Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputLegendPosition.GetSetSelectedIndex = -1
+        Me.ucrInputLegendPosition.IsReadOnly = False
+        Me.ucrInputLegendPosition.Location = New System.Drawing.Point(91, 381)
+        Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
+        Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21)
+        Me.ucrInputLegendPosition.TabIndex = 98
+        '
+        'ucrChkLegend
+        '
+        Me.ucrChkLegend.AutoSize = True
+        Me.ucrChkLegend.Checked = False
+        Me.ucrChkLegend.Location = New System.Drawing.Point(9, 382)
+        Me.ucrChkLegend.Name = "ucrChkLegend"
+        Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24)
+        Me.ucrChkLegend.TabIndex = 97
+        '
         'dlgMosaicPlot
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(441, 475)
+        Me.ClientSize = New System.Drawing.Size(441, 510)
+        Me.Controls.Add(Me.ucrInputStation)
+        Me.Controls.Add(Me.ucr1stFactorReceiver)
+        Me.Controls.Add(Me.lblFacetBy)
+        Me.Controls.Add(Me.ucrInputLegendPosition)
+        Me.Controls.Add(Me.ucrChkLegend)
         Me.Controls.Add(Me.cmdOptions)
         Me.Controls.Add(Me.ucrNudXAxisLabelsAngle)
         Me.Controls.Add(Me.ucrInputPartitioning)
@@ -308,4 +373,9 @@ Partial Class dlgMosaicPlot
     Friend WithEvents contextMenuStripOptions As ContextMenuStrip
     Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem
     Friend WithEvents toolStripMenuItemMosaicOptions As ToolStripMenuItem
+    Friend WithEvents ucrInputStation As ucrInputComboBox
+    Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle
+    Friend WithEvents lblFacetBy As Label
+    Friend WithEvents ucrInputLegendPosition As ucrInputComboBox
+    Friend WithEvents ucrChkLegend As ucrCheck
 End Class
diff --git a/instat/dlgMosaicPlot.vb b/instat/dlgMosaicPlot.vb
index 8ee21119606..f4f6c2cf6f0 100644
--- a/instat/dlgMosaicPlot.vb
+++ b/instat/dlgMosaicPlot.vb
@@ -42,6 +42,22 @@ Public Class dlgMosaicPlot
     Private clsYScaleDateFunction As New RFunction
     Private clsScaleFillViridisFunction As New RFunction
     Private clsScaleColourViridisFunction As New RFunction
+
+    Private clsFacetFunction As New RFunction
+    Private clsFacetVariablesOperator As New ROperator
+    Private clsFacetRowOp As New ROperator
+    Private clsFacetColOp As New ROperator
+    Private clsPipeOperator As New ROperator
+    Private clsGroupByFunction As New RFunction
+
+    Private ReadOnly strNone As String = "None"
+    Private ReadOnly strFacetWrap As String = "Facet Wrap"
+    Private ReadOnly strFacetRow As String = "Facet Row"
+    Private ReadOnly strFacetCol As String = "Facet Column"
+
+    Private bUpdateComboOptions As Boolean = True
+    Private bUpdatingParameters As Boolean = False
+
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private bRCodeSet As Boolean = True
@@ -65,6 +81,7 @@ Public Class dlgMosaicPlot
 
     Private Sub InitialiseDialog()
         Dim dctPartitionOptions As New Dictionary(Of String, String)
+        Dim dctLegendPosition As New Dictionary(Of String, String)
 
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
         ucrBase.iHelpTopicID = 594
@@ -129,6 +146,32 @@ Public Class dlgMosaicPlot
         ucrNudXAxisLabelsAngle.SetParameter(New RParameter("angle"))
         ucrNudXAxisLabelsAngle.SetMinMax(0, 360)
 
+        ucrChkLegend.SetText("Legend:")
+        ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None")
+        ucrInputLegendPosition.SetDropDownStyleAsNonEditable()
+        ucrInputLegendPosition.SetParameter(New RParameter("legend.position"))
+        dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34))
+        dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34))
+        dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34))
+        dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34))
+        dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34))
+        ucrInputLegendPosition.SetItems(dctLegendPosition)
+        ucrChkLegend.AddParameterPresentCondition(True, "legend.position")
+        ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False)
+
+        ucr1stFactorReceiver.SetParameter(New RParameter("var1"))
+        ucr1stFactorReceiver.Selector = ucrSelectorMosaicPlot
+        ucr1stFactorReceiver.SetIncludedDataTypes({"factor"})
+        ucr1stFactorReceiver.strSelectorHeading = "Factors"
+        ucr1stFactorReceiver.bWithQuotes = False
+        ucr1stFactorReceiver.SetParameterIsString()
+        ucr1stFactorReceiver.SetValuesToIgnore({"."})
+        ucr1stFactorReceiver.SetParameterPosition(1)
+        ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy)
+
+        ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone})
+        ucrInputStation.SetDropDownStyleAsNonEditable()
+
         ucrSaveMosaicPlot.SetPrefix("mosaic")
         ucrSaveMosaicPlot.SetIsComboBox()
         ucrSaveMosaicPlot.SetCheckBoxText("Save Graph")
@@ -146,6 +189,17 @@ Public Class dlgMosaicPlot
 
         clsXElementLabels = New RFunction
 
+        clsFacetFunction = New RFunction
+        clsFacetVariablesOperator = New ROperator
+        clsFacetRowOp = New ROperator
+        clsFacetColOp = New ROperator
+        clsPipeOperator = New ROperator
+        clsGroupByFunction = New RFunction
+
+        ucrInputStation.SetName(strFacetWrap)
+        ucrInputStation.bUpdateRCodeFromControl = True
+
+
         ucrSelectorMosaicPlot.Reset()
         ucrSelectorMosaicPlot.SetGgplotFunction(clsBaseOperator)
 
@@ -172,6 +226,22 @@ Public Class dlgMosaicPlot
         clsAesFunction.SetPackageName("ggplot2")
         clsAesFunction.SetRCommand("aes")
 
+        clsFacetFunction.SetPackageName("ggplot2")
+        clsFacetRowOp.SetOperation("+")
+        clsFacetRowOp.bBrackets = False
+        clsFacetColOp.SetOperation("+")
+        clsFacetColOp.bBrackets = False
+        clsFacetVariablesOperator.SetOperation("~")
+        clsFacetVariablesOperator.bForceIncludeOperation = True
+        clsFacetVariablesOperator.bBrackets = False
+        clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0)
+
+        clsPipeOperator.SetOperation("%>%")
+        SetPipeAssignTo()
+
+        clsGroupByFunction.SetPackageName("dplyr")
+        clsGroupByFunction.SetRCommand("group_by")
+
         clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone())
         clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone()
         clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone()
@@ -215,6 +285,9 @@ Public Class dlgMosaicPlot
 
         ucrSaveMosaicPlot.SetRCode(clsBaseOperator, bReset)
 
+        ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+        ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+
         AddRemoveXAxisTextParameters()
         bRCodeSet = True
     End Sub
@@ -237,6 +310,163 @@ Public Class dlgMosaicPlot
         TestOkEnabled()
     End Sub
 
+    Private Sub AutoFacetStation()
+        Dim currentReceiver As ucrReceiver = ucrSelectorMosaicPlot.CurrentReceiver
+
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
+        End If
+    End Sub
+
+    Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged
+        If Not bUpdateComboOptions Then
+            Exit Sub
+        End If
+        Dim strChangedText As String = ucrChangedControl.GetText()
+        If strChangedText <> strNone Then
+            If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso
+                    Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then
+                bUpdateComboOptions = False
+                ucrInputStation.SetName(strNone)
+                bUpdateComboOptions = True
+            End If
+            If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso
+                    ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso
+                    ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then
+                ucrInputStation.SetName(strNone)
+            End If
+        End If
+        UpdateParameters()
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub UpdateParameters()
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
+        clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
+        clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        bUpdatingParameters = True
+        ucr1stFactorReceiver.SetRCode(Nothing)
+        Select Case ucrInputStation.GetText()
+            Case strFacetWrap
+                ucr1stFactorReceiver.ChangeParameterName("var1")
+                ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator)
+            Case strFacetCol
+                ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetColOp)
+            Case strFacetRow
+                ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetRowOp)
+        End Select
+        If Not clsAesFunction.ContainsParameter("x") Then
+            clsAesFunction.AddParameter("x", Chr(34) & Chr(34))
+        End If
+        bUpdatingParameters = False
+    End Sub
+
+    Private Sub AddRemoveFacets()
+        Dim bWrap As Boolean = False
+        Dim bCol As Boolean = False
+        Dim bRow As Boolean = False
+
+        If bUpdatingParameters Then
+            Exit Sub
+        End If
+
+        If Not ucr1stFactorReceiver.IsEmpty Then
+            Select Case ucrInputStation.GetText()
+                Case strFacetWrap
+                    bWrap = True
+                Case strFacetCol
+                    bCol = True
+                Case strFacetRow
+                    bRow = True
+            End Select
+        End If
+
+        If bWrap OrElse bRow OrElse bCol Then
+            clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction)
+        End If
+        If bWrap Then
+            clsFacetFunction.SetRCommand("facet_wrap")
+        End If
+        If bRow OrElse bCol Then
+            clsFacetFunction.SetRCommand("facet_grid")
+        End If
+        If bRow Then
+            clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0)
+        ElseIf bCol AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("left")
+        End If
+        If bCol Then
+            clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1)
+        ElseIf bRow AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("right")
+        End If
+    End Sub
+
+    Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub GetParameterValue(clsOperator As ROperator)
+        Dim i As Integer = 0
+        For Each clsTempParam As RParameter In clsOperator.clsParameters
+            If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then
+                clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i)
+                i = i + 1
+            End If
+        Next
+    End Sub
+
+    Private Sub AddRemoveGroupBy()
+        If clsPipeOperator.ContainsParameter("mutate") Then
+            clsGroupByFunction.ClearParameters()
+            If clsBaseOperator.ContainsParameter("facets") Then
+                Select Case ucrInputStation.GetText()
+                    Case strFacetWrap
+                        GetParameterValue(clsFacetVariablesOperator)
+                    Case strFacetCol
+                        GetParameterValue(clsFacetColOp)
+                    Case strFacetRow
+                        GetParameterValue(clsFacetRowOp)
+                End Select
+            End If
+
+            If clsGroupByFunction.iParameterCount > 0 Then
+                clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1)
+            Else
+                clsPipeOperator.RemoveParameterByName("group_by")
+            End If
+        Else
+            clsPipeOperator.RemoveParameterByName("group_by")
+        End If
+
+        SetPipeAssignTo()
+    End Sub
+
+    Private Sub SetPipeAssignTo()
+        If ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then
+            clsPipeOperator.SetAssignTo(ucrSelectorMosaicPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
+        Else
+            clsPipeOperator.RemoveAssignTo()
+        End If
+    End Sub
+
+    Private Sub ucrSelectorMosaicPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorMosaicPlot.ControlValueChanged
+        AutoFacetStation()
+        SetPipeAssignTo()
+    End Sub
+
     Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged
         Dim iXVarCount As Integer
 
@@ -285,6 +515,10 @@ Public Class dlgMosaicPlot
         End If
     End Sub
 
+    Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged
+        AddRemoveTheme()
+    End Sub
+
     Private Sub XAxisLabelAngleControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkXAxisLabelAngle.ControlValueChanged, ucrNudXAxisLabelsAngle.ControlValueChanged
         AddRemoveXAxisTextParameters()
     End Sub
@@ -300,7 +534,7 @@ Public Class dlgMosaicPlot
                          clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction,
                          clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction,
                          clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorMosaicPlot, clsNewCoordPolarFunction:=clsCoordPolarFunction,
-                         clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction,
+                         clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator,
                          clsNewAnnotateFunction:=clsAnnotateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bNewEnableColour:=False, bNewEnableDiscrete:=False, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()
         bResetSubdialog = False
diff --git a/instat/dlgNewMarkovChains.vb b/instat/dlgNewMarkovChains.vb
index e66a160aa01..123acf9e989 100644
--- a/instat/dlgNewMarkovChains.vb
+++ b/instat/dlgNewMarkovChains.vb
@@ -55,6 +55,7 @@ Public Class dlgNewMarkovChains
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 490
         ucrReceiverStation.Selector = ucrSelectorMarkovChains
         ucrReceiverStation.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "station" & Chr(34)})
         ucrReceiverStation.bAutoFill = True
diff --git a/instat/dlgOtherRosePlots.vb b/instat/dlgOtherRosePlots.vb
index 0a91d425da4..2affd52a850 100644
--- a/instat/dlgOtherRosePlots.vb
+++ b/instat/dlgOtherRosePlots.vb
@@ -39,7 +39,7 @@ Public Class dlgOtherRosePlots
 
     Private Sub InitiliseDialog()
         Dim dctMethod As New Dictionary(Of String, String)
-
+        ucrBase.iHelpTopicID = 309
         ucrBase.clsRsyntax.iCallType = 3
 
         ucrSelectorOtherRosePlots.SetParameter(New RParameter("data", 0))
diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb
index a86787a1eba..f424bb2b746 100644
--- a/instat/dlgPICSARainfall.vb
+++ b/instat/dlgPICSARainfall.vb
@@ -875,6 +875,7 @@ Public Class dlgPICSARainfall
                 ucrChkLineofBestFit.Visible = True
                 ucrChkWithSE.Visible = True
                 Me.Text = "PICSA General Graphs"
+                ucrBase.iHelpTopicID = 521
             Case PICSAMode.Rainfall
                 ucrChkLineofBestFit.Visible = False
                 ucrChkWithSE.Visible = False
@@ -883,6 +884,7 @@ Public Class dlgPICSARainfall
                 ucrChkLineofBestFit.Visible = True
                 ucrChkWithSE.Visible = True
                 Me.Text = "PICSA Temperature Graphs"
+                ucrBase.iHelpTopicID = 479
         End Select
     End Sub
 
diff --git a/instat/dlgParallelCoordinatePlot.Designer.vb b/instat/dlgParallelCoordinatePlot.Designer.vb
index 709f74443cc..eadafee6fe7 100644
--- a/instat/dlgParallelCoordinatePlot.Designer.vb
+++ b/instat/dlgParallelCoordinatePlot.Designer.vb
@@ -40,6 +40,11 @@ Partial Class dlgParallelCoordinatePlot
         Me.toolStripMenuItemParcoordOptions = New System.Windows.Forms.ToolStripMenuItem()
         Me.ucrChkBoxplots = New instat.ucrCheck()
         Me.ucrChkPoints = New instat.ucrCheck()
+        Me.ucrInputStation = New instat.ucrInputComboBox()
+        Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle()
+        Me.lblFacetBy = New System.Windows.Forms.Label()
+        Me.ucrInputLegendPosition = New instat.ucrInputComboBox()
+        Me.ucrChkLegend = New instat.ucrCheck()
         Me.contextMenuStripOptions.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -86,7 +91,7 @@ Partial Class dlgParallelCoordinatePlot
         'ucrSaveGraph
         '
         Me.ucrSaveGraph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrSaveGraph.Location = New System.Drawing.Point(11, 313)
+        Me.ucrSaveGraph.Location = New System.Drawing.Point(11, 351)
         Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.ucrSaveGraph.Name = "ucrSaveGraph"
         Me.ucrSaveGraph.Size = New System.Drawing.Size(324, 24)
@@ -120,7 +125,7 @@ Partial Class dlgParallelCoordinatePlot
         '
         Me.ucrBase.AutoSize = True
         Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrBase.Location = New System.Drawing.Point(9, 342)
+        Me.ucrBase.Location = New System.Drawing.Point(9, 380)
         Me.ucrBase.Name = "ucrBase"
         Me.ucrBase.Size = New System.Drawing.Size(408, 52)
         Me.ucrBase.TabIndex = 13
@@ -212,12 +217,72 @@ Partial Class dlgParallelCoordinatePlot
         Me.ucrChkPoints.Size = New System.Drawing.Size(100, 23)
         Me.ucrChkPoints.TabIndex = 11
         '
+        'ucrInputStation
+        '
+        Me.ucrInputStation.AddQuotesIfUnrecognised = True
+        Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputStation.GetSetSelectedIndex = -1
+        Me.ucrInputStation.IsReadOnly = False
+        Me.ucrInputStation.Location = New System.Drawing.Point(315, 315)
+        Me.ucrInputStation.Name = "ucrInputStation"
+        Me.ucrInputStation.Size = New System.Drawing.Size(101, 21)
+        Me.ucrInputStation.TabIndex = 106
+        '
+        'ucr1stFactorReceiver
+        '
+        Me.ucr1stFactorReceiver.AutoSize = True
+        Me.ucr1stFactorReceiver.frmParent = Me
+        Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(204, 316)
+        Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver"
+        Me.ucr1stFactorReceiver.Selector = Nothing
+        Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26)
+        Me.ucr1stFactorReceiver.strNcFilePath = ""
+        Me.ucr1stFactorReceiver.TabIndex = 105
+        Me.ucr1stFactorReceiver.ucrSelector = Nothing
+        '
+        'lblFacetBy
+        '
+        Me.lblFacetBy.AutoSize = True
+        Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.lblFacetBy.Location = New System.Drawing.Point(206, 301)
+        Me.lblFacetBy.Name = "lblFacetBy"
+        Me.lblFacetBy.Size = New System.Drawing.Size(52, 13)
+        Me.lblFacetBy.TabIndex = 104
+        Me.lblFacetBy.Tag = ""
+        Me.lblFacetBy.Text = "Facet By:"
+        '
+        'ucrInputLegendPosition
+        '
+        Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True
+        Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.ucrInputLegendPosition.GetSetSelectedIndex = -1
+        Me.ucrInputLegendPosition.IsReadOnly = False
+        Me.ucrInputLegendPosition.Location = New System.Drawing.Point(90, 315)
+        Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition"
+        Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21)
+        Me.ucrInputLegendPosition.TabIndex = 108
+        '
+        'ucrChkLegend
+        '
+        Me.ucrChkLegend.AutoSize = True
+        Me.ucrChkLegend.Checked = False
+        Me.ucrChkLegend.Location = New System.Drawing.Point(11, 316)
+        Me.ucrChkLegend.Name = "ucrChkLegend"
+        Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24)
+        Me.ucrChkLegend.TabIndex = 107
+        '
         'dlgParallelCoordinatePlot
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(417, 399)
+        Me.ClientSize = New System.Drawing.Size(417, 436)
+        Me.Controls.Add(Me.ucrInputStation)
+        Me.Controls.Add(Me.ucr1stFactorReceiver)
+        Me.Controls.Add(Me.lblFacetBy)
+        Me.Controls.Add(Me.ucrInputLegendPosition)
+        Me.Controls.Add(Me.ucrChkLegend)
         Me.Controls.Add(Me.ucrChkPoints)
         Me.Controls.Add(Me.ucrChkBoxplots)
         Me.Controls.Add(Me.cmdOptions)
@@ -261,4 +326,9 @@ Partial Class dlgParallelCoordinatePlot
     Friend WithEvents toolStripMenuItemParcoordOptions As ToolStripMenuItem
     Friend WithEvents ucrChkPoints As ucrCheck
     Friend WithEvents ucrChkBoxplots As ucrCheck
+    Friend WithEvents ucrInputStation As ucrInputComboBox
+    Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle
+    Friend WithEvents lblFacetBy As Label
+    Friend WithEvents ucrInputLegendPosition As ucrInputComboBox
+    Friend WithEvents ucrChkLegend As ucrCheck
 End Class
diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb
index 693bef45b0b..54210b80f68 100644
--- a/instat/dlgParallelCoordinatePlot.vb
+++ b/instat/dlgParallelCoordinatePlot.vb
@@ -37,6 +37,21 @@ Public Class dlgParallelCoordinatePlot
     Private clsScaleColourViridisFunction As New RFunction
     Private clsAnnotateFunction As New RFunction
 
+    Private clsFacetFunction As New RFunction
+    Private clsFacetVariablesOperator As New ROperator
+    Private clsFacetRowOp As New ROperator
+    Private clsFacetColOp As New ROperator
+    Private clsPipeOperator As New ROperator
+    Private clsGroupByFunction As New RFunction
+
+    Private ReadOnly strNone As String = "None"
+    Private ReadOnly strFacetWrap As String = "Facet Wrap"
+    Private ReadOnly strFacetRow As String = "Facet Row"
+    Private ReadOnly strFacetCol As String = "Facet Column"
+
+    Private bUpdateComboOptions As Boolean = True
+    Private bUpdatingParameters As Boolean = False
+
     Private Sub dlgParallelCoordinatePlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstload Then
             InitialiseDialog()
@@ -53,6 +68,7 @@ Public Class dlgParallelCoordinatePlot
 
     Private Sub InitialiseDialog()
         Dim dctScale As New Dictionary(Of String, String)
+        Dim dctLegendPosition As New Dictionary(Of String, String)
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
         ucrBase.iHelpTopicID = 593
         ucrBase.clsRsyntax.iCallType = 3
@@ -100,6 +116,32 @@ Public Class dlgParallelCoordinatePlot
         ucrInputScale.SetRDefault("std")
         ucrInputScale.SetDropDownStyleAsNonEditable()
 
+        ucrChkLegend.SetText("Legend:")
+        ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None")
+        ucrInputLegendPosition.SetDropDownStyleAsNonEditable()
+        ucrInputLegendPosition.SetParameter(New RParameter("legend.position"))
+        dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34))
+        dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34))
+        dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34))
+        dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34))
+        dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34))
+        ucrInputLegendPosition.SetItems(dctLegendPosition)
+        ucrChkLegend.AddParameterPresentCondition(True, "legend.position")
+        ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False)
+
+        ucr1stFactorReceiver.SetParameter(New RParameter("var1"))
+        ucr1stFactorReceiver.Selector = ucrSelectorParallelCoordinatePlot
+        ucr1stFactorReceiver.SetIncludedDataTypes({"factor"})
+        ucr1stFactorReceiver.strSelectorHeading = "Factors"
+        ucr1stFactorReceiver.bWithQuotes = False
+        ucr1stFactorReceiver.SetParameterIsString()
+        ucr1stFactorReceiver.SetValuesToIgnore({"."})
+        ucr1stFactorReceiver.SetParameterPosition(1)
+        ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy)
+
+        ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone})
+        ucrInputStation.SetDropDownStyleAsNonEditable()
+
         ucrSaveGraph.SetPrefix("par_coord_plot")
         ucrSaveGraph.SetSaveTypeAsGraph()
         ucrSaveGraph.SetDataFrameSelector(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames)
@@ -111,6 +153,15 @@ Public Class dlgParallelCoordinatePlot
     Private Sub SetDefaults()
         clsBaseOperator = New ROperator
         clsGGParCoordFunc = New RFunction
+        clsFacetFunction = New RFunction
+        clsFacetVariablesOperator = New ROperator
+        clsFacetRowOp = New ROperator
+        clsFacetColOp = New ROperator
+        clsPipeOperator = New ROperator
+        clsGroupByFunction = New RFunction
+
+        ucrInputStation.SetName(strFacetWrap)
+        ucrInputStation.bUpdateRCodeFromControl = True
 
         ucrReceiverXVariables.SetMeAsReceiver()
         ucrSelectorParallelCoordinatePlot.Reset()
@@ -127,6 +178,22 @@ Public Class dlgParallelCoordinatePlot
         clsBaseOperator.SetOperation("+")
         clsBaseOperator.AddParameter("ggparcord", clsRFunctionParameter:=clsGGParCoordFunc, iPosition:=0)
 
+        clsFacetFunction.SetPackageName("ggplot2")
+        clsFacetRowOp.SetOperation("+")
+        clsFacetRowOp.bBrackets = False
+        clsFacetColOp.SetOperation("+")
+        clsFacetColOp.bBrackets = False
+        clsFacetVariablesOperator.SetOperation("~")
+        clsFacetVariablesOperator.bForceIncludeOperation = True
+        clsFacetVariablesOperator.bBrackets = False
+        clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0)
+
+        clsPipeOperator.SetOperation("%>%")
+        SetPipeAssignTo()
+
+        clsGroupByFunction.SetPackageName("dplyr")
+        clsGroupByFunction.SetRCommand("group_by")
+
         clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone())
         clsXLabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone()
         clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone()
@@ -151,13 +218,17 @@ Public Class dlgParallelCoordinatePlot
 
     Private Sub SetRCodeForControls(bReset As Boolean)
         ucrSelectorParallelCoordinatePlot.SetRCode(clsGGParCoordFunc, bReset)
-        ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset)
         ucrReceiverFactor.SetRCode(clsGGParCoordFunc, bReset)
         ucrChkBoxplots.SetRCode(clsGGParCoordFunc, bReset)
         ucrChkPoints.SetRCode(clsGGParCoordFunc, bReset)
         ucrNudTransparency.SetRCode(clsGGParCoordFunc, bReset)
         ucrInputScale.SetRCode(clsGGParCoordFunc, bReset)
+        ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
+        ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True)
         ucrSaveGraph.SetRCode(clsBaseOperator, bReset)
+        If bReset Then
+            ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset)
+        End If
     End Sub
 
     Private Sub TestOkEnabled()
@@ -182,13 +253,180 @@ Public Class dlgParallelCoordinatePlot
 
     Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click
         sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction,
-                  clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction,
+                  clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator,
                   clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator,
                   clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()
         bResetSubdialog = False
     End Sub
 
+    Private Sub AddRemoveTheme()
+        If clsThemeFunction.iParameterCount > 0 Then
+            clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15)
+        Else
+            clsBaseOperator.RemoveParameterByName("theme")
+        End If
+    End Sub
+
+    Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged
+        AddRemoveTheme()
+    End Sub
+
+    Private Sub AutoFacetStation()
+        Dim currentReceiver As ucrReceiver = ucrSelectorParallelCoordinatePlot.CurrentReceiver
+
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
+        End If
+    End Sub
+
+    Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged
+        If Not bUpdateComboOptions Then
+            Exit Sub
+        End If
+        Dim strChangedText As String = ucrChangedControl.GetText()
+        If strChangedText <> strNone Then
+            If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso
+                    Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then
+                bUpdateComboOptions = False
+                ucrInputStation.SetName(strNone)
+                bUpdateComboOptions = True
+            End If
+            If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso
+                    ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso
+                    ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then
+                ucrInputStation.SetName(strNone)
+            End If
+        End If
+        UpdateParameters()
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub UpdateParameters()
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
+        clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
+        clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        bUpdatingParameters = True
+        ucr1stFactorReceiver.SetRCode(Nothing)
+        Select Case ucrInputStation.GetText()
+            Case strFacetWrap
+                ucr1stFactorReceiver.ChangeParameterName("var1")
+                ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator)
+            Case strFacetCol
+                ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetColOp)
+            Case strFacetRow
+                ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name)
+                ucr1stFactorReceiver.SetRCode(clsFacetRowOp)
+        End Select
+        bUpdatingParameters = False
+    End Sub
+
+    Private Sub AddRemoveFacets()
+        Dim bWrap As Boolean = False
+        Dim bCol As Boolean = False
+        Dim bRow As Boolean = False
+
+        If bUpdatingParameters Then
+            Exit Sub
+        End If
+
+        clsBaseOperator.RemoveParameterByName("facets")
+        If Not ucr1stFactorReceiver.IsEmpty Then
+            Select Case ucrInputStation.GetText()
+                Case strFacetWrap
+                    bWrap = True
+                Case strFacetCol
+                    bCol = True
+                Case strFacetRow
+                    bRow = True
+            End Select
+        End If
+
+        If bWrap OrElse bRow OrElse bCol Then
+            clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction)
+        End If
+        If bWrap Then
+            clsFacetFunction.SetRCommand("facet_wrap")
+        End If
+        If bRow OrElse bCol Then
+            clsFacetFunction.SetRCommand("facet_grid")
+        End If
+        If bRow Then
+            clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0)
+        ElseIf bCol AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("left")
+        End If
+        If bCol Then
+            clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1)
+        ElseIf bRow AndAlso bWrap = False Then
+            clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1)
+        Else
+            clsFacetVariablesOperator.RemoveParameterByName("right")
+        End If
+    End Sub
+
+    Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged
+        AddRemoveFacets()
+        AddRemoveGroupBy()
+    End Sub
+
+    Private Sub GetParameterValue(clsOperator As ROperator)
+        Dim i As Integer = 0
+        For Each clsTempParam As RParameter In clsOperator.clsParameters
+            If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then
+                clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i)
+                i = i + 1
+            End If
+        Next
+    End Sub
+
+    Private Sub AddRemoveGroupBy()
+        If clsPipeOperator.ContainsParameter("mutate") Then
+            clsGroupByFunction.ClearParameters()
+            If clsBaseOperator.ContainsParameter("facets") Then
+                Select Case ucrInputStation.GetText()
+                    Case strFacetWrap
+                        GetParameterValue(clsFacetVariablesOperator)
+                    Case strFacetCol
+                        GetParameterValue(clsFacetColOp)
+                    Case strFacetRow
+                        GetParameterValue(clsFacetRowOp)
+                End Select
+            End If
+
+            If clsGroupByFunction.iParameterCount > 0 Then
+                clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1)
+            Else
+                clsPipeOperator.RemoveParameterByName("group_by")
+            End If
+        Else
+            clsPipeOperator.RemoveParameterByName("group_by")
+        End If
+
+        SetPipeAssignTo()
+    End Sub
+
+    Private Sub SetPipeAssignTo()
+        If ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then
+            clsPipeOperator.SetAssignTo(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text)
+        Else
+            clsPipeOperator.RemoveAssignTo()
+        End If
+    End Sub
+
+    Private Sub ucrSelectorParallelCoordinatePlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorParallelCoordinatePlot.ControlValueChanged
+        AutoFacetStation()
+        SetPipeAssignTo()
+    End Sub
+
     Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged
         TestOkEnabled()
     End Sub
diff --git a/instat/dlgSeasonalPlot.vb b/instat/dlgSeasonalPlot.vb
index fd0e869bd73..2df8b779213 100644
--- a/instat/dlgSeasonalPlot.vb
+++ b/instat/dlgSeasonalPlot.vb
@@ -98,6 +98,7 @@ Public Class dlgSeasonalPlot
     End Sub
 
     Private Sub InitiliseDialog()
+        ucrBase.iHelpTopicID = 640
         ucrBase.clsRsyntax.iCallType = 3
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 
diff --git a/instat/dlgTaylorDiagram.vb b/instat/dlgTaylorDiagram.vb
index 5bcefb92c15..5de43bf7299 100644
--- a/instat/dlgTaylorDiagram.vb
+++ b/instat/dlgTaylorDiagram.vb
@@ -35,6 +35,7 @@ Public Class dlgTaylorDiagram
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID= 643
         ucrBase.clsRsyntax.iCallType = 3
 
         ucrSelectorTaylorDiagram.SetParameter(New RParameter("mydata", 0))
diff --git a/instat/dlgTimeSeriesPlot.vb b/instat/dlgTimeSeriesPlot.vb
index ced2eb9dd41..0ee96af11e3 100644
--- a/instat/dlgTimeSeriesPlot.vb
+++ b/instat/dlgTimeSeriesPlot.vb
@@ -194,7 +194,7 @@ Public Class dlgTimeSeriesPlot
     End Sub
 
     Private Sub InitialiseDialog()
-        'ucrBase.iHelpTopicID =
+        ucrBase.iHelpTopicID = 639
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
         ucrBase.clsRsyntax.iCallType = 3
 
diff --git a/instat/dlgWindPollutionRose.vb b/instat/dlgWindPollutionRose.vb
index c34d8af07ce..79c87d4b71d 100644
--- a/instat/dlgWindPollutionRose.vb
+++ b/instat/dlgWindPollutionRose.vb
@@ -41,7 +41,7 @@ Public Class dlgWindPollutionRose
         Dim dctStatistic As New Dictionary(Of String, String)
         Dim dctPosition As New Dictionary(Of String, String)
         Dim dctColor As New Dictionary(Of String, String)
-
+        ucrBase.iHelpTopicID = 184
         ucrBase.clsRsyntax.iCallType = 3
 
         ucrSelectorWindPollutionRose.SetParameter(New RParameter("mydata", 0))
diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
index 9638a7ff857..00fa9e110f3 100644
--- a/instat/frmMain.Designer.vb
+++ b/instat/frmMain.Designer.vb
@@ -282,6 +282,7 @@ Partial Class frmMain
         Me.mnuClimaticPICSA = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuClimaticPICSARainfallGraph = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuClimaticPICSATemperatureGraph = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuClimaticPICSAGeneralGrap = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator73 = New System.Windows.Forms.ToolStripSeparator()
         Me.mnuClimaticPICSACumExeedenceGraph = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuClimaticPICSACrops = New System.Windows.Forms.ToolStripMenuItem()
@@ -681,7 +682,6 @@ Partial Class frmMain
         Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuClimaticPICSAGeneralGrap = New System.Windows.Forms.ToolStripMenuItem()
         Me.stsStrip.SuspendLayout()
         Me.Tool_strip.SuspendLayout()
         Me.mnuBar.SuspendLayout()
@@ -707,7 +707,7 @@ Partial Class frmMain
         '
         Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph})
         Me.mnuDescribe.Name = "mnuDescribe"
-        Me.mnuDescribe.Size = New System.Drawing.Size(64, 22)
+        Me.mnuDescribe.Size = New System.Drawing.Size(81, 24)
         Me.mnuDescribe.Tag = "Describe"
         Me.mnuDescribe.Text = "Describe"
         '
@@ -715,25 +715,25 @@ Partial Class frmMain
         '
         Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData})
         Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable"
-        Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeOneVariable.Tag = "One_Variable"
         Me.mnuDescribeOneVariable.Text = "One Variable"
         '
         'mnuDescribeOneVariableVisualiseData
         '
         Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData"
-        Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22)
+        Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(194, 26)
         Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..."
         '
         'ToolStripSeparator72
         '
         Me.ToolStripSeparator72.Name = "ToolStripSeparator72"
-        Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6)
+        Me.ToolStripSeparator72.Size = New System.Drawing.Size(191, 6)
         '
         'mnuDescribeOneVariableSummarise
         '
         Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise"
-        Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22)
+        Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(194, 26)
         Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..."
         Me.mnuDescribeOneVariableSummarise.Text = "Summarise..."
         Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised"
@@ -741,26 +741,26 @@ Partial Class frmMain
         'mnuDescribeOneVariableGraph
         '
         Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph"
-        Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22)
+        Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(194, 26)
         Me.mnuDescribeOneVariableGraph.Tag = "Graph..."
         Me.mnuDescribeOneVariableGraph.Text = "Graph..."
         '
         'ToolStripSeparator33
         '
         Me.ToolStripSeparator33.Name = "ToolStripSeparator33"
-        Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6)
+        Me.ToolStripSeparator33.Size = New System.Drawing.Size(191, 6)
         '
         'mnuDescribeOneVariableFrequencies
         '
         Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies"
-        Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22)
+        Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(194, 26)
         Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..."
         Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots"
         '
         'mnuDescribeOneVariableRatingData
         '
         Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData"
-        Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22)
+        Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(194, 26)
         Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..."
         Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph"
         '
@@ -768,26 +768,26 @@ Partial Class frmMain
         '
         Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies})
         Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables"
-        Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables"
         Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables"
         '
         'mnuDescribeTwoThreeVariablesPivotTable
         '
         Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable"
-        Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..."
         '
         'ToolStripSeparator36
         '
         Me.ToolStripSeparator36.Name = "ToolStripSeparator36"
-        Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6)
+        Me.ToolStripSeparator36.Size = New System.Drawing.Size(251, 6)
         '
         'mnuDescribeTwoVariablesSummarise
         '
         Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True
         Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise"
-        Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..."
         Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..."
         Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables"
@@ -795,19 +795,19 @@ Partial Class frmMain
         'mnuDescribeTwoVariablesGraph
         '
         Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph"
-        Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..."
         Me.mnuDescribeTwoVariablesGraph.Text = "Graph..."
         '
         'ToolStripSeparator34
         '
         Me.ToolStripSeparator34.Name = "ToolStripSeparator34"
-        Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6)
+        Me.ToolStripSeparator34.Size = New System.Drawing.Size(251, 6)
         '
         'mnuDescribeTwoThreeVariablesCorrelations
         '
         Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations"
-        Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..."
         Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables"
         '
@@ -815,14 +815,14 @@ Partial Class frmMain
         '
         Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True
         Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies"
-        Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..."
         Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph"
         '
         'mnuDescribeTwoThreeVariablesThreeWayFrequencies
         '
         Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies"
-        Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22)
+        Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(254, 26)
         Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..."
         Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph"
         '
@@ -830,25 +830,25 @@ Partial Class frmMain
         '
         Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot})
         Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs"
-        Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs"
         Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs"
         '
         'mnuDescribeGeneral
         '
         Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral"
-        Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeGeneral.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeGeneral.Text = "General..."
         '
         'ToolStripSeparator38
         '
         Me.ToolStripSeparator38.Name = "ToolStripSeparator38"
-        Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6)
+        Me.ToolStripSeparator38.Size = New System.Drawing.Size(254, 6)
         '
         'mnuDescribeSpecificBarPieChart
         '
         Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart"
-        Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart"
         Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..."
         Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds"
@@ -856,7 +856,7 @@ Partial Class frmMain
         'mnuDescribeSpecificBoxplotJitterViolinPlot
         '
         Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot"
-        Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..."
         Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..."
         Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots"
@@ -864,7 +864,7 @@ Partial Class frmMain
         'mnuDescribeSpecificHistogramDensityFrequencyPlot
         '
         Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot"
-        Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..."
         Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..."
         Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons"
@@ -872,7 +872,7 @@ Partial Class frmMain
         'mnuDescribeSpecificPointPlot
         '
         Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot"
-        Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..."
         Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..."
         Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot"
@@ -880,7 +880,7 @@ Partial Class frmMain
         'mnuDescribeSpecificLineSmoothPlot
         '
         Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot"
-        Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..."
         Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..."
         Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots"
@@ -888,12 +888,12 @@ Partial Class frmMain
         'ToolStripSeparator26
         '
         Me.ToolStripSeparator26.Name = "ToolStripSeparator26"
-        Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6)
+        Me.ToolStripSeparator26.Size = New System.Drawing.Size(254, 6)
         '
         'mnuDescribeSpecificMapPlot
         '
         Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot"
-        Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..."
         Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map"
         '
@@ -901,7 +901,7 @@ Partial Class frmMain
         '
         Me.mnuDescribeSpecificDotPlot.Enabled = False
         Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot"
-        Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..."
         Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..."
         Me.mnuDescribeSpecificDotPlot.Visible = False
@@ -909,27 +909,27 @@ Partial Class frmMain
         'mnuDescribeSpecificMosaic
         '
         Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic"
-        Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..."
         Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot"
         '
         'mnuDescribeSpecificCummulativeDistribution
         '
         Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution"
-        Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..."
         Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph"
         '
         'mnuDescribeSpecificParallelCoordinatePlot
         '
         Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot"
-        Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22)
+        Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(257, 26)
         Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..."
         '
         'mnuDescribeSpecificTables
         '
         Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables"
-        Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs"
         Me.mnuDescribeSpecificTables.Text = "Tables..."
         Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables"
@@ -937,83 +937,83 @@ Partial Class frmMain
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(223, 6)
         '
         'mnuDescribeMultivariate
         '
         Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis})
         Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate"
-        Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeMultivariate.Text = "Multivariate"
         '
         'mnuDescribeMultivariateCorrelations
         '
         Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations"
-        Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22)
+        Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(250, 26)
         Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..."
         Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables"
         '
         'mnuDescribeMultivariateprincipalComponents
         '
         Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents"
-        Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22)
+        Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(250, 26)
         Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..."
         '
         'mnuDescribeMultivariateCanonicalCorrelations
         '
         Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations"
-        Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22)
+        Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(250, 26)
         Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..."
         '
         'mnuDescribeMultivariateClusterAnalysis
         '
         Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis"
-        Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22)
+        Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(250, 26)
         Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..."
         Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical"
         '
         'ToolStripSeparator13
         '
         Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
-        Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6)
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(223, 6)
         '
         'mnuDescribeUseTable
         '
         Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable"
-        Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeUseTable.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeUseTable.Text = "Use Table..."
         '
         'mnuDescribeUseGraph
         '
         Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph"
-        Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeUseGraph.Text = "Use Graph..."
         '
         'mnuDescribeCombineGraph
         '
         Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph"
-        Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeCombineGraph.Text = "Combine Graphs..."
         '
         'mnuDescribeThemes
         '
         Me.mnuDescribeThemes.Enabled = False
         Me.mnuDescribeThemes.Name = "mnuDescribeThemes"
-        Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeThemes.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeThemes.Text = "Themes..."
         Me.mnuDescribeThemes.Visible = False
         '
         'mnuDescribeViewGraph
         '
         Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph"
-        Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22)
+        Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(226, 26)
         Me.mnuDescribeViewGraph.Text = "View Graph..."
         '
         'mnuModel
         '
         Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral})
         Me.mnuModel.Name = "mnuModel"
-        Me.mnuModel.Size = New System.Drawing.Size(53, 22)
+        Me.mnuModel.Size = New System.Drawing.Size(66, 24)
         Me.mnuModel.Tag = "Model"
         Me.mnuModel.Text = "Model"
         '
@@ -1021,168 +1021,168 @@ Partial Class frmMain
         '
         Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel})
         Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions"
-        Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions"
         Me.mnuModelProbabilityDistributions.Text = "Probability Distributions"
         '
         'mnuModelProbabilityDistributionsShowModel
         '
         Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel"
-        Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22)
+        Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(221, 26)
         Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..."
         '
         'mnuModelProbabilityDistributionsCompareModels
         '
         Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False
         Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels"
-        Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22)
+        Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(221, 26)
         Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..."
         Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..."
         '
         'mnuModelProbabilityDistributionsRandomSamplesUseModel
         '
         Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel"
-        Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22)
+        Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(221, 26)
         Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..."
         Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..."
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(249, 6)
         '
         'mnuModelFitModel
         '
         Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard})
         Me.mnuModelFitModel.Name = "mnuModelFitModel"
-        Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelFitModel.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelFitModel.Tag = "Fit_Model..."
         Me.mnuModelFitModel.Text = "Fit Model"
         '
         'mnuModelFitModelOneVariable
         '
         Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable"
-        Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelOneVariable.Text = "One Variable..."
         '
         'mnuModelFitModelTwoVariables
         '
         Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables"
-        Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelTwoVariables.Text = "Two Variables..."
         '
         'mnuModelFitModelThreeVariables
         '
         Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables"
-        Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelThreeVariables.Text = "Three Variables..."
         '
         'mnuModelFitModelFourVariables
         '
         Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables"
-        Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelFourVariables.Text = "Four Variables..."
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(281, 6)
         '
         'mnuModelFitModelGeneral
         '
         Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral"
-        Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelGeneral.Text = "General..."
         '
         'mnuModelFitModelMachineLearning
         '
         Me.mnuModelFitModelMachineLearning.Enabled = False
         Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning"
-        Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..."
         Me.mnuModelFitModelMachineLearning.Visible = False
         '
         'ToolStripSeparator57
         '
         Me.ToolStripSeparator57.Name = "ToolStripSeparator57"
-        Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6)
+        Me.ToolStripSeparator57.Size = New System.Drawing.Size(281, 6)
         '
         'mnuModelFitModelHypothesisTestsKeyboard
         '
         Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard"
-        Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..."
         '
         'mnuModelFitModelModelKeyboard
         '
         Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard"
-        Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22)
+        Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(284, 26)
         Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..."
         '
         'mnuModelCompareModels
         '
         Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable})
         Me.mnuModelCompareModels.Name = "mnuModelCompareModels"
-        Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelCompareModels.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelCompareModels.Text = "Compare Models"
         '
         'mnuModelCompareModelsOneVariable
         '
         Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable"
-        Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22)
+        Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(186, 26)
         Me.mnuModelCompareModelsOneVariable.Text = "One Variable..."
         '
         'mnuModelUseModel
         '
         Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard})
         Me.mnuModelUseModel.Name = "mnuModelUseModel"
-        Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelUseModel.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelUseModel.Text = "Use Model"
         '
         'mnuModelUseModelOneVariable
         '
         Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable"
-        Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelOneVariable.Text = "One Variable..."
         '
         'mnuModelUseModelTwoVariables
         '
         Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables"
-        Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelTwoVariables.Text = "Two Variables..."
         '
         'ToolStripSeparator59
         '
         Me.ToolStripSeparator59.Name = "ToolStripSeparator59"
-        Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator59.Size = New System.Drawing.Size(243, 6)
         '
         'mnuModelUseModelGlance
         '
         Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance"
-        Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelGlance.Text = "Glance..."
         '
         'mnuModelUseModelTidy
         '
         Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy"
-        Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelTidy.Text = "Tidy..."
         '
         'mnuModelUseModelAugment
         '
         Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment"
-        Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelAugment.Text = "Augment..."
         '
         'ToolStripSeparator58
         '
         Me.ToolStripSeparator58.Name = "ToolStripSeparator58"
-        Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator58.Size = New System.Drawing.Size(243, 6)
         '
         'mnuModelUseModelUseModelKeyboard
         '
         Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard"
-        Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(246, 26)
         Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..."
         '
         'mnuModelOtherOneVariable
@@ -1190,14 +1190,14 @@ Partial Class frmMain
         Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit})
         Me.mnuModelOtherOneVariable.Enabled = False
         Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable"
-        Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)"
         Me.mnuModelOtherOneVariable.Text = "Other (One Variable)"
         '
         'mnuModelOtherOneVariableExactResults
         '
         Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults"
-        Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(204, 26)
         Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..."
         Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..."
         '
@@ -1205,7 +1205,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False
         Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData"
-        Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(204, 26)
         Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..."
         Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..."
         '
@@ -1213,7 +1213,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherOneVariableNonParametric.Enabled = False
         Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric"
-        Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(204, 26)
         Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..."
         Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..."
         '
@@ -1221,7 +1221,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False
         Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit"
-        Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(204, 26)
         Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit"
         Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..."
         '
@@ -1230,7 +1230,7 @@ Partial Class frmMain
         Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA})
         Me.mnuModelOtherTwoVariables.Enabled = False
         Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables"
-        Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)"
         Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)"
         '
@@ -1238,7 +1238,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False
         Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples"
-        Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..."
         Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..."
         '
@@ -1246,21 +1246,21 @@ Partial Class frmMain
         '
         Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False
         Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData"
-        Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..."
         Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..."
         '
         'mnuModelOtherTwoVariablesSimpleRegression
         '
         Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression"
-        Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..."
         Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..."
         '
         'mnuModelOtherTwoVariablesOneWayANOVA
         '
         Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA"
-        Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..."
         Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..."
         '
@@ -1268,14 +1268,14 @@ Partial Class frmMain
         '
         Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False
         Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples"
-        Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..."
         Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..."
         '
         'mnuModelOtherTwoVariablesNonParametricOneWayANOVA
         '
         Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA"
-        Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22)
+        Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(328, 26)
         Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..."
         Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..."
         '
@@ -1284,7 +1284,7 @@ Partial Class frmMain
         Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest})
         Me.mnuModelOtherThreeVariables.Enabled = False
         Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables"
-        Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)"
         Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)"
         '
@@ -1292,21 +1292,21 @@ Partial Class frmMain
         '
         Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False
         Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups"
-        Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22)
+        Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(320, 26)
         Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..."
         Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..."
         '
         'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA
         '
         Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA"
-        Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22)
+        Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(320, 26)
         Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..."
         Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..."
         '
         'mnuModelOtherThreeVariablesChisquareTest
         '
         Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest"
-        Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22)
+        Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(320, 26)
         Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test"
         Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..."
         '
@@ -1315,7 +1315,7 @@ Partial Class frmMain
         Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear})
         Me.mnuModelOtherGeneral.Enabled = False
         Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral"
-        Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22)
+        Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(252, 26)
         Me.mnuModelOtherGeneral.Tag = "Other_(General)"
         Me.mnuModelOtherGeneral.Text = "Other (General)"
         '
@@ -1323,7 +1323,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False
         Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral"
-        Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(206, 26)
         Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..."
         Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..."
         '
@@ -1331,7 +1331,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherGeneralRegression.Enabled = False
         Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression"
-        Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(206, 26)
         Me.mnuModelOtherGeneralRegression.Tag = "Regression..."
         Me.mnuModelOtherGeneralRegression.Text = "Regression..."
         '
@@ -1339,7 +1339,7 @@ Partial Class frmMain
         '
         Me.mnuModelOtherGeneralLogLinear.Enabled = False
         Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear"
-        Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22)
+        Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(206, 26)
         Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear"
         Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..."
         '
@@ -1347,7 +1347,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticExamine.Enabled = False
         Me.mnuClimaticExamine.Name = "mnuClimaticExamine"
-        Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticExamine.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticExamine.Tag = "Examine"
         Me.mnuClimaticExamine.Text = "Examine..."
         Me.mnuClimaticExamine.Visible = False
@@ -1356,7 +1356,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticProcess.Enabled = False
         Me.mnuClimaticProcess.Name = "mnuClimaticProcess"
-        Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticProcess.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticProcess.Tag = "Process"
         Me.mnuClimaticProcess.Text = "Process..."
         Me.mnuClimaticProcess.Visible = False
@@ -1365,7 +1365,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman})
         Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation"
-        Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticEvaporation.Tag = "Evaporation"
         Me.mnuClimaticEvaporation.Text = "Evaporation"
         Me.mnuClimaticEvaporation.Visible = False
@@ -1374,7 +1374,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticEvaporationSite.Enabled = False
         Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite"
-        Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22)
+        Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(153, 26)
         Me.mnuClimaticEvaporationSite.Tag = "Site"
         Me.mnuClimaticEvaporationSite.Text = "Site..."
         '
@@ -1382,7 +1382,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticEvaporationPenman.Enabled = False
         Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman"
-        Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22)
+        Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(153, 26)
         Me.mnuClimaticEvaporationPenman.Tag = "Penman"
         Me.mnuClimaticEvaporationPenman.Text = "Penman..."
         '
@@ -1390,7 +1390,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex})
         Me.mnuClimaticCrop.Name = "mnuClimaticCrop"
-        Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticCrop.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticCrop.Tag = "Crop"
         Me.mnuClimaticCrop.Text = "Crop"
         Me.mnuClimaticCrop.Visible = False
@@ -1399,21 +1399,21 @@ Partial Class frmMain
         '
         Me.mnuClimaticCropCropCoefficients.Enabled = False
         Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients"
-        Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(261, 26)
         Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..."
         '
         'mnuClimaticCropWaterSatisfactionIndex
         '
         Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False
         Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex"
-        Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(261, 26)
         Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..."
         '
         'mnuClimaticHeatSum
         '
         Me.mnuClimaticHeatSum.Enabled = False
         Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum"
-        Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticHeatSum.Tag = "Heat_Sum"
         Me.mnuClimaticHeatSum.Text = "Heat Sum..."
         Me.mnuClimaticHeatSum.Visible = False
@@ -1422,7 +1422,7 @@ Partial Class frmMain
         '
         Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript})
         Me.mnuView.Name = "mnuView"
-        Me.mnuView.Size = New System.Drawing.Size(44, 22)
+        Me.mnuView.Size = New System.Drawing.Size(55, 24)
         Me.mnuView.Tag = "View"
         Me.mnuView.Text = "View"
         '
@@ -1430,7 +1430,7 @@ Partial Class frmMain
         '
         Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewDataView.Name = "mnuViewDataView"
-        Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewDataView.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewDataView.Tag = "Data_View"
         Me.mnuViewDataView.Text = "Data View"
         '
@@ -1438,21 +1438,21 @@ Partial Class frmMain
         '
         Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewOutput.Name = "mnuViewOutput"
-        Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewOutput.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewOutput.Text = "Output"
         '
         'mnuViewLogScript
         '
         Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewLogScript.Name = "mnuViewLogScript"
-        Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewLogScript.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewLogScript.Text = "Log/Script"
         '
         'mnuViewColumnMetadata
         '
         Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata"
-        Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewColumnMetadata.Tag = "Column_Metadata"
         Me.mnuViewColumnMetadata.Text = "Column Metadata"
         '
@@ -1460,7 +1460,7 @@ Partial Class frmMain
         '
         Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata"
-        Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata"
         Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata"
         '
@@ -1468,19 +1468,19 @@ Partial Class frmMain
         '
         Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu"
-        Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewStructuredMenu.Text = "Structured Menu"
         '
         'ToolStripSeparator22
         '
         Me.ToolStripSeparator22.Name = "ToolStripSeparator22"
-        Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6)
+        Me.ToolStripSeparator22.Size = New System.Drawing.Size(267, 6)
         '
         'mnuViewClimaticMenu
         '
         Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu"
-        Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewClimaticMenu.Tag = ""
         Me.mnuViewClimaticMenu.Text = "Climatic Menu"
         '
@@ -1488,7 +1488,7 @@ Partial Class frmMain
         '
         Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu"
-        Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewProcurementMenu.Tag = ""
         Me.mnuViewProcurementMenu.Text = "Procurement Menu"
         '
@@ -1496,137 +1496,137 @@ Partial Class frmMain
         '
         Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu"
-        Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewOptionsByContextMenu.Text = "Experiments"
         '
         'ToolStripSeparator39
         '
         Me.ToolStripSeparator39.Name = "ToolStripSeparator39"
-        Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6)
+        Me.ToolStripSeparator39.Size = New System.Drawing.Size(267, 6)
         '
         'mnuViewResetToDefaultLayout
         '
         Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout"
-        Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout"
         '
         'mnuViewSwapDataAndMetadata
         '
         Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata"
-        Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata"
         '
         'mnuViewSwapDataAndScript
         '
         Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript"
-        Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22)
+        Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(270, 26)
         Me.mnuViewSwapDataAndScript.Text = "Swap Data and  Log/Script"
         '
         'mnuHelp
         '
         Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation})
         Me.mnuHelp.Name = "mnuHelp"
-        Me.mnuHelp.Size = New System.Drawing.Size(44, 22)
+        Me.mnuHelp.Size = New System.Drawing.Size(55, 24)
         Me.mnuHelp.Tag = "Help"
         Me.mnuHelp.Text = "Help"
         '
         'mnuHelpHelpIntroduction
         '
         Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction"
-        Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpHelpIntroduction.Text = "Introduction"
         '
         'mnuHelpFAQ
         '
         Me.mnuHelpFAQ.Name = "mnuHelpFAQ"
-        Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpFAQ.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpFAQ.Text = "FAQ"
         '
         'mnuHelpGetingStarted
         '
         Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted"
-        Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpGetingStarted.Text = "Getting Started"
         '
         'ToolStripSeparator28
         '
         Me.ToolStripSeparator28.Name = "ToolStripSeparator28"
-        Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6)
+        Me.ToolStripSeparator28.Size = New System.Drawing.Size(256, 6)
         '
         'mnuHelpWindows
         '
         Me.mnuHelpWindows.Name = "mnuHelpWindows"
-        Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpWindows.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpWindows.Text = "Windows"
         '
         'mnuHelpMenus
         '
         Me.mnuHelpMenus.Name = "mnuHelpMenus"
-        Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpMenus.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpMenus.Text = "Menus and Dialogs"
         '
         'mnuHelpAboutR
         '
         Me.mnuHelpAboutR.Name = "mnuHelpAboutR"
-        Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpAboutR.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpAboutR.Text = "About R"
         Me.mnuHelpAboutR.Visible = False
         '
         'mnuHelpLearningStatistics
         '
         Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics"
-        Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpLearningStatistics.Text = "Learning Statistics"
         Me.mnuHelpLearningStatistics.Visible = False
         '
         'mnuHelpRPackages
         '
         Me.mnuHelpRPackages.Name = "mnuHelpRPackages"
-        Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpRPackages.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpRPackages.Text = "R Packages"
         '
         'mnuHelpGlossary
         '
         Me.mnuHelpGlossary.Name = "mnuHelpGlossary"
-        Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpGlossary.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpGlossary.Text = "Glossary"
         '
         'mnuHelpData
         '
         Me.mnuHelpData.Name = "mnuHelpData"
-        Me.mnuHelpData.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpData.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpData.Text = "Data"
         '
         'mnuHelpLicence
         '
         Me.mnuHelpLicence.Name = "mnuHelpLicence"
-        Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpLicence.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpLicence.Tag = "Licence..."
         Me.mnuHelpLicence.Text = "Licence"
         '
         'ToolStripSeparator29
         '
         Me.ToolStripSeparator29.Name = "ToolStripSeparator29"
-        Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6)
+        Me.ToolStripSeparator29.Size = New System.Drawing.Size(256, 6)
         '
         'mnuHelpPackagesDocumentation
         '
         Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation"
-        Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22)
+        Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(259, 26)
         Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation"
         '
         'ToolStripSeparator16
         '
         Me.ToolStripSeparator16.Name = "ToolStripSeparator16"
-        Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6)
+        Me.ToolStripSeparator16.Size = New System.Drawing.Size(264, 6)
         '
         'mnuClimatic
         '
         Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods})
         Me.mnuClimatic.Name = "mnuClimatic"
-        Me.mnuClimatic.Size = New System.Drawing.Size(63, 22)
+        Me.mnuClimatic.Size = New System.Drawing.Size(77, 24)
         Me.mnuClimatic.Tag = "Climatic"
         Me.mnuClimatic.Text = "Climatic"
         '
@@ -1634,293 +1634,293 @@ Partial Class frmMain
         '
         Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact})
         Me.mnuClimaticFile.Name = "mnuClimaticFile"
-        Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticFile.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticFile.Text = "File"
         '
         'mnuClimaticFileImportSST
         '
         Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST"
-        Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportSST.Text = "Import SST..."
         '
         'mnuClimaticFileImportfromIRIDataLibrary
         '
         Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary"
-        Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..."
         '
         'mnuClimaticFileImportfromClimateDataStore
         '
         Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore"
-        Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..."
         '
         'mnuClimaticFileImportandTidyNetCDF
         '
         Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF"
-        Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..."
         '
         'mnuClimaticFileImportandTidyShapefile
         '
         Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile"
-        Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..."
         '
         'ToolStripSeparator20
         '
         Me.ToolStripSeparator20.Name = "ToolStripSeparator20"
-        Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6)
+        Me.ToolStripSeparator20.Size = New System.Drawing.Size(351, 6)
         '
         'mnuClimateFileImportfromClimSoft
         '
         Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft"
-        Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..."
         '
         'mnuClimateFileImportfromClimSoftWizard
         '
         Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard"
-        Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..."
         '
         'mnuClimaticFileImportfromCliData
         '
         Me.mnuClimaticFileImportfromCliData.Enabled = False
         Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData"
-        Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..."
         Me.mnuClimaticFileImportfromCliData.Visible = False
         '
         'ToolStripSeparator15
         '
         Me.ToolStripSeparator15.Name = "ToolStripSeparator15"
-        Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6)
+        Me.ToolStripSeparator15.Size = New System.Drawing.Size(351, 6)
         '
         'mnuClimaticFileExportToClimsoft
         '
         Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft"
-        Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..."
         '
         'mnuClimaticFileExportToCPT
         '
         Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT"
-        Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT"
         Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..."
         '
         'mnuExportToWWRToolStrip
         '
         Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip"
-        Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22)
+        Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(354, 26)
         Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..."
         '
         'mnuClimaticFileExportToClimpact
         '
         Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact"
-        Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22)
+        Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(354, 26)
         Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..."
         '
         'ToolStripSeparator18
         '
         Me.ToolStripSeparator18.Name = "ToolStripSeparator18"
-        Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6)
+        Me.ToolStripSeparator18.Size = New System.Drawing.Size(264, 6)
         '
         'mnuExamineEditData
         '
         Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns})
         Me.mnuExamineEditData.Name = "mnuExamineEditData"
-        Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22)
+        Me.mnuExamineEditData.Size = New System.Drawing.Size(267, 26)
         Me.mnuExamineEditData.Text = "Examine/Edit Data"
         '
         'mnuClimaticExamineEditDataVisualiseData
         '
         Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData"
-        Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22)
+        Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(268, 26)
         Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..."
         '
         'mnuExamineEditDataPivotTable
         '
         Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable"
-        Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..."
         '
         'ToolStripSeparator27
         '
         Me.ToolStripSeparator27.Name = "ToolStripSeparator27"
-        Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6)
+        Me.ToolStripSeparator27.Size = New System.Drawing.Size(265, 6)
         '
         'mnuExamineEditDataOneVariableSummarise
         '
         Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise"
-        Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..."
         '
         'mnuExamineEditDataOneVariableGraph
         '
         Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph"
-        Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..."
         '
         'mnuExamineEditDataOneVariableFrequencies
         '
         Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies"
-        Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..."
         '
         'ToolStripSeparator78
         '
         Me.ToolStripSeparator78.Name = "ToolStripSeparator78"
-        Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6)
+        Me.ToolStripSeparator78.Size = New System.Drawing.Size(265, 6)
         '
         'mnuExamineEditDataSetupForDataEditing
         '
         Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing"
-        Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..."
         '
         'mnuExamineEditDataDailyDataEditing
         '
         Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing"
-        Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..."
         '
         'mnuExamineEditDataCompareColumns
         '
         Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns"
-        Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22)
+        Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(268, 26)
         Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..."
         '
         'mnuClimaticTidyandExamine
         '
         Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey})
         Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine"
-        Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticTidyandExamine.Text = "Tidy Data"
         '
         'mnuClimaticTidyandExamineTidyDailyData
         '
         Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData"
-        Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..."
         '
         'ToolStripSeparator71
         '
         Me.ToolStripSeparator71.Name = "ToolStripSeparator71"
-        Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator71.Size = New System.Drawing.Size(240, 6)
         '
         'mnuClimaticTidyandExamineReplaceValues
         '
         Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues"
-        Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..."
         '
         'mnuClimaticTidyandExamineDuplicateRows
         '
         Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows"
-        Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..."
         '
         'mnuClimaticTidyandExamineNonNumericCases
         '
         Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases"
-        Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..."
         '
         'ToolStripSeparator54
         '
         Me.ToolStripSeparator54.Name = "ToolStripSeparator54"
-        Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator54.Size = New System.Drawing.Size(240, 6)
         '
         'mnuClimaticTidyandExamineTransformText
         '
         Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText"
-        Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..."
         '
         'mnuClimaticTidyandExamineSplitText
         '
         Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText"
-        Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..."
         '
         'ToolStripSeparator80
         '
         Me.ToolStripSeparator80.Name = "ToolStripSeparator80"
-        Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator80.Size = New System.Drawing.Size(240, 6)
         '
         'mnuClimaticTidyandExamineStack
         '
         Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack"
-        Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..."
         '
         'mnuClimaticTidyandExamineUnstack
         '
         Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack"
-        Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..."
         '
         'mnuClimaticTidyandExamineMerge
         '
         Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge"
-        Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineMerge.Text = "Merge..."
         '
         'mnuClimaticTidyandExamineAppend
         '
         Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend"
-        Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..."
         '
         'ToolStripSeparator69
         '
         Me.ToolStripSeparator69.Name = "ToolStripSeparator69"
-        Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator69.Size = New System.Drawing.Size(240, 6)
         '
         'mnuClimaticTidyDataKey
         '
         Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey"
-        Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(243, 26)
         Me.mnuClimaticTidyDataKey.Text = "Add Key..."
         '
         'mnuClimaticDates
         '
         Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime})
         Me.mnuClimaticDates.Name = "mnuClimaticDates"
-        Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticDates.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticDates.Text = "Dates"
         '
         'mnuClimaticDatesGenerateDates
         '
         Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates"
-        Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..."
         '
         'mnuClimaticDatesMakeDate
         '
         Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate"
-        Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesMakeDate.Text = "Make Date..."
         '
         'mnuClimaticDatesInfillMissingDates
         '
         Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates"
-        Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..."
         '
         'mnuClimaticDatesUseDate
         '
         Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate"
-        Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesUseDate.Text = "Use Date..."
         '
         'mnuClimaticDatesMakeTime
         '
         Me.mnuClimaticDatesMakeTime.Enabled = False
         Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime"
-        Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesMakeTime.Text = "Make Time..."
         Me.mnuClimaticDatesMakeTime.Visible = False
         '
@@ -1928,169 +1928,169 @@ Partial Class frmMain
         '
         Me.mnuClimaticDatesUseTime.Enabled = False
         Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime"
-        Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22)
+        Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(203, 26)
         Me.mnuClimaticDatesUseTime.Text = "Use Time..."
         Me.mnuClimaticDatesUseTime.Visible = False
         '
         'mnuClimaticDefineClimaticData
         '
         Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData"
-        Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..."
         '
         'mnuClimaticCheckData
         '
         Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations})
         Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData"
-        Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticCheckData.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticCheckData.Text = "Check Data"
         '
         'mnuClimaticCheckDataInventory
         '
         Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory"
-        Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataInventory.Text = "Inventory..."
         '
         'mnuClimaticCheckDataDisplayDaily
         '
         Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily"
-        Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..."
         '
         'ToolStripSeparator65
         '
         Me.ToolStripSeparator65.Name = "ToolStripSeparator65"
-        Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6)
+        Me.ToolStripSeparator65.Size = New System.Drawing.Size(255, 6)
         '
         'mnuClimaticCheckDataFillMissingValues
         '
         Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues"
-        Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..."
         '
         'mnuClimaticCheckDataBoxplot
         '
         Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot"
-        Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..."
         '
         'mnuClimaticCheckDataQCTemperatures
         '
         Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures"
-        Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..."
         '
         'mnuClimaticCheckDataQCRainfall
         '
         Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall"
-        Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..."
         '
         'ToolStripSeparator70
         '
         Me.ToolStripSeparator70.Name = "ToolStripSeparator70"
-        Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6)
+        Me.ToolStripSeparator70.Size = New System.Drawing.Size(255, 6)
         '
         'mnuClimaticCheckDataHomogenization
         '
         Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization"
-        Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..."
         '
         'mnuClimaticCheckDataCheckStationLocations
         '
         Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations"
-        Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..."
         '
         'mnuClimaticPrepare
         '
         Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData})
         Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare"
-        Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticPrepare.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticPrepare.Tag = "Prepare"
         Me.mnuClimaticPrepare.Text = "Prepare"
         '
         'mnuCimaticPrepareTransform
         '
         Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform"
-        Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22)
+        Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(232, 26)
         Me.mnuCimaticPrepareTransform.Text = "Transform..."
         '
         'mnuClimaticPrepareConversions
         '
         Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions"
-        Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareConversions.Text = "Conversions..."
         '
         'ToolStripSeparator37
         '
         Me.ToolStripSeparator37.Name = "ToolStripSeparator37"
-        Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6)
+        Me.ToolStripSeparator37.Size = New System.Drawing.Size(229, 6)
         '
         'mnuClimaticPrepareClimaticSummaries
         '
         Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries"
-        Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..."
         '
         'mnuClimaticPrepareStartoftheRains
         '
         Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains"
-        Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..."
         '
         'mnuClimaticPrepareEndOfRains
         '
         Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains"
-        Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..."
         '
         'mnuClimaticPrepareLengthOfSeason
         '
         Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason"
-        Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..."
         '
         'mnuClimaticPrepareSpells
         '
         Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells"
-        Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareSpells.Text = "Spells..."
         '
         'mnuClimaticPrepareExtremes
         '
         Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes"
-        Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareExtremes.Text = "Extremes..."
         '
         'ToolStripSeparator64
         '
         Me.ToolStripSeparator64.Name = "ToolStripSeparator64"
-        Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6)
+        Me.ToolStripSeparator64.Size = New System.Drawing.Size(229, 6)
         '
         'mnuClimaticPrepareClimdex
         '
         Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex"
-        Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareClimdex.Text = "Climdex..."
         '
         'ToolStripSeparator51
         '
         Me.ToolStripSeparator51.Name = "ToolStripSeparator51"
-        Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6)
+        Me.ToolStripSeparator51.Size = New System.Drawing.Size(229, 6)
         '
         'mnuClimaticPrepareEvapotranspiration
         '
         Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration"
-        Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..."
         '
         'mnuClimaticPrepareSummary
         '
         Me.mnuClimaticPrepareSummary.Enabled = False
         Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary"
-        Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareSummary.Text = "Summary..."
         Me.mnuClimaticPrepareSummary.Visible = False
         '
@@ -2098,7 +2098,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareNewWorksheet.Enabled = False
         Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet"
-        Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet"
         Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..."
         Me.mnuClimaticPrepareNewWorksheet.Visible = False
@@ -2107,7 +2107,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareImportDailyData.Enabled = False
         Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData"
-        Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data"
         Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..."
         Me.mnuClimaticPrepareImportDailyData.Visible = False
@@ -2116,7 +2116,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareMakeFactor.Enabled = False
         Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor"
-        Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor"
         Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..."
         Me.mnuClimaticPrepareMakeFactor.Visible = False
@@ -2125,7 +2125,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareShiftDailyData.Enabled = False
         Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData"
-        Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data"
         Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..."
         Me.mnuClimaticPrepareShiftDailyData.Visible = False
@@ -2134,7 +2134,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareUnstackDailyData.Enabled = False
         Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData"
-        Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data"
         Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..."
         Me.mnuClimaticPrepareUnstackDailyData.Visible = False
@@ -2143,7 +2143,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticPrepareStackDailyData.Enabled = False
         Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData"
-        Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22)
+        Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(232, 26)
         Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data"
         Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..."
         Me.mnuClimaticPrepareStackDailyData.Visible = False
@@ -2151,357 +2151,363 @@ Partial Class frmMain
         'ToolStripSeparator30
         '
         Me.ToolStripSeparator30.Name = "ToolStripSeparator30"
-        Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6)
+        Me.ToolStripSeparator30.Size = New System.Drawing.Size(264, 6)
         '
         'mnuClimaticDescribe
         '
         Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots})
         Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe"
-        Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticDescribe.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticDescribe.Text = "Describe"
         '
         'mnuClimaticDescribeSummarise23Variables
         '
         Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables"
-        Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..."
         '
         'mnuClimaticDescribeGraph23Variables
         '
         Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables"
-        Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..."
         '
         'ToolStripSeparator31
         '
         Me.ToolStripSeparator31.Name = "ToolStripSeparator31"
-        Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripSeparator31.Size = New System.Drawing.Size(261, 6)
         '
         'mnuClimaticDescribeSPISPEI
         '
         Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI"
-        Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..."
         '
         'mnuClimaticDescribeClimograph
         '
         Me.mnuClimaticDescribeClimograph.Enabled = False
         Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph"
-        Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeClimograph.Text = "Climograph..."
         '
         'mnuClimaticDescribeTrendGraph
         '
         Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph"
-        Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..."
         '
         'mnuClimaticDescribeSeasonalGraph
         '
         Me.mnuClimaticDescribeSeasonalGraph.Enabled = False
         Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph"
-        Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..."
         '
         'mnuClimaticDescribeIDF
         '
         Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF"
-        Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeIDF.Text = "IDF..."
         '
         'ToolStripSeparator17
         '
         Me.ToolStripSeparator17.Name = "ToolStripSeparator17"
-        Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripSeparator17.Size = New System.Drawing.Size(261, 6)
         '
         'mnuClimaticDescribeWindRose
         '
         Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose"
-        Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..."
         '
         'mnuClimaticDescribeWindPollutionRose
         '
         Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose"
-        Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..."
         '
         'mnuClimaticDescribeOtherRosePlots
         '
         Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots"
-        Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22)
+        Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(264, 26)
         Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..."
         '
         'mnuClimaticNCMP
         '
         Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary})
         Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP"
-        Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticNCMP.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticNCMP.Text = "NCMP"
         '
         'mnuClimaticNCMPIndices
         '
         Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices"
-        Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPIndices.Text = "Indices..."
         '
         'mnuClimaticNCMPVariogram
         '
         Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram"
-        Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPVariogram.Text = "Variogram..."
         '
         'mnuClimaticNCMPRegionAverage
         '
         Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage"
-        Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..."
         '
         'mnuClimaticNCMPTrendGraphs
         '
         Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs"
-        Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..."
         '
         'mnuClimaticNCMPCountRecords
         '
         Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords"
-        Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPCountRecords.Text = "Count Records..."
         '
         'mnuClimaticNCMPSummary
         '
         Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary"
-        Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22)
+        Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(207, 26)
         Me.mnuClimaticNCMPSummary.Text = "Summary..."
         '
         'mnuClimaticPICSA
         '
         Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops})
         Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA"
-        Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticPICSA.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticPICSA.Text = "PICSA"
         '
         'mnuClimaticPICSARainfallGraph
         '
         Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph"
-        Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..."
         '
         'mnuClimaticPICSATemperatureGraph
         '
         Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph"
-        Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..."
         '
+        'mnuClimaticPICSAGeneralGrap
+        '
+        Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap"
+        Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(303, 26)
+        Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..."
+        '
         'ToolStripSeparator73
         '
         Me.ToolStripSeparator73.Name = "ToolStripSeparator73"
-        Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripSeparator73.Size = New System.Drawing.Size(300, 6)
         '
         'mnuClimaticPICSACumExeedenceGraph
         '
         Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph"
-        Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..."
         '
         'mnuClimaticPICSACrops
         '
         Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops"
-        Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticPICSACrops.Text = "Crops..."
         '
         'mnuCMSAF
         '
         Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox})
         Me.mnuCMSAF.Name = "mnuCMSAF"
-        Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22)
+        Me.mnuCMSAF.Size = New System.Drawing.Size(267, 26)
         Me.mnuCMSAF.Text = "CM SAF"
         '
         'mnuClimaticCMSAFPlotRegion
         '
         Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion"
-        Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22)
+        Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(288, 26)
         Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..."
         '
         'mnuClimaticCMSAFExporttoCMSAFRToolbox
         '
         Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox"
-        Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22)
+        Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(288, 26)
         Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..."
         '
         'mnuClimaticCompare
         '
         Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram})
         Me.mnuClimaticCompare.Name = "mnuClimaticCompare"
-        Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticCompare.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticCompare.Text = "Compare"
         '
         'mnuClimaticCompareCalculation
         '
         Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation"
-        Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareCalculation.Text = "Calculation..."
         '
         'mnuClimaticCompareSummary
         '
         Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary"
-        Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareSummary.Text = "Summary..."
         '
         'ToolStripSeparator66
         '
         Me.ToolStripSeparator66.Name = "ToolStripSeparator66"
-        Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6)
+        Me.ToolStripSeparator66.Size = New System.Drawing.Size(241, 6)
         '
         'mnuClimaticCompareCorrelations
         '
         Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations"
-        Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareCorrelations.Text = "Correlations..."
         '
         'mnuClimaticCompareScatterplot
         '
         Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot"
-        Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..."
         '
         'mnuClimaticCompareTimeSeriesPlot
         '
         Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot"
-        Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..."
         '
         'mnuClimaticCompareSeasonalPlot
         '
         Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot"
-        Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..."
         '
         'mnuClimaticCompareDensityPlot
         '
         Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot"
-        Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..."
         '
         'mnuClimaticCompareConditionalQuantiles
         '
         Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles"
-        Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..."
         '
         'mnuClimaticCompareTaylorDiagram
         '
         Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram"
-        Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22)
+        Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(244, 26)
         Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..."
         '
         'mnuClimaticMapping
         '
         Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations})
         Me.mnuClimaticMapping.Name = "mnuClimaticMapping"
-        Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticMapping.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticMapping.Text = "Mapping"
         '
         'mnuClimaticMappingMap
         '
         Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap"
-        Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticMappingMap.Text = "Map..."
         '
         'mnuClimaticMappingCheckStationLocations
         '
         Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations"
-        Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22)
+        Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(258, 26)
         Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..."
         '
         'mnuClimaticModel
         '
         Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling})
         Me.mnuClimaticModel.Name = "mnuClimaticModel"
-        Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticModel.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticModel.Text = "Model"
         '
         'mnuClimaticModelsExtremes
         '
         Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes"
-        Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22)
+        Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(222, 26)
         Me.mnuClimaticModelsExtremes.Text = "Extremes..."
         '
         'mnuClimaticModelCircular
         '
         Me.mnuClimaticModelCircular.Enabled = False
         Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular"
-        Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22)
+        Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(222, 26)
         Me.mnuClimaticModelCircular.Text = "Circular..."
         Me.mnuClimaticModelCircular.Visible = False
         '
         'mnuClimaticModelMarkovModelling
         '
         Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling"
-        Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22)
+        Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(222, 26)
         Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling"
         Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..."
         '
         'ToolStripSeparator23
         '
         Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
-        Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6)
+        Me.ToolStripSeparator23.Size = New System.Drawing.Size(264, 6)
         '
         'mnuClimaticSCF
         '
         Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph})
         Me.mnuClimaticSCF.Name = "mnuClimaticSCF"
-        Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticSCF.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticSCF.Text = "Seasonal Forecast Support"
         '
         'mnuClimaticSCFSupportOpenSST
         '
         Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST"
-        Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..."
         '
         'mnuClimaticSCFSupportExporttoCPT
         '
         Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT"
-        Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT"
         Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..."
         '
         'ToolStripSeparator32
         '
         Me.ToolStripSeparator32.Name = "ToolStripSeparator32"
-        Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6)
+        Me.ToolStripSeparator32.Size = New System.Drawing.Size(300, 6)
         '
         'mnuClimaticSCFSupportCorrelations
         '
         Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations"
-        Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..."
         '
         'mnuClimaticSCFSupportPrincipalComponents
         '
         Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents"
-        Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..."
         '
         'mnuClimaticSCFSupportCanonicalCorrelations
         '
         Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations"
-        Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..."
         '
         'mnuClimaticSCFSupportCumulativeExceedanceGraph
         '
         Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph"
-        Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22)
+        Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(303, 26)
         Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..."
         '
         'mnuClimaticClimateMethods
         '
         Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject})
         Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods"
-        Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22)
+        Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(267, 26)
         Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods"
         Me.mnuClimaticClimateMethods.Text = "Climate Methods"
         Me.mnuClimaticClimateMethods.Visible = False
@@ -2510,7 +2516,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD})
         Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation"
-        Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22)
+        Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(247, 26)
         Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation"
         Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation"
         '
@@ -2518,7 +2524,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain"
-        Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain"
         Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..."
         '
@@ -2526,7 +2532,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain"
-        Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain"
         Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..."
         '
@@ -2534,7 +2540,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth"
-        Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month"
         Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..."
         '
@@ -2542,7 +2548,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular"
-        Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular"
         Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..."
         '
@@ -2550,7 +2556,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth"
-        Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month"
         Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..."
         '
@@ -2558,7 +2564,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily"
-        Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily"
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..."
         '
@@ -2566,7 +2572,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear"
-        Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year"
         Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..."
         '
@@ -2574,7 +2580,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal"
-        Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total"
         Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..."
         '
@@ -2582,7 +2588,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength"
-        Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length"
         Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..."
         '
@@ -2590,7 +2596,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA"
-        Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA"
         Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..."
         '
@@ -2598,7 +2604,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents"
-        Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events"
         Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..."
         '
@@ -2606,7 +2612,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData"
-        Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data"
         Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..."
         '
@@ -2614,7 +2620,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False
         Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable"
-        Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table"
         Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..."
         '
@@ -2622,7 +2628,7 @@ Partial Class frmMain
         '
         Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False
         Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries"
-        Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries"
         Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..."
         '
@@ -2630,7 +2636,7 @@ Partial Class frmMain
         '
         Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False
         Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD"
-        Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22)
+        Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(279, 26)
         Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT"
         Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..."
         '
@@ -2638,7 +2644,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries})
         Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics"
-        Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22)
+        Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(247, 26)
         Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics"
         Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics"
         '
@@ -2646,7 +2652,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot"
-        Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot"
         Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..."
         '
@@ -2654,7 +2660,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot"
-        Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot"
         Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..."
         '
@@ -2662,7 +2668,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues"
-        Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values"
         Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..."
         '
@@ -2670,7 +2676,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram"
-        Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram"
         Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..."
         '
@@ -2678,7 +2684,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance"
-        Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence"
         Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..."
         '
@@ -2686,7 +2692,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot"
-        Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot"
         Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..."
         '
@@ -2694,7 +2700,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory"
-        Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory"
         Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..."
         '
@@ -2702,7 +2708,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall"
-        Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall"
         Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..."
         '
@@ -2710,7 +2716,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount"
-        Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count"
         Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..."
         '
@@ -2718,7 +2724,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries"
-        Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries"
         Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..."
         '
@@ -2726,7 +2732,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False
         Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose"
-        Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose"
         Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..."
         '
@@ -2734,7 +2740,7 @@ Partial Class frmMain
         '
         Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False
         Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines"
-        Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(270, 26)
         Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines"
         Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..."
         '
@@ -2742,7 +2748,7 @@ Partial Class frmMain
         '
         Me.mnuClmateMethodThreeSummaries.Enabled = False
         Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries"
-        Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22)
+        Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(270, 26)
         Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries"
         Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..."
         '
@@ -2750,7 +2756,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsModel.Enabled = False
         Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel"
-        Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22)
+        Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(247, 26)
         Me.mnuClimaticClimateMethodsModel.Tag = "Model"
         Me.mnuClimaticClimateMethodsModel.Text = "Model..."
         '
@@ -2758,7 +2764,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance})
         Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional"
-        Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22)
+        Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(247, 26)
         Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional"
         Me.mnuClimaticClimateMethodsAdditional.Text = "Additional"
         '
@@ -2766,7 +2772,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False
         Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT"
-        Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22)
+        Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(259, 26)
         Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT"
         Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..."
         '
@@ -2774,7 +2780,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False
         Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics"
-        Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22)
+        Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(259, 26)
         Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics"
         Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..."
         '
@@ -2782,7 +2788,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary"
-        Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22)
+        Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(259, 26)
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary"
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..."
         '
@@ -2790,7 +2796,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain"
-        Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22)
+        Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(259, 26)
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain"
         Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..."
         '
@@ -2798,7 +2804,7 @@ Partial Class frmMain
         '
         Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False
         Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance"
-        Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22)
+        Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(259, 26)
         Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance"
         Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..."
         '
@@ -2806,7 +2812,7 @@ Partial Class frmMain
         '
         Me.mnuClimateMethodsCreateClimateObject.Enabled = False
         Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject"
-        Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22)
+        Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(247, 26)
         Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object"
         Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..."
         '
@@ -2814,7 +2820,7 @@ Partial Class frmMain
         '
         Me.mnuFileSave.Name = "mnuFileSave"
         Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mnuFileSave.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileSave.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileSave.Tag = "Save"
         Me.mnuFileSave.Text = "Save..."
         '
@@ -2822,32 +2828,32 @@ Partial Class frmMain
         '
         Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs})
         Me.mnuFileSaveAs.Name = "mnuFileSaveAs"
-        Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileSaveAs.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileSaveAs.Tag = "Save_As"
         Me.mnuFileSaveAs.Text = "Save As"
         '
         'mnuFileSaveAsDataAs
         '
         Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs"
-        Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22)
+        Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(202, 26)
         Me.mnuFileSaveAsDataAs.Text = "Save Data As..."
         '
         'mnuFileSaveAsOutputAs
         '
         Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs"
-        Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22)
+        Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(202, 26)
         Me.mnuFileSaveAsOutputAs.Text = "Save Output As..."
         '
         'mnuFileSaveAsLogAs
         '
         Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs"
-        Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22)
+        Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(202, 26)
         Me.mnuFileSaveAsLogAs.Text = "Save Log As..."
         '
         'mnuFileSaveAsScriptAs
         '
         Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs"
-        Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22)
+        Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(202, 26)
         Me.mnuFileSaveAsScriptAs.Text = "Save Script As..."
         '
         'mnuFilePrint
@@ -2855,7 +2861,7 @@ Partial Class frmMain
         Me.mnuFilePrint.Enabled = False
         Me.mnuFilePrint.Name = "mnuFilePrint"
         Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys)
-        Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFilePrint.Size = New System.Drawing.Size(289, 26)
         Me.mnuFilePrint.Tag = "Print"
         Me.mnuFilePrint.Text = "Print..."
         Me.mnuFilePrint.Visible = False
@@ -2864,7 +2870,7 @@ Partial Class frmMain
         '
         Me.mnuFilePrintPreview.Enabled = False
         Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview"
-        Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFilePrintPreview.Size = New System.Drawing.Size(289, 26)
         Me.mnuFilePrintPreview.Tag = "Print_Preview"
         Me.mnuFilePrintPreview.Text = "Print Preview..."
         Me.mnuFilePrintPreview.Visible = False
@@ -2872,12 +2878,12 @@ Partial Class frmMain
         'tlSeparatorFile3
         '
         Me.tlSeparatorFile3.Name = "tlSeparatorFile3"
-        Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6)
+        Me.tlSeparatorFile3.Size = New System.Drawing.Size(286, 6)
         '
         'mnuFIleExit
         '
         Me.mnuFIleExit.Name = "mnuFIleExit"
-        Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFIleExit.Size = New System.Drawing.Size(289, 26)
         Me.mnuFIleExit.Tag = "Exit"
         Me.mnuFIleExit.Text = "Exit"
         '
@@ -2885,7 +2891,7 @@ Partial Class frmMain
         '
         Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll})
         Me.mnuEdit.Name = "mnuEdit"
-        Me.mnuEdit.Size = New System.Drawing.Size(39, 22)
+        Me.mnuEdit.Size = New System.Drawing.Size(49, 24)
         Me.mnuEdit.Tag = "Edit"
         Me.mnuEdit.Text = "Edit"
         '
@@ -2893,7 +2899,7 @@ Partial Class frmMain
         '
         Me.mnuEditFind.Name = "mnuEditFind"
         Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys)
-        Me.mnuEditFind.Size = New System.Drawing.Size(167, 22)
+        Me.mnuEditFind.Size = New System.Drawing.Size(241, 26)
         Me.mnuEditFind.Tag = "Find"
         Me.mnuEditFind.Text = "Find"
         '
@@ -2901,7 +2907,7 @@ Partial Class frmMain
         '
         Me.mnuEditCopy.Name = "mnuEditCopy"
         Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
-        Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22)
+        Me.mnuEditCopy.Size = New System.Drawing.Size(241, 26)
         Me.mnuEditCopy.Tag = "Copy"
         Me.mnuEditCopy.Text = "Copy"
         '
@@ -2909,27 +2915,27 @@ Partial Class frmMain
         '
         Me.mnuEditPaste.Name = "mnuEditPaste"
         Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys)
-        Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22)
+        Me.mnuEditPaste.Size = New System.Drawing.Size(241, 26)
         Me.mnuEditPaste.Tag = "Paste"
         Me.mnuEditPaste.Text = "Paste"
         '
         'mnuEditPasteNew
         '
         Me.mnuEditPasteNew.Name = "mnuEditPasteNew"
-        Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22)
-        Me.mnuEditPasteNew.Text = "Paste New"
+        Me.mnuEditPasteNew.Size = New System.Drawing.Size(241, 26)
+        Me.mnuEditPasteNew.Text = "Paste New Data Frame"
         '
         'mnuEditWordwrap
         '
         Me.mnuEditWordwrap.Name = "mnuEditWordwrap"
-        Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22)
+        Me.mnuEditWordwrap.Size = New System.Drawing.Size(241, 26)
         Me.mnuEditWordwrap.Text = "Wordwrap"
         '
         'mnuEditSelectAll
         '
         Me.mnuEditSelectAll.Name = "mnuEditSelectAll"
         Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys)
-        Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22)
+        Me.mnuEditSelectAll.Size = New System.Drawing.Size(241, 26)
         Me.mnuEditSelectAll.Tag = "Select_All"
         Me.mnuEditSelectAll.Text = "Select All "
         '
@@ -2937,17 +2943,18 @@ Partial Class frmMain
         '
         Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus})
-        Me.stsStrip.Location = New System.Drawing.Point(0, 460)
+        Me.stsStrip.Location = New System.Drawing.Point(0, 576)
         Me.stsStrip.Name = "stsStrip"
+        Me.stsStrip.Padding = New System.Windows.Forms.Padding(1, 0, 18, 0)
         Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.stsStrip.Size = New System.Drawing.Size(834, 22)
+        Me.stsStrip.Size = New System.Drawing.Size(1042, 26)
         Me.stsStrip.TabIndex = 8
         Me.stsStrip.Text = "Status"
         '
         'tstatus
         '
         Me.tstatus.Name = "tstatus"
-        Me.tstatus.Size = New System.Drawing.Size(119, 17)
+        Me.tstatus.Size = New System.Drawing.Size(151, 20)
         Me.tstatus.Text = "No worksheet loaded"
         '
         'Tool_strip
@@ -2956,12 +2963,12 @@ Partial Class frmMain
         Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
         Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30)
         Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1})
-        Me.Tool_strip.Location = New System.Drawing.Point(0, 24)
+        Me.Tool_strip.Location = New System.Drawing.Point(0, 26)
         Me.Tool_strip.Name = "Tool_strip"
         Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
         Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
         Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.Tool_strip.Size = New System.Drawing.Size(834, 37)
+        Me.Tool_strip.Size = New System.Drawing.Size(1042, 37)
         Me.Tool_strip.TabIndex = 7
         Me.Tool_strip.Text = "Tool"
         '
@@ -3003,27 +3010,27 @@ Partial Class frmMain
         '
         Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuSaveData.Name = "mnuSaveData"
-        Me.mnuSaveData.Size = New System.Drawing.Size(139, 22)
+        Me.mnuSaveData.Size = New System.Drawing.Size(173, 26)
         Me.mnuSaveData.Text = "Save Data"
         '
         'mnuSaveOutput
         '
         Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuSaveOutput.Name = "mnuSaveOutput"
-        Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22)
+        Me.mnuSaveOutput.Size = New System.Drawing.Size(173, 26)
         Me.mnuSaveOutput.Text = "Save Output"
         '
         'mnuSaveScript
         '
         Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuSaveScript.Name = "mnuSaveScript"
-        Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22)
+        Me.mnuSaveScript.Size = New System.Drawing.Size(173, 26)
         Me.mnuSaveScript.Text = "Save Script"
         '
         'mnuSaveLog
         '
         Me.mnuSaveLog.Name = "mnuSaveLog"
-        Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22)
+        Me.mnuSaveLog.Size = New System.Drawing.Size(173, 26)
         Me.mnuSaveLog.Text = "Save Log"
         '
         'toolStripSeparator
@@ -3074,21 +3081,21 @@ Partial Class frmMain
         '
         Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuOutputWindow.Name = "mnuOutputWindow"
-        Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22)
+        Me.mnuOutputWindow.Size = New System.Drawing.Size(220, 26)
         Me.mnuOutputWindow.Text = "Show Output"
         '
         'mnuShowRCommand
         '
         Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuShowRCommand.Name = "mnuShowRCommand"
-        Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22)
+        Me.mnuShowRCommand.Size = New System.Drawing.Size(220, 26)
         Me.mnuShowRCommand.Text = "Show R Commands"
         '
         'mnuIncludeComments
         '
         Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuIncludeComments.Name = "mnuIncludeComments"
-        Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22)
+        Me.mnuIncludeComments.Size = New System.Drawing.Size(220, 26)
         Me.mnuIncludeComments.Text = "Show Comments"
         '
         'ToolStripSeparator74
@@ -3111,19 +3118,19 @@ Partial Class frmMain
         'mnuNormalViewer
         '
         Me.mnuNormalViewer.Name = "mnuNormalViewer"
-        Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22)
+        Me.mnuNormalViewer.Size = New System.Drawing.Size(159, 26)
         Me.mnuNormalViewer.Text = "Viewer..."
         '
         'mnuploty
         '
         Me.mnuploty.Name = "mnuploty"
-        Me.mnuploty.Size = New System.Drawing.Size(128, 22)
+        Me.mnuploty.Size = New System.Drawing.Size(159, 26)
         Me.mnuploty.Text = "Plotly..."
         '
         'mnuRViewer
         '
         Me.mnuRViewer.Name = "mnuRViewer"
-        Me.mnuRViewer.Size = New System.Drawing.Size(128, 22)
+        Me.mnuRViewer.Size = New System.Drawing.Size(159, 26)
         Me.mnuRViewer.Text = "R Viewer..."
         '
         'ToolStripSeparator75
@@ -3147,7 +3154,7 @@ Partial Class frmMain
         '
         Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuLogScript.Name = "mnuLogScript"
-        Me.mnuLogScript.Size = New System.Drawing.Size(129, 22)
+        Me.mnuLogScript.Size = New System.Drawing.Size(161, 26)
         Me.mnuLogScript.Text = "Log/Script"
         '
         'mnuMetadata
@@ -3166,14 +3173,14 @@ Partial Class frmMain
         '
         Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuColumnMetadat.Name = "mnuColumnMetadat"
-        Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22)
+        Me.mnuColumnMetadat.Size = New System.Drawing.Size(254, 26)
         Me.mnuColumnMetadat.Text = "  Column Metadata..."
         '
         'mnuDataFrameMetadat
         '
         Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
         Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat"
-        Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22)
+        Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(254, 26)
         Me.mnuDataFrameMetadat.Text = "  Data Frame Metadata..."
         '
         'ToolStripSeparator76
@@ -3236,10 +3243,10 @@ Partial Class frmMain
         Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow
         Me.mnuBar.Location = New System.Drawing.Point(0, 0)
         Me.mnuBar.Name = "mnuBar"
-        Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1)
+        Me.mnuBar.Padding = New System.Windows.Forms.Padding(5, 1, 0, 1)
         Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System
         Me.mnuBar.ShowItemToolTips = True
-        Me.mnuBar.Size = New System.Drawing.Size(834, 24)
+        Me.mnuBar.Size = New System.Drawing.Size(1042, 26)
         Me.mnuBar.TabIndex = 6
         Me.mnuBar.Text = "Menu_strip"
         '
@@ -3247,7 +3254,7 @@ Partial Class frmMain
         '
         Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit})
         Me.mnuFile.Name = "mnuFile"
-        Me.mnuFile.Size = New System.Drawing.Size(37, 22)
+        Me.mnuFile.Size = New System.Drawing.Size(46, 24)
         Me.mnuFile.Tag = "File"
         Me.mnuFile.Text = "File"
         '
@@ -3255,7 +3262,7 @@ Partial Class frmMain
         '
         Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame"
         Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
-        Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileNewDataFrame.Tag = "New_Data_Frame"
         Me.mnuFileNewDataFrame.Text = "New Data Frame..."
         '
@@ -3263,33 +3270,33 @@ Partial Class frmMain
         '
         Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile"
         Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
-        Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromFile.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromFile.Tag = "Import_From_File"
         Me.mnuFileImportFromFile.Text = "Import From File..."
         '
         'mnuFileImportFromLibrary
         '
         Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary"
-        Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromLibrary.Tag = "Open_From_Library"
         Me.mnuFileImportFromLibrary.Text = "Import From Library..."
         '
         'ToolStripSeparator35
         '
         Me.ToolStripSeparator35.Name = "ToolStripSeparator35"
-        Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6)
+        Me.ToolStripSeparator35.Size = New System.Drawing.Size(286, 6)
         '
         'mnuFileImportFromODK
         '
         Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK"
-        Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromODK.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromODK.Text = "Import From ODK..."
         '
         'mnuFileImportFromCSPRO
         '
         Me.mnuFileImportFromCSPRO.Enabled = False
         Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO"
-        Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..."
         Me.mnuFileImportFromCSPRO.Visible = False
         '
@@ -3297,7 +3304,7 @@ Partial Class frmMain
         '
         Me.mnuFileImportFromDatabases.Enabled = False
         Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases"
-        Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromDatabases.Text = "Import From Databases..."
         Me.mnuFileImportFromDatabases.Visible = False
         '
@@ -3305,82 +3312,82 @@ Partial Class frmMain
         '
         Me.mnuFileImportFromPostgres.Enabled = False
         Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres"
-        Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromPostgres.Text = "Import From Postgres"
         Me.mnuFileImportFromPostgres.Visible = False
         '
         'mnuFileImportFromRapidPro
         '
         Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro"
-        Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro"
         '
         'mnuFileImportandTidyNetCDFFile
         '
         Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile"
-        Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..."
         '
         'mnuFileConvert
         '
         Me.mnuFileConvert.Enabled = False
         Me.mnuFileConvert.Name = "mnuFileConvert"
-        Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileConvert.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileConvert.Text = "Convert..."
         Me.mnuFileConvert.Visible = False
         '
         'tlSeparatorFile
         '
         Me.tlSeparatorFile.Name = "tlSeparatorFile"
-        Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6)
+        Me.tlSeparatorFile.Size = New System.Drawing.Size(286, 6)
         '
         'mnuFileExport
         '
         Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage})
         Me.mnuFileExport.Name = "mnuFileExport"
-        Me.mnuFileExport.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileExport.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileExport.Text = "Export"
         '
         'mnuFileExportExportDataSet
         '
         Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet"
-        Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22)
+        Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(254, 26)
         Me.mnuFileExportExportDataSet.Text = "Export Dataset..."
         '
         'mnuFileExportExportRObjectsToolStripMenuItem
         '
         Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem"
-        Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22)
+        Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(254, 26)
         Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..."
         '
         'mnuFileExportExportRWorkspace
         '
         Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace"
-        Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22)
+        Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(254, 26)
         Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..."
         '
         'mnuFileExportExportGraphAsImage
         '
         Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage"
-        Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22)
+        Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(254, 26)
         Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..."
         '
         'mnuFileCloseData
         '
         Me.mnuFileCloseData.Name = "mnuFileCloseData"
-        Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22)
+        Me.mnuFileCloseData.Size = New System.Drawing.Size(289, 26)
         Me.mnuFileCloseData.Text = "Close Data Book"
         '
         'ToolStripSeparator8
         '
         Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
-        Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6)
+        Me.ToolStripSeparator8.Size = New System.Drawing.Size(286, 6)
         '
         'mnuPrepare
         '
         Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects})
         Me.mnuPrepare.Name = "mnuPrepare"
-        Me.mnuPrepare.Size = New System.Drawing.Size(59, 22)
+        Me.mnuPrepare.Size = New System.Drawing.Size(74, 24)
         Me.mnuPrepare.Tag = "Prepare"
         Me.mnuPrepare.Text = "Prepare"
         '
@@ -3388,105 +3395,105 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty})
         Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame"
-        Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareDataFrame.Tag = "Data_Frame"
         Me.mnuPrepareDataFrame.Text = "Data Frame"
         '
         'mnuPrepareDataFrameViewData
         '
         Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData"
-        Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameViewData.Tag = "View_Data..."
         Me.mnuPrepareDataFrameViewData.Text = "View Data..."
         '
         'mnuPrepareDataFrameRenameColumn
         '
         Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn"
-        Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..."
         Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..."
         '
         'mnuPrepareDataFrameDuplicateColumn
         '
         Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn"
-        Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..."
         '
         'mnuPrepareDataFrameRowNumbersNames
         '
         Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames"
-        Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..."
         Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..."
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(244, 6)
         '
         'mnuPrepareDataFrameSort
         '
         Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort"
-        Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameSort.Tag = "Sort..."
         Me.mnuPrepareDataFrameSort.Text = "Sort..."
         '
         'mnuPrepareDataFrameFilterRows
         '
         Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows"
-        Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..."
         Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..."
         '
         'mnuPrepareDataFrameSelectColumns
         '
         Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns"
-        Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..."
         '
         'mnuPrepareDataFrameReplaceValues
         '
         Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues"
-        Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..."
         Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..."
         '
         'mnuPrepareDataFrameConvertColumns
         '
         Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns"
-        Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..."
         Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..."
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(244, 6)
         '
         'mnuPrepareDataFrameReorderColumns
         '
         Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns"
-        Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..."
         Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..."
         '
         'mnuPrepareDataFrameAddMergeColumns
         '
         Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns"
-        Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..."
         '
         'mnuPrepareDataFrameInsertColumnsRows
         '
         Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows"
-        Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..."
         Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..."
         '
         'mnuPrepareDataFrameDeleteColumnsRows
         '
         Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows"
-        Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..."
         Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..."
         '
@@ -3494,7 +3501,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataFrameProtectColumn.Enabled = False
         Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn"
-        Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameProtectColumn.Tag = "..."
         Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..."
         Me.mnuPrepareDataFrameProtectColumn.Visible = False
@@ -3502,7 +3509,7 @@ Partial Class frmMain
         'mnuPrepareDataFrameHideColumns
         '
         Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns"
-        Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..."
         Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..."
         '
@@ -3510,7 +3517,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataFrameFreezeColumns.Enabled = False
         Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns"
-        Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..."
         Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..."
         Me.mnuPrepareDataFrameFreezeColumns.Visible = False
@@ -3518,7 +3525,7 @@ Partial Class frmMain
         'mnuPrepareDataframeColourByProperty
         '
         Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty"
-        Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22)
+        Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(247, 26)
         Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..."
         '
         'mnuPrepareCheckData
@@ -3526,107 +3533,107 @@ Partial Class frmMain
         Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn})
         Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData"
-        Me.mnuPrepareCheckData.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareCheckData.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareCheckData.Text = "Check Data"
         '
         'mnuPrepareCheckDataVisualiseData
         '
         Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData"
-        Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..."
         '
         'mnuPrepareCheckDataPivotTable
         '
         Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable"
-        Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..."
         '
         'ToolStripSeparator50
         '
         Me.ToolStripSeparator50.Name = "ToolStripSeparator50"
-        Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6)
+        Me.ToolStripSeparator50.Size = New System.Drawing.Size(304, 6)
         '
         'mnuPrepareCheckDataDuplicates
         '
         Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates"
-        Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..."
         '
         'mnuPrepareCheckDataCompareColumns
         '
         Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns"
-        Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..."
         '
         'mnuPrepareCheckDataNonNumericCases
         '
         Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases"
-        Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..."
         '
         'ToolStripSeparator49
         '
         Me.ToolStripSeparator49.Name = "ToolStripSeparator49"
-        Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6)
+        Me.ToolStripSeparator49.Size = New System.Drawing.Size(304, 6)
         '
         'mnuPrepareCheckDataBoxplot
         '
         Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot"
-        Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..."
         '
         'mnuPrepareCheckDataOneVariableSummarise
         '
         Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise"
-        Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..."
         '
         'mnuPrepareCheckDataOneVariableGraph
         '
         Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph"
-        Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..."
         '
         'mnuPrepareCheckDataOneWayFrequencies
         '
         Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies"
-        Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..."
         '
         'mnuPrepareCheckDataViewDeleteLabels
         '
         Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels"
-        Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..."
         '
         'ToolStripSeparator41
         '
         Me.ToolStripSeparator41.Name = "ToolStripSeparator41"
-        Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6)
+        Me.ToolStripSeparator41.Size = New System.Drawing.Size(304, 6)
         '
         'mnuPrepareCheckDataExportOpenRefine
         '
         Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine"
-        Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..."
         '
         'mnuPrepareCheckDataImportOpenRefine
         '
         Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine"
-        Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..."
         Me.mnuPrepareCheckDataImportOpenRefine.Visible = False
         '
         'ToolStripSeparator40
         '
         Me.ToolStripSeparator40.Name = "ToolStripSeparator40"
-        Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6)
+        Me.ToolStripSeparator40.Size = New System.Drawing.Size(304, 6)
         '
         'mnuPreparePrepareToShareJitter
         '
         Me.mnuPreparePrepareToShareJitter.Enabled = False
         Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter"
-        Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(307, 26)
         Me.mnuPreparePrepareToShareJitter.Text = "Jitter..."
         Me.mnuPreparePrepareToShareJitter.Visible = False
         '
@@ -3634,25 +3641,25 @@ Partial Class frmMain
         '
         Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False
         Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage"
-        Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..."
         Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False
         '
         'mnuPrepareCheckDataAnonymiseIDColumn
         '
         Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn"
-        Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22)
+        Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(307, 26)
         Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..."
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(223, 6)
         '
         'mnuPrepareCalculator
         '
         Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator"
-        Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareCalculator.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareCalculator.Tag = "Calculator..."
         Me.mnuPrepareCalculator.Text = "Column: Calculator..."
         '
@@ -3660,64 +3667,64 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows})
         Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate"
-        Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate"
         Me.mnuPrepareColumnCalculate.Text = "Column: Numeric"
         '
         'mnuPrepareColumnNumericRegularSequence
         '
         Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence"
-        Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..."
         Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..."
         '
         'mnuPrepareColumnNumericEnter
         '
         Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter"
-        Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericEnter.Text = "Enter..."
         '
         'ToolStripSeparator25
         '
         Me.ToolStripSeparator25.Name = "ToolStripSeparator25"
-        Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6)
+        Me.ToolStripSeparator25.Size = New System.Drawing.Size(247, 6)
         '
         'mnuPrepareColumnNumericRowSummaries
         '
         Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries"
-        Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..."
         '
         'mnuPrepareColumnNumericTransform
         '
         Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform"
-        Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericTransform.Tag = "Rank..."
         Me.mnuPrepareColumnNumericTransform.Text = "Transform..."
         '
         'mnuPrepareColumnNumericPolynomials
         '
         Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials"
-        Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..."
         Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..."
         '
         'ToolStripSeparator56
         '
         Me.ToolStripSeparator56.Name = "ToolStripSeparator56"
-        Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6)
+        Me.ToolStripSeparator56.Size = New System.Drawing.Size(247, 6)
         '
         'mnuPrepareColumnNumericRandomSamples
         '
         Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples"
-        Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..."
         Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..."
         '
         'mnuPrepareColumnNumericPermuteRows
         '
         Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows"
-        Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22)
+        Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(250, 26)
         Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..."
         Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..."
         '
@@ -3725,105 +3732,105 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame})
         Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor"
-        Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareColumnFactor.Tag = "Column:_Factor"
         Me.mnuPrepareColumnFactor.Text = "Column: Factor"
         '
         'mnuPrepareColumnFactorConvertToFactor
         '
         Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor"
-        Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor"
         Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..."
         '
         'mnuPrepareColumnFactorRecodeNumeric
         '
         Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric"
-        Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..."
         Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..."
         '
         'mnuPrepareColumnFactorCountInFactor
         '
         Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor"
-        Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..."
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(219, 6)
         '
         'mnuPrepareColumnFactorRecodeFactor
         '
         Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor"
-        Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..."
         Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..."
         '
         'mnuPrepareColumnFactorCombineFactors
         '
         Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors"
-        Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..."
         Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..."
         '
         'mnuPrepareColumnFactorDummyVariables
         '
         Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables"
-        Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..."
         Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..."
         '
         'ToolStripSeparator14
         '
         Me.ToolStripSeparator14.Name = "ToolStripSeparator14"
-        Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6)
+        Me.ToolStripSeparator14.Size = New System.Drawing.Size(219, 6)
         '
         'mnuPrepareColumnFactorLevelsLabels
         '
         Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels"
-        Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..."
         Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..."
         '
         'mnuPrepareColumnFactorReorderLevels
         '
         Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels"
-        Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..."
         Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..."
         '
         'mnuPrepareColumnFactorReferenceLevel
         '
         Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel"
-        Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..."
         Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..."
         '
         'mnuPrepareColumnFactorUnusedLevels
         '
         Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels"
-        Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..."
         Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..."
         '
         'mnuPrepareColumnFactorContrasts
         '
         Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts"
-        Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..."
         Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..."
         '
         'ToolStripSeparator19
         '
         Me.ToolStripSeparator19.Name = "ToolStripSeparator19"
-        Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6)
+        Me.ToolStripSeparator19.Size = New System.Drawing.Size(219, 6)
         '
         'mnuPrepareColumnFactorFactorDataFrame
         '
         Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame"
-        Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22)
+        Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(222, 26)
         Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame"
         Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..."
         '
@@ -3831,42 +3838,42 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance})
         Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText"
-        Me.mnuPrepareColumnText.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareColumnText.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareColumnText.Tag = "Column:_Text"
         Me.mnuPrepareColumnText.Text = "Column: Text"
         '
         'mnuPrepareColumnTextFindReplace
         '
         Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace"
-        Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..."
         Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..."
         '
         'mnuPrepareColumnTextSearch
         '
         Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch"
-        Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextSearch.Text = "Search..."
         Me.mnuPrepareColumnTextSearch.Visible = False
         '
         'mnuPrepareColumnTextTransform
         '
         Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform"
-        Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextTransform.Tag = "Transform..."
         Me.mnuPrepareColumnTextTransform.Text = "Transform..."
         '
         'mnuPrepareColumnTextSplit
         '
         Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit"
-        Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextSplit.Tag = "Split..."
         Me.mnuPrepareColumnTextSplit.Text = "Split..."
         '
         'mnuPrepareColumnTextCombine
         '
         Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine"
-        Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextCombine.Tag = "Combine..."
         Me.mnuPrepareColumnTextCombine.Text = "Combine..."
         '
@@ -3874,7 +3881,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnTextMatch.Enabled = False
         Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch"
-        Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextMatch.Tag = "Match..."
         Me.mnuPrepareColumnTextMatch.Text = "Match..."
         Me.mnuPrepareColumnTextMatch.Visible = False
@@ -3882,7 +3889,7 @@ Partial Class frmMain
         'mnuPrepareColumnTextDistance
         '
         Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance"
-        Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22)
+        Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(188, 26)
         Me.mnuPrepareColumnTextDistance.Tag = "Distance..."
         Me.mnuPrepareColumnTextDistance.Text = "Distance..."
         '
@@ -3890,38 +3897,38 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime})
         Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate"
-        Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareColumnDate.Text = "Column: Date"
         '
         'mnuPrepareColumnDateGenerateDate
         '
         Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate"
-        Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..."
         '
         'mnuPrepareColumnDateMakeDate
         '
         Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate"
-        Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..."
         '
         'mnuPrepareColumnDateInfillMissingDates
         '
         Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates"
-        Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..."
         '
         'mnuPrepareColumnDateUseDate
         '
         Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate"
-        Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateUseDate.Text = "Use Date..."
         '
         'mnuPrepareColumnDateMakeTime
         '
         Me.mnuPrepareColumnDateMakeTime.Enabled = False
         Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime"
-        Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..."
         Me.mnuPrepareColumnDateMakeTime.Visible = False
         '
@@ -3929,7 +3936,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnDateUseTime.Enabled = False
         Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime"
-        Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22)
+        Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(203, 26)
         Me.mnuPrepareColumnDateUseTime.Text = "Use Time..."
         Me.mnuPrepareColumnDateUseTime.Visible = False
         '
@@ -3937,169 +3944,169 @@ Partial Class frmMain
         '
         Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular})
         Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine"
-        Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareColumnDefine.Text = "Column: Define"
         '
         'mnuPrepareColumnDefineConvertColumns
         '
         Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns"
-        Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22)
+        Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(213, 26)
         Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..."
         '
         'ToolStripSeparator55
         '
         Me.ToolStripSeparator55.Name = "ToolStripSeparator55"
-        Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6)
+        Me.ToolStripSeparator55.Size = New System.Drawing.Size(210, 6)
         '
         'mnuPrepareColumnDefineCircular
         '
         Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular"
-        Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22)
+        Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(213, 26)
         Me.mnuPrepareColumnDefineCircular.Text = "Circular..."
         '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
-        Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6)
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(223, 6)
         '
         'mnuPrepareDataReshape
         '
         Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit})
         Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape"
-        Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareDataReshape.Tag = ""
         Me.mnuPrepareDataReshape.Text = "Data Reshape"
         '
         'mnuPrepareColumnReshapeColumnSummaries
         '
         Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries"
-        Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..."
         Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..."
         '
         'mnuPrepareColumnReshapeGeneralSummaries
         '
         Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries"
-        Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..."
         '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
-        Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator10.Size = New System.Drawing.Size(240, 6)
         '
         'mnuPrepareColumnReshapeStack
         '
         Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack"
-        Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeStack.Tag = "Stack..."
         Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..."
         '
         'mnuPrepareColumnReshapeUnstack
         '
         Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack"
-        Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..."
         Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..."
         '
         'mnuPrepareColumnReshapeMerge
         '
         Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge"
-        Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..."
         Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..."
         '
         'ToolStripSeparator11
         '
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
-        Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripSeparator11.Size = New System.Drawing.Size(240, 6)
         '
         'mnuPrepareAppendDataFrame
         '
         Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame"
-        Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..."
         '
         'mnuPrepareColumnReshapeSubset
         '
         Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset"
-        Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..."
         Me.mnuPrepareColumnReshapeSubset.Text = "Subset..."
         '
         'mnuPrepareColumnReshapeRandomSubset
         '
         Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset"
-        Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..."
         Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..."
         '
         'mnuPrepareColumnReshapeTranspose
         '
         Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose"
-        Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..."
         Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..."
         '
         'mnuPrepareDataReshapeScaleOrDistance
         '
         Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance"
-        Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..."
         '
         'mnuPrepareDataReshapeRandomSplit
         '
         Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit"
-        Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22)
+        Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(243, 26)
         Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..."
         '
         'ToolStripSeparator7
         '
         Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
-        Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6)
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(223, 6)
         '
         'mnuPrepareKeysAndLinks
         '
         Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment})
         Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks"
-        Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareKeysAndLinks.Text = "Keys and Links"
         '
         'mnuPrepareKeysAndLinksAddKey
         '
         Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey"
-        Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22)
+        Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(256, 26)
         Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..."
         '
         'mnuPrepareKeysAndLinksViewAndRemoveKey
         '
         Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey"
-        Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22)
+        Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(256, 26)
         Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..."
         '
         'mnuPrepareKeysAndLinksAddLink
         '
         Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink"
-        Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22)
+        Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(256, 26)
         Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..."
         '
         'mnuPrepareKeysAndLinksViewAndRemoveKeys
         '
         Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys"
-        Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22)
+        Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(256, 26)
         Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..."
         '
         'mnuPrepareKeysAndLinksAddComment
         '
         Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment"
-        Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22)
+        Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(256, 26)
         Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..."
         '
         'mnuPrepareDataBook
         '
         Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata})
         Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook"
-        Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareDataBook.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareDataBook.Tag = "Data_Object"
         Me.mnuPrepareDataBook.Text = "Data Book"
         '
@@ -4107,7 +4114,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False
         Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata"
-        Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..."
         Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..."
         Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False
@@ -4115,46 +4122,46 @@ Partial Class frmMain
         'mnuPrepareDataObjectRenameDataFrame
         '
         Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame"
-        Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..."
         Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..."
         '
         'mnuPrepareDataObjectReorderDataFrames
         '
         Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames"
-        Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..."
         Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..."
         '
         'mnuPrepareDataObjectCopyDataFrame
         '
         Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame"
-        Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..."
         Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..."
         '
         'mnuPrepareDataObjectDeleteDataFrame
         '
         Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame"
-        Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..."
         Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..."
         '
         'ToolStripSeparator21
         '
         Me.ToolStripSeparator21.Name = "ToolStripSeparator21"
-        Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6)
+        Me.ToolStripSeparator21.Size = New System.Drawing.Size(259, 6)
         '
         'mnuPrepareDataObjectHideDataframes
         '
         Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes"
-        Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..."
         '
         'mnuPrepareDataObjectMetadata
         '
         Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata"
-        Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..."
         Me.mnuPrepareDataObjectMetadata.Text = "Metadata..."
         '
@@ -4162,7 +4169,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataObjectRenameMetadata.Enabled = False
         Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata"
-        Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..."
         Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..."
         Me.mnuPrepareDataObjectRenameMetadata.Visible = False
@@ -4171,7 +4178,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataObjectReorderMetadata.Enabled = False
         Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata"
-        Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..."
         Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..."
         Me.mnuPrepareDataObjectReorderMetadata.Visible = False
@@ -4180,7 +4187,7 @@ Partial Class frmMain
         '
         Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False
         Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata"
-        Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22)
+        Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(262, 26)
         Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..."
         Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..."
         Me.mnuPrepareDataObjectDeleteMetadata.Visible = False
@@ -4189,35 +4196,35 @@ Partial Class frmMain
         '
         Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete})
         Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects"
-        Me.mnuPrepareRObjects.Size = New System.Drawing.Size(186, 22)
+        Me.mnuPrepareRObjects.Size = New System.Drawing.Size(226, 26)
         Me.mnuPrepareRObjects.Tag = "R_Objects"
         Me.mnuPrepareRObjects.Text = "R Objects"
         '
         'mnuPrepareRObjectsView
         '
         Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView"
-        Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22)
+        Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(155, 26)
         Me.mnuPrepareRObjectsView.Tag = "View..."
         Me.mnuPrepareRObjectsView.Text = "View..."
         '
         'mnuPrepareRObjectsRename
         '
         Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename"
-        Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22)
+        Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(155, 26)
         Me.mnuPrepareRObjectsRename.Tag = "Rename..."
         Me.mnuPrepareRObjectsRename.Text = "Rename..."
         '
         'mnuPrepareRObjectsReorder
         '
         Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder"
-        Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22)
+        Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(155, 26)
         Me.mnuPrepareRObjectsReorder.Tag = "Reorder"
         Me.mnuPrepareRObjectsReorder.Text = "Reorder..."
         '
         'mnuPrepareRObjectsDelete
         '
         Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete"
-        Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22)
+        Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(155, 26)
         Me.mnuPrepareRObjectsDelete.Tag = "Delete..."
         Me.mnuPrepareRObjectsDelete.Text = "Delete..."
         '
@@ -4225,78 +4232,78 @@ Partial Class frmMain
         '
         Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey})
         Me.mnuStructured.Name = "mnuStructured"
-        Me.mnuStructured.Size = New System.Drawing.Size(74, 22)
+        Me.mnuStructured.Size = New System.Drawing.Size(91, 24)
         Me.mnuStructured.Text = "Structured"
         '
         'mnuStructuredCircular
         '
         Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize})
         Me.mnuStructuredCircular.Name = "mnuStructuredCircular"
-        Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredCircular.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredCircular.Text = "Circular"
         '
         'mnuStructuredCircularDefine
         '
         Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine"
-        Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularDefine.Text = "Define..."
         '
         'mnuStructuredCircularCalculator
         '
         Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator"
-        Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularCalculator.Text = "Calculator..."
         '
         'mnuStructuredCircularSummaries
         '
         Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries"
-        Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularSummaries.Text = "Summaries..."
         '
         'ToolStripSeparator46
         '
         Me.ToolStripSeparator46.Name = "ToolStripSeparator46"
-        Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6)
+        Me.ToolStripSeparator46.Size = New System.Drawing.Size(233, 6)
         '
         'mnuStructuredCircularDensityPlot
         '
         Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot"
-        Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..."
         '
         'ToolStripSeparator67
         '
         Me.ToolStripSeparator67.Name = "ToolStripSeparator67"
-        Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6)
+        Me.ToolStripSeparator67.Size = New System.Drawing.Size(233, 6)
         '
         'mnuStructuredCircularWindRose
         '
         Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose"
-        Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularWindRose.Text = "Wind Rose..."
         '
         'mnuStructuredCircularWindPollutionRose
         '
         Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose"
-        Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..."
         '
         'mnuStructuredCircularOtherRosePlots
         '
         Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots"
-        Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..."
         '
         'ToolStripSeparator68
         '
         Me.ToolStripSeparator68.Name = "ToolStripSeparator68"
-        Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6)
+        Me.ToolStripSeparator68.Size = New System.Drawing.Size(233, 6)
         '
         'mnuStructuredCircularCirclize
         '
         Me.mnuStructuredCircularCirclize.Enabled = False
         Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize"
-        Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22)
+        Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(236, 26)
         Me.mnuStructuredCircularCirclize.Text = "Circlize..."
         Me.mnuStructuredCircularCirclize.Visible = False
         '
@@ -4304,126 +4311,126 @@ Partial Class frmMain
         '
         Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine})
         Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow"
-        Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredLow_Flow.Text = "Low_Flow"
         Me.mnuStructuredLow_Flow.Visible = False
         '
         'mnuStructuredLow_FlowDefine
         '
         Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine"
-        Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22)
+        Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(145, 26)
         Me.mnuStructuredLow_FlowDefine.Text = "Define..."
         '
         'mnuStructuredSurvival
         '
         Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine})
         Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival"
-        Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredSurvival.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredSurvival.Text = "Survival"
         '
         'mnuStructuredSurvivalDefine
         '
         Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine"
-        Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22)
+        Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(145, 26)
         Me.mnuStructuredSurvivalDefine.Text = "Define..."
         '
         'mnuStructuredTimeSeries
         '
         Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62})
         Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries"
-        Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredTimeSeries.Text = "Time Series"
         Me.mnuStructuredTimeSeries.Visible = False
         '
         'mnuStructuredTimeSeriesDefine
         '
         Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine"
-        Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22)
+        Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(150, 26)
         Me.mnuStructuredTimeSeriesDefine.Text = "Define..."
         '
         'ToolStripSeparator60
         '
         Me.ToolStripSeparator60.Name = "ToolStripSeparator60"
-        Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6)
+        Me.ToolStripSeparator60.Size = New System.Drawing.Size(147, 6)
         '
         'mnuStructuredTimeSeriesDescribe
         '
         Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral})
         Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe"
-        Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22)
+        Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(150, 26)
         Me.mnuStructuredTimeSeriesDescribe.Text = "Describe"
         '
         'mnuStructuredTimeSeriesDescribeOneVariable
         '
         Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable"
-        Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22)
+        Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(186, 26)
         Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..."
         '
         'mnuStructuredTimeSeriesDescribeGeneral
         '
         Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral"
-        Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22)
+        Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(186, 26)
         Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..."
         '
         'ToolStripSeparator61
         '
         Me.ToolStripSeparator61.Name = "ToolStripSeparator61"
-        Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6)
+        Me.ToolStripSeparator61.Size = New System.Drawing.Size(147, 6)
         '
         'mnuStructuredTimeSeriesModel
         '
         Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral})
         Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel"
-        Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22)
+        Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(150, 26)
         Me.mnuStructuredTimeSeriesModel.Text = "Model"
         '
         'mnuStructuredTimeSeriesModelOneVariable
         '
         Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable"
-        Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22)
+        Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(186, 26)
         Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..."
         '
         'mnuStructuredTimeSeriesModelGeneral
         '
         Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral"
-        Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22)
+        Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(186, 26)
         Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..."
         '
         'ToolStripSeparator62
         '
         Me.ToolStripSeparator62.Name = "ToolStripSeparator62"
-        Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6)
+        Me.ToolStripSeparator62.Size = New System.Drawing.Size(147, 6)
         '
         'ToolStripSeparator63
         '
         Me.ToolStripSeparator63.Name = "ToolStripSeparator63"
-        Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6)
+        Me.ToolStripSeparator63.Size = New System.Drawing.Size(225, 6)
         '
         'mnuStructuredClimatic
         '
         Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic"
-        Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredClimatic.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredClimatic.Text = "Climatic..."
         Me.mnuStructuredClimatic.Visible = False
         '
         'mnuStructuredProcurement
         '
         Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement"
-        Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredProcurement.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredProcurement.Text = "Procurement..."
         Me.mnuStructuredProcurement.Visible = False
         '
         'mnuStructuredOptionByContext
         '
         Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext"
-        Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredOptionByContext.Text = "Options by Context..."
         Me.mnuStructuredOptionByContext.Visible = False
         '
         'mnuStructuredSurvey
         '
         Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey"
-        Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22)
+        Me.mnuStructuredSurvey.Size = New System.Drawing.Size(228, 26)
         Me.mnuStructuredSurvey.Text = "Survey"
         Me.mnuStructuredSurvey.Visible = False
         '
@@ -4431,424 +4438,424 @@ Partial Class frmMain
         '
         Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI})
         Me.mnuProcurement.Name = "mnuProcurement"
-        Me.mnuProcurement.Size = New System.Drawing.Size(88, 22)
+        Me.mnuProcurement.Size = New System.Drawing.Size(107, 24)
         Me.mnuProcurement.Text = "Procurement"
         '
         'mnuProcurementOpenFromLibrary
         '
         Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary"
-        Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..."
         '
         'mnuProcurementDefineData
         '
         Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData"
-        Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementDefineData.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementDefineData.Text = "Define Procurement Data..."
         '
         'mnuProcurementPrepare
         '
         Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData})
         Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare"
-        Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementPrepare.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementPrepare.Text = "Prepare"
         '
         'mnuProcurementPrepareFilterByCountry
         '
         Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry"
-        Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..."
         '
         'ToolStripSeparator42
         '
         Me.ToolStripSeparator42.Name = "ToolStripSeparator42"
-        Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6)
+        Me.ToolStripSeparator42.Size = New System.Drawing.Size(442, 6)
         '
         'mnuProcurementPrepareDefineContractValueCategories
         '
         Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories"
-        Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..."
         '
         'mnuProcurementPrepareRecodeNumericIntoQuantiles
         '
         Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles"
-        Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..."
         '
         'mnuProcurementPrepareSetFactorReferenceLevel
         '
         Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel"
-        Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..."
         '
         'mnuProcurementPrepareUseAwardDate
         '
         Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate"
-        Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..."
         '
         'ToolStripSeparator43
         '
         Me.ToolStripSeparator43.Name = "ToolStripSeparator43"
-        Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6)
+        Me.ToolStripSeparator43.Size = New System.Drawing.Size(442, 6)
         '
         'mnuProcurementPrepareSummariseRedFlagsByCountryorOther
         '
         Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther"
-        Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..."
         '
         'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther
         '
         Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther"
-        Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..."
         '
         'mnuProcurementPrepareMergeAdditionalData
         '
         Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData"
-        Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22)
+        Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(445, 26)
         Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..."
         '
         'mnuProcurementDescribe
         '
         Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric})
         Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe"
-        Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementDescribe.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementDescribe.Text = "Describe"
         '
         'mnuProcurementDescribeOneVariableSummarise
         '
         Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise"
-        Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22)
+        Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(263, 26)
         Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..."
         '
         'mnuProcurementDescribeOneVariableGraph
         '
         Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph"
-        Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22)
+        Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(263, 26)
         Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..."
         '
         'ToolStripSeparator44
         '
         Me.ToolStripSeparator44.Name = "ToolStripSeparator44"
-        Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripSeparator44.Size = New System.Drawing.Size(260, 6)
         '
         'mnuProcurementDescribeCategorical
         '
         Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem})
         Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical"
-        Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22)
+        Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(263, 26)
         Me.mnuProcurementDescribeCategorical.Text = "Categorical"
         '
         'mnuProcurementDescribeCategoricalOneVarFreq
         '
         Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq"
-        Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22)
+        Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(401, 26)
         Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..."
         '
         'mnuProcurementDescribeCategoricalTwoVarFreq
         '
         Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq"
-        Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22)
+        Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(401, 26)
         Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..."
         '
         'ToolStripSeparator52
         '
         Me.ToolStripSeparator52.Name = "ToolStripSeparator52"
-        Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6)
+        Me.ToolStripSeparator52.Size = New System.Drawing.Size(398, 6)
         '
         'mnuProcurementDescribeCategoricalBarCharts
         '
         Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts"
-        Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22)
+        Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(401, 26)
         Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..."
         '
         'mnuProcurementDescribeCategoricalMosaic
         '
         Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic"
-        Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22)
+        Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(401, 26)
         Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..."
         '
         'mnuProcurementDescribeCategoricalTreemap
         '
         Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap"
-        Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22)
+        Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(401, 26)
         Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..."
         '
         'DisplayTopNToolStripMenuItem
         '
         Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem"
-        Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22)
+        Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(401, 26)
         Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..."
         '
         'mnuProcurementDescribeNumeric
         '
         Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers})
         Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric"
-        Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22)
+        Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(263, 26)
         Me.mnuProcurementDescribeNumeric.Text = "Numeric"
         '
         'mnuProcurementDescribeNumericBoxplot
         '
         Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot"
-        Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22)
+        Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(322, 26)
         Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..."
         '
         'HistogramToolStripMenuItem
         '
         Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem"
-        Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22)
+        Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(322, 26)
         Me.HistogramToolStripMenuItem.Text = "Histogram..."
         '
         'ToolStripSeparator53
         '
         Me.ToolStripSeparator53.Name = "ToolStripSeparator53"
-        Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6)
+        Me.ToolStripSeparator53.Size = New System.Drawing.Size(319, 6)
         '
         'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers
         '
         Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers"
-        Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22)
+        Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(322, 26)
         Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..."
         '
         'mnuProcurementMapping
         '
         Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues})
         Me.mnuProcurementMapping.Name = "mnuProcurementMapping"
-        Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementMapping.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementMapping.Text = "Mapping"
         '
         'mnuProcurementMappingMapCountryValues
         '
         Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues"
-        Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22)
+        Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(232, 26)
         Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..."
         '
         'mnuProcurementModel
         '
         Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem})
         Me.mnuProcurementModel.Name = "mnuProcurementModel"
-        Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementModel.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementModel.Text = "Model"
         '
         'mnuProcurementModelDefineCorruption
         '
         Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption"
-        Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22)
+        Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(289, 26)
         Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..."
         '
         'mnuProcurementModelFitModelToolStripMenuItem
         '
         Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem"
-        Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22)
+        Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(289, 26)
         Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..."
         '
         'ToolStripSeparator45
         '
         Me.ToolStripSeparator45.Name = "ToolStripSeparator45"
-        Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6)
+        Me.ToolStripSeparator45.Size = New System.Drawing.Size(268, 6)
         '
         'mnuProcurementDefineRedFlags
         '
         Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags"
-        Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..."
         '
         'mnuProcurementUseCRI
         '
         Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry})
         Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI"
-        Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22)
+        Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(271, 26)
         Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)"
         '
         'mnuProcurementCTFVCalculateCRI
         '
         Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI"
-        Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22)
+        Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(342, 26)
         Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..."
         '
         'mnuProcurementUseCRISummariseCRIbyCountry
         '
         Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry"
-        Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22)
+        Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(342, 26)
         Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..."
         '
         'mnuOptionsByContext
         '
         Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel})
         Me.mnuOptionsByContext.Name = "mnuOptionsByContext"
-        Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22)
+        Me.mnuOptionsByContext.Size = New System.Drawing.Size(104, 24)
         Me.mnuOptionsByContext.Text = "Experiments"
         '
         'mnuOptionsByContextCheckData
         '
         Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies})
         Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData"
-        Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextCheckData.Text = "Check Data"
         '
         'mnuOptionsByContextCheckDataDuplicateRows
         '
         Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows"
-        Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22)
+        Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(268, 26)
         Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..."
         '
         'mnuOptionsByContextCheckDataCompareColumns
         '
         Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns"
-        Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22)
+        Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(268, 26)
         Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..."
         '
         'ToolStripSeparator47
         '
         Me.ToolStripSeparator47.Name = "ToolStripSeparator47"
-        Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6)
+        Me.ToolStripSeparator47.Size = New System.Drawing.Size(265, 6)
         '
         'mnuOptionsByContextCheckDataOneVariableSummarise
         '
         Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise"
-        Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22)
+        Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(268, 26)
         Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..."
         '
         'mnuOptionsByContextCheckDataOneVariableGraph
         '
         Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph"
-        Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22)
+        Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(268, 26)
         Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..."
         '
         'mnuOptionsByContextCheckDataOneVariableFrequencies
         '
         Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies"
-        Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22)
+        Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(268, 26)
         Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..."
         '
         'mnuOptionsByContextDefine
         '
         Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm})
         Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine"
-        Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextDefine.Text = "Define"
         '
         'mnuOptionsByContextDefineOnStation
         '
         Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation"
-        Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22)
+        Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(181, 26)
         Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..."
         '
         'mnuOptionsByContextDefineOnFarm
         '
         Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm"
-        Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22)
+        Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(181, 26)
         Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..."
         '
         'mnuOptionsByContextPrepare
         '
         Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack})
         Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare"
-        Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextPrepare.Text = "Prepare"
         '
         'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions
         '
         Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions"
-        Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22)
+        Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(352, 26)
         Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..."
         '
         'ToolStripSeparator48
         '
         Me.ToolStripSeparator48.Name = "ToolStripSeparator48"
-        Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6)
+        Me.ToolStripSeparator48.Size = New System.Drawing.Size(349, 6)
         '
         'mnuOptionsByContextMergeAdditionalData
         '
         Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData"
-        Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22)
+        Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(352, 26)
         Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..."
         '
         'mnuOptionsByContextPrepareStack
         '
         Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack"
-        Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22)
+        Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(352, 26)
         Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..."
         '
         'mnuOptionsByContextPrepareUnstack
         '
         Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack"
-        Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22)
+        Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(352, 26)
         Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..."
         '
         'mnuOptionsByContextDescribe
         '
         Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot})
         Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe"
-        Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextDescribe.Text = "Describe"
         '
         'mnuOptionsByContextDescribeCompareTwoTreatments
         '
         Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments"
-        Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22)
+        Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(277, 26)
         Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..."
         '
         'mnuOptionsByContextDescribeCompareMultipleTreatments
         '
         Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False
         Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments"
-        Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22)
+        Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(277, 26)
         Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..."
         '
         'mnuOptionsByContextDescribeBoxplot
         '
         Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot"
-        Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22)
+        Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(277, 26)
         Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..."
         '
         'mnuOptionsByContextModel
         '
         Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel})
         Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel"
-        Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextModel.Text = "Model"
         '
         'mnuOptionsByContextModelFitModel
         '
         Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel"
-        Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22)
+        Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(219, 26)
         Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..."
         '
         'mnuOptionsByContextGeneralFitModel
         '
         Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel"
-        Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22)
+        Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(219, 26)
         Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..."
         '
         'mnuOptionsByContextCropModel
         '
         Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples})
         Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel"
-        Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22)
+        Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(171, 26)
         Me.mnuOptionsByContextCropModel.Text = "Crop Model"
         '
         'mnuOptionsByContextCropModelApsimxExamples
         '
         Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples"
-        Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22)
+        Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(217, 26)
         Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..."
         '
         'mnuTools
         '
         Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsLoadOptions, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions})
         Me.mnuTools.Name = "mnuTools"
-        Me.mnuTools.Size = New System.Drawing.Size(46, 22)
+        Me.mnuTools.Size = New System.Drawing.Size(58, 24)
         Me.mnuTools.Text = "Tools"
         '
         'mnuToolsRunRCode
         '
         Me.mnuToolsRunRCode.Enabled = False
         Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode"
-        Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsRunRCode.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsRunRCode.Tag = "Run_R_Code..."
         Me.mnuToolsRunRCode.Text = "Run R Code..."
         '
@@ -4856,34 +4863,34 @@ Partial Class frmMain
         '
         Me.mnuToolsRestartR.Enabled = False
         Me.mnuToolsRestartR.Name = "mnuToolsRestartR"
-        Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsRestartR.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsRestartR.Tag = "Restart_R"
         Me.mnuToolsRestartR.Text = "Restart R"
         '
         'mnuToolsCheckForUpdates
         '
         Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates"
-        Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..."
         Me.mnuToolsCheckForUpdates.Text = "Check for Updates..."
         '
         'mnuToolsClearOutputWindow
         '
         Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow"
-        Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..."
         Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..."
         '
         'ToolStripSeparator5
         '
         Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
-        Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6)
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(241, 6)
         '
         'mnuToolsSaveCurrentOptions
         '
         Me.mnuToolsSaveCurrentOptions.Enabled = False
         Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions"
-        Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..."
         Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..."
         '
@@ -4891,20 +4898,20 @@ Partial Class frmMain
         '
         Me.mnuToolsLoadOptions.Enabled = False
         Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions"
-        Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsLoadOptions.Tag = "Load_Options..."
         Me.mnuToolsLoadOptions.Text = "Load Options..."
         '
         'mnuToolsInstallRPackage
         '
         Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage"
-        Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsInstallRPackage.Text = "Install R Package..."
         '
         'mnuToolsOptions
         '
         Me.mnuToolsOptions.Name = "mnuToolsOptions"
-        Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22)
+        Me.mnuToolsOptions.Size = New System.Drawing.Size(244, 26)
         Me.mnuToolsOptions.Tag = "Options..."
         Me.mnuToolsOptions.Text = "Options..."
         '
@@ -4918,7 +4925,8 @@ Partial Class frmMain
         '
         Me.splOverall.BackColor = System.Drawing.Color.LightGray
         Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.splOverall.Location = New System.Drawing.Point(0, 61)
+        Me.splOverall.Location = New System.Drawing.Point(0, 63)
+        Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.splOverall.Name = "splOverall"
         Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal
         '
@@ -4931,9 +4939,9 @@ Partial Class frmMain
         '
         Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control
         Me.splOverall.Panel2.Controls.Add(Me.splDataOutput)
-        Me.splOverall.Size = New System.Drawing.Size(834, 399)
-        Me.splOverall.SplitterDistance = 164
-        Me.splOverall.SplitterWidth = 5
+        Me.splOverall.Size = New System.Drawing.Size(1042, 513)
+        Me.splOverall.SplitterDistance = 210
+        Me.splOverall.SplitterWidth = 6
         Me.splOverall.TabIndex = 10
         '
         'splExtraWindows
@@ -4941,6 +4949,7 @@ Partial Class frmMain
         Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray
         Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill
         Me.splExtraWindows.Location = New System.Drawing.Point(0, 0)
+        Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.splExtraWindows.Name = "splExtraWindows"
         '
         'splExtraWindows.Panel1
@@ -4952,9 +4961,9 @@ Partial Class frmMain
         '
         Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control
         Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow)
-        Me.splExtraWindows.Size = New System.Drawing.Size(834, 164)
-        Me.splExtraWindows.SplitterDistance = 254
-        Me.splExtraWindows.SplitterWidth = 5
+        Me.splExtraWindows.Size = New System.Drawing.Size(1042, 210)
+        Me.splExtraWindows.SplitterDistance = 317
+        Me.splExtraWindows.SplitterWidth = 6
         Me.splExtraWindows.TabIndex = 0
         '
         'splMetadata
@@ -4962,6 +4971,7 @@ Partial Class frmMain
         Me.splMetadata.BackColor = System.Drawing.Color.LightGray
         Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill
         Me.splMetadata.Location = New System.Drawing.Point(0, 0)
+        Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.splMetadata.Name = "splMetadata"
         '
         'splMetadata.Panel1
@@ -4972,9 +4982,9 @@ Partial Class frmMain
         '
         Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control
         Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta)
-        Me.splMetadata.Size = New System.Drawing.Size(254, 164)
-        Me.splMetadata.SplitterDistance = 70
-        Me.splMetadata.SplitterWidth = 5
+        Me.splMetadata.Size = New System.Drawing.Size(317, 210)
+        Me.splMetadata.SplitterDistance = 87
+        Me.splMetadata.SplitterWidth = 6
         Me.splMetadata.TabIndex = 0
         '
         'ucrColumnMeta
@@ -4984,9 +4994,9 @@ Partial Class frmMain
         Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0)
-        Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
         Me.ucrColumnMeta.Name = "ucrColumnMeta"
-        Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 164)
+        Me.ucrColumnMeta.Size = New System.Drawing.Size(87, 210)
         Me.ucrColumnMeta.TabIndex = 0
         '
         'ucrDataFrameMeta
@@ -4995,9 +5005,9 @@ Partial Class frmMain
         Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0)
-        Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
         Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta"
-        Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 164)
+        Me.ucrDataFrameMeta.Size = New System.Drawing.Size(224, 210)
         Me.ucrDataFrameMeta.TabIndex = 0
         '
         'ucrScriptWindow
@@ -5006,9 +5016,9 @@ Partial Class frmMain
         Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0)
-        Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
         Me.ucrScriptWindow.Name = "ucrScriptWindow"
-        Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 164)
+        Me.ucrScriptWindow.Size = New System.Drawing.Size(719, 210)
         Me.ucrScriptWindow.strActiveTabText = ""
         Me.ucrScriptWindow.TabIndex = 2
         Me.ucrScriptWindow.Tag = "Script_Window"
@@ -5018,6 +5028,7 @@ Partial Class frmMain
         Me.splDataOutput.BackColor = System.Drawing.Color.LightGray
         Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill
         Me.splDataOutput.Location = New System.Drawing.Point(0, 0)
+        Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.splDataOutput.Name = "splDataOutput"
         '
         'splDataOutput.Panel1
@@ -5029,9 +5040,9 @@ Partial Class frmMain
         '
         Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control
         Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput)
-        Me.splDataOutput.Size = New System.Drawing.Size(834, 230)
-        Me.splDataOutput.SplitterDistance = 384
-        Me.splDataOutput.SplitterWidth = 5
+        Me.splDataOutput.Size = New System.Drawing.Size(1042, 297)
+        Me.splDataOutput.SplitterDistance = 479
+        Me.splDataOutput.SplitterWidth = 6
         Me.splDataOutput.TabIndex = 0
         '
         'ucrDataViewer
@@ -5041,9 +5052,9 @@ Partial Class frmMain
         Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0)
-        Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
         Me.ucrDataViewer.Name = "ucrDataViewer"
-        Me.ucrDataViewer.Size = New System.Drawing.Size(384, 230)
+        Me.ucrDataViewer.Size = New System.Drawing.Size(479, 297)
         Me.ucrDataViewer.TabIndex = 0
         Me.ucrDataViewer.Tag = "Data_View"
         '
@@ -5053,9 +5064,9 @@ Partial Class frmMain
         Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill
         Me.ucrOutput.Location = New System.Drawing.Point(0, 0)
-        Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ucrOutput.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
         Me.ucrOutput.Name = "ucrOutput"
-        Me.ucrOutput.Size = New System.Drawing.Size(445, 230)
+        Me.ucrOutput.Size = New System.Drawing.Size(557, 297)
         Me.ucrOutput.TabIndex = 0
         '
         'mnuPlotly
@@ -5093,17 +5104,11 @@ Partial Class frmMain
         Me.mnuLogFile.Text = "Log Window..."
         Me.mnuLogFile.ToolTipText = "Log Window"
         '
-        'mnuClimaticPICSAGeneralGrap
-        '
-        Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap"
-        Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22)
-        Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..."
-        '
         'frmMain
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
-        Me.ClientSize = New System.Drawing.Size(834, 482)
+        Me.ClientSize = New System.Drawing.Size(1042, 602)
         Me.Controls.Add(Me.splOverall)
         Me.Controls.Add(Me.stsStrip)
         Me.Controls.Add(Me.Tool_strip)
@@ -5111,10 +5116,9 @@ Partial Class frmMain
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.IsMdiContainer = True
         Me.MainMenuStrip = Me.mnuBar
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.Name = "frmMain"
-        Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." +
-                My.Application.Info.Version.Minor.ToString + "." +
-                My.Application.Info.Version.Build.ToString
+        Me.Text = "R-Instat .."
         Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
         Me.stsStrip.ResumeLayout(False)
         Me.stsStrip.PerformLayout()
diff --git a/instat/frmMain.resx b/instat/frmMain.resx
index c73bcdce42b..8d8e283f660 100644
--- a/instat/frmMain.resx
+++ b/instat/frmMain.resx
@@ -136,7 +136,7 @@
   <data name="mnuLastGraph.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+
         h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv
         P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq
         QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S
@@ -162,7 +162,7 @@
   <data name="mnuMetadata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4
         UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn
         NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub
         WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G
diff --git a/instat/instat.vbproj b/instat/instat.vbproj
index 4ba86ddf574..32efaac7540 100644
--- a/instat/instat.vbproj
+++ b/instat/instat.vbproj
@@ -155,8 +155,8 @@
     <Reference Include="RDotNet, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="RInsightF461, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RInsightF461.0.0.7\lib\net461\RInsightF461.dll</HintPath>
+    <Reference Include="RInsightF461, Version=0.0.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RInsightF461.0.0.10\lib\net461\RInsightF461.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
diff --git a/instat/packages.config b/instat/packages.config
index 82fa6c86ff3..30419269a79 100644
--- a/instat/packages.config
+++ b/instat/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
   <package id="R.NET" version="1.8.2" targetFramework="net461" />
-  <package id="RInsightF461" version="0.0.7" targetFramework="net461" />
+  <package id="RInsightF461" version="0.0.10" targetFramework="net461" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />
diff --git a/instat/sdgCalculationsSummmary.Designer.vb b/instat/sdgCalculationsSummmary.Designer.vb
index ca1adec54dd..2d6baad1aed 100644
--- a/instat/sdgCalculationsSummmary.Designer.vb
+++ b/instat/sdgCalculationsSummmary.Designer.vb
@@ -82,9 +82,10 @@ Partial Class sdgCalculationsSummmary
         Me.tbSummaryCalcs.Controls.Add(Me.tbManipulations)
         Me.tbSummaryCalcs.Controls.Add(Me.tbSubCalcs)
         Me.tbSummaryCalcs.Location = New System.Drawing.Point(0, 0)
+        Me.tbSummaryCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.tbSummaryCalcs.Name = "tbSummaryCalcs"
         Me.tbSummaryCalcs.SelectedIndex = 0
-        Me.tbSummaryCalcs.Size = New System.Drawing.Size(803, 533)
+        Me.tbSummaryCalcs.Size = New System.Drawing.Size(1004, 666)
         Me.tbSummaryCalcs.TabIndex = 1
         '
         'tbMain
@@ -104,10 +105,11 @@ Partial Class sdgCalculationsSummmary
         Me.tbMain.Controls.Add(Me.ucrSelectorBy)
         Me.tbMain.Controls.Add(Me.ucrPnlSave)
         Me.tbMain.Controls.Add(Me.ucrCalcSummary)
-        Me.tbMain.Location = New System.Drawing.Point(4, 22)
+        Me.tbMain.Location = New System.Drawing.Point(4, 25)
+        Me.tbMain.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.tbMain.Name = "tbMain"
-        Me.tbMain.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMain.Size = New System.Drawing.Size(795, 507)
+        Me.tbMain.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.tbMain.Size = New System.Drawing.Size(996, 637)
         Me.tbMain.TabIndex = 0
         Me.tbMain.Text = "Main"
         Me.tbMain.UseVisualStyleBackColor = True
@@ -115,20 +117,21 @@ Partial Class sdgCalculationsSummmary
         'ucrDefineFilter
         '
         Me.ucrDefineFilter.AutoSize = True
-        Me.ucrDefineFilter.Location = New System.Drawing.Point(8, 55)
+        Me.ucrDefineFilter.Location = New System.Drawing.Point(10, 69)
+        Me.ucrDefineFilter.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5)
         Me.ucrDefineFilter.Name = "ucrDefineFilter"
-        Me.ucrDefineFilter.Size = New System.Drawing.Size(770, 389)
+        Me.ucrDefineFilter.Size = New System.Drawing.Size(962, 608)
         Me.ucrDefineFilter.TabIndex = 19
         '
         'ucrReceiverByOrSort
         '
         Me.ucrReceiverByOrSort.AutoSize = True
         Me.ucrReceiverByOrSort.frmParent = Nothing
-        Me.ucrReceiverByOrSort.Location = New System.Drawing.Point(239, 143)
+        Me.ucrReceiverByOrSort.Location = New System.Drawing.Point(299, 179)
         Me.ucrReceiverByOrSort.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrReceiverByOrSort.Name = "ucrReceiverByOrSort"
         Me.ucrReceiverByOrSort.Selector = Nothing
-        Me.ucrReceiverByOrSort.Size = New System.Drawing.Size(120, 100)
+        Me.ucrReceiverByOrSort.Size = New System.Drawing.Size(150, 125)
         Me.ucrReceiverByOrSort.strNcFilePath = ""
         Me.ucrReceiverByOrSort.TabIndex = 18
         Me.ucrReceiverByOrSort.ucrSelector = Nothing
@@ -139,17 +142,19 @@ Partial Class sdgCalculationsSummmary
         Me.ucrInputCalculationName.AutoSize = True
         Me.ucrInputCalculationName.IsMultiline = False
         Me.ucrInputCalculationName.IsReadOnly = False
-        Me.ucrInputCalculationName.Location = New System.Drawing.Point(373, 439)
+        Me.ucrInputCalculationName.Location = New System.Drawing.Point(466, 549)
+        Me.ucrInputCalculationName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8)
         Me.ucrInputCalculationName.Name = "ucrInputCalculationName"
-        Me.ucrInputCalculationName.Size = New System.Drawing.Size(137, 21)
+        Me.ucrInputCalculationName.Size = New System.Drawing.Size(171, 26)
         Me.ucrInputCalculationName.TabIndex = 12
         '
         'lblReceiverLabel
         '
         Me.lblReceiverLabel.AutoSize = True
-        Me.lblReceiverLabel.Location = New System.Drawing.Point(236, 126)
+        Me.lblReceiverLabel.Location = New System.Drawing.Point(295, 158)
+        Me.lblReceiverLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblReceiverLabel.Name = "lblReceiverLabel"
-        Me.lblReceiverLabel.Size = New System.Drawing.Size(45, 13)
+        Me.lblReceiverLabel.Size = New System.Drawing.Size(55, 16)
         Me.lblReceiverLabel.TabIndex = 15
         Me.lblReceiverLabel.Text = "Factors:"
         '
@@ -159,35 +164,39 @@ Partial Class sdgCalculationsSummmary
         Me.ucrInputResultName.AutoSize = True
         Me.ucrInputResultName.IsMultiline = False
         Me.ucrInputResultName.IsReadOnly = False
-        Me.ucrInputResultName.Location = New System.Drawing.Point(102, 439)
+        Me.ucrInputResultName.Location = New System.Drawing.Point(128, 549)
+        Me.ucrInputResultName.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8)
         Me.ucrInputResultName.Name = "ucrInputResultName"
-        Me.ucrInputResultName.Size = New System.Drawing.Size(137, 21)
+        Me.ucrInputResultName.Size = New System.Drawing.Size(171, 26)
         Me.ucrInputResultName.TabIndex = 13
         '
         'lblResultName
         '
         Me.lblResultName.AutoSize = True
-        Me.lblResultName.Location = New System.Drawing.Point(12, 442)
+        Me.lblResultName.Location = New System.Drawing.Point(15, 552)
+        Me.lblResultName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblResultName.Name = "lblResultName"
-        Me.lblResultName.Size = New System.Drawing.Size(71, 13)
+        Me.lblResultName.Size = New System.Drawing.Size(88, 16)
         Me.lblResultName.TabIndex = 10
         Me.lblResultName.Text = "Result Name:"
         '
         'lblCalcName
         '
         Me.lblCalcName.AutoSize = True
-        Me.lblCalcName.Location = New System.Drawing.Point(273, 442)
+        Me.lblCalcName.Location = New System.Drawing.Point(341, 552)
+        Me.lblCalcName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblCalcName.Name = "lblCalcName"
-        Me.lblCalcName.Size = New System.Drawing.Size(93, 13)
+        Me.lblCalcName.Size = New System.Drawing.Size(116, 16)
         Me.lblCalcName.TabIndex = 9
         Me.lblCalcName.Text = "Calculation Name:"
         '
         'rdoSaveCalcAndResult
         '
         Me.rdoSaveCalcAndResult.AutoSize = True
-        Me.rdoSaveCalcAndResult.Location = New System.Drawing.Point(12, 476)
+        Me.rdoSaveCalcAndResult.Location = New System.Drawing.Point(15, 595)
+        Me.rdoSaveCalcAndResult.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.rdoSaveCalcAndResult.Name = "rdoSaveCalcAndResult"
-        Me.rdoSaveCalcAndResult.Size = New System.Drawing.Size(159, 17)
+        Me.rdoSaveCalcAndResult.Size = New System.Drawing.Size(196, 20)
         Me.rdoSaveCalcAndResult.TabIndex = 8
         Me.rdoSaveCalcAndResult.TabStop = True
         Me.rdoSaveCalcAndResult.Text = "Save Calculation and Result"
@@ -196,9 +205,10 @@ Partial Class sdgCalculationsSummmary
         'rdoSaveCalculation
         '
         Me.rdoSaveCalculation.AutoSize = True
-        Me.rdoSaveCalculation.Location = New System.Drawing.Point(186, 476)
+        Me.rdoSaveCalculation.Location = New System.Drawing.Point(232, 595)
+        Me.rdoSaveCalculation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.rdoSaveCalculation.Name = "rdoSaveCalculation"
-        Me.rdoSaveCalculation.Size = New System.Drawing.Size(129, 17)
+        Me.rdoSaveCalculation.Size = New System.Drawing.Size(159, 20)
         Me.rdoSaveCalculation.TabIndex = 7
         Me.rdoSaveCalculation.TabStop = True
         Me.rdoSaveCalculation.Text = "Save Calculation Only"
@@ -207,9 +217,10 @@ Partial Class sdgCalculationsSummmary
         'rdoDoNotSave
         '
         Me.rdoDoNotSave.AutoSize = True
-        Me.rdoDoNotSave.Location = New System.Drawing.Point(330, 476)
+        Me.rdoDoNotSave.Location = New System.Drawing.Point(412, 595)
+        Me.rdoDoNotSave.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.rdoDoNotSave.Name = "rdoDoNotSave"
-        Me.rdoDoNotSave.Size = New System.Drawing.Size(90, 17)
+        Me.rdoDoNotSave.Size = New System.Drawing.Size(109, 20)
         Me.rdoDoNotSave.TabIndex = 6
         Me.rdoDoNotSave.TabStop = True
         Me.rdoDoNotSave.Text = "Save Nothing"
@@ -218,9 +229,10 @@ Partial Class sdgCalculationsSummmary
         'lblType
         '
         Me.lblType.AutoSize = True
-        Me.lblType.Location = New System.Drawing.Point(9, 12)
+        Me.lblType.Location = New System.Drawing.Point(11, 15)
+        Me.lblType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblType.Name = "lblType"
-        Me.lblType.Size = New System.Drawing.Size(34, 13)
+        Me.lblType.Size = New System.Drawing.Size(42, 16)
         Me.lblType.TabIndex = 4
         Me.lblType.Text = "Type:"
         '
@@ -230,9 +242,10 @@ Partial Class sdgCalculationsSummmary
         Me.ucrInputType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.ucrInputType.GetSetSelectedIndex = -1
         Me.ucrInputType.IsReadOnly = False
-        Me.ucrInputType.Location = New System.Drawing.Point(8, 28)
+        Me.ucrInputType.Location = New System.Drawing.Point(10, 35)
+        Me.ucrInputType.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8)
         Me.ucrInputType.Name = "ucrInputType"
-        Me.ucrInputType.Size = New System.Drawing.Size(120, 21)
+        Me.ucrInputType.Size = New System.Drawing.Size(150, 26)
         Me.ucrInputType.TabIndex = 3
         '
         'ucrSelectorBy
@@ -241,40 +254,43 @@ Partial Class sdgCalculationsSummmary
         Me.ucrSelectorBy.bDropUnusedFilterLevels = False
         Me.ucrSelectorBy.bShowHiddenColumns = False
         Me.ucrSelectorBy.bUseCurrentFilter = True
-        Me.ucrSelectorBy.Location = New System.Drawing.Point(8, 114)
+        Me.ucrSelectorBy.Location = New System.Drawing.Point(10, 142)
         Me.ucrSelectorBy.Margin = New System.Windows.Forms.Padding(0)
         Me.ucrSelectorBy.Name = "ucrSelectorBy"
-        Me.ucrSelectorBy.Size = New System.Drawing.Size(213, 183)
+        Me.ucrSelectorBy.Size = New System.Drawing.Size(334, 285)
         Me.ucrSelectorBy.TabIndex = 14
         '
         'ucrPnlSave
         '
         Me.ucrPnlSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ucrPnlSave.Location = New System.Drawing.Point(3, 466)
+        Me.ucrPnlSave.Location = New System.Drawing.Point(4, 582)
+        Me.ucrPnlSave.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
         Me.ucrPnlSave.Name = "ucrPnlSave"
-        Me.ucrPnlSave.Size = New System.Drawing.Size(427, 38)
+        Me.ucrPnlSave.Size = New System.Drawing.Size(534, 48)
         Me.ucrPnlSave.TabIndex = 20
         '
         'ucrCalcSummary
         '
         Me.ucrCalcSummary.AutoSize = True
-        Me.ucrCalcSummary.Location = New System.Drawing.Point(8, 50)
+        Me.ucrCalcSummary.Location = New System.Drawing.Point(10, 62)
+        Me.ucrCalcSummary.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.ucrCalcSummary.Name = "ucrCalcSummary"
-        Me.ucrCalcSummary.Size = New System.Drawing.Size(860, 338)
+        Me.ucrCalcSummary.Size = New System.Drawing.Size(1355, 518)
         Me.ucrCalcSummary.TabIndex = 17
         '
         'tbManipulations
         '
-        Me.tbManipulations.Controls.Add(Me.ucrManipulations)
         Me.tbManipulations.Controls.Add(Me.cmdManipDuplicate)
         Me.tbManipulations.Controls.Add(Me.cmdManipDelete)
         Me.tbManipulations.Controls.Add(Me.lblManipulations)
         Me.tbManipulations.Controls.Add(Me.cmdManipEdit)
         Me.tbManipulations.Controls.Add(Me.cmdManipAdd)
-        Me.tbManipulations.Location = New System.Drawing.Point(4, 22)
+        Me.tbManipulations.Controls.Add(Me.ucrManipulations)
+        Me.tbManipulations.Location = New System.Drawing.Point(4, 25)
+        Me.tbManipulations.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.tbManipulations.Name = "tbManipulations"
-        Me.tbManipulations.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbManipulations.Size = New System.Drawing.Size(795, 507)
+        Me.tbManipulations.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.tbManipulations.Size = New System.Drawing.Size(996, 637)
         Me.tbManipulations.TabIndex = 1
         Me.tbManipulations.Text = "Manipulations"
         Me.tbManipulations.UseVisualStyleBackColor = True
@@ -282,27 +298,30 @@ Partial Class sdgCalculationsSummmary
         'ucrManipulations
         '
         Me.ucrManipulations.AutoSize = True
-        Me.ucrManipulations.Location = New System.Drawing.Point(6, 32)
+        Me.ucrManipulations.Location = New System.Drawing.Point(8, 40)
+        Me.ucrManipulations.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
         Me.ucrManipulations.Name = "ucrManipulations"
-        Me.ucrManipulations.Size = New System.Drawing.Size(199, 150)
+        Me.ucrManipulations.Size = New System.Drawing.Size(375, 235)
         Me.ucrManipulations.TabIndex = 21
         Me.ucrManipulations.ucrDataFrameList = Nothing
         Me.ucrManipulations.ucrReceiver = Nothing
         '
         'cmdManipDuplicate
         '
-        Me.cmdManipDuplicate.Location = New System.Drawing.Point(166, 132)
+        Me.cmdManipDuplicate.Location = New System.Drawing.Point(273, 199)
+        Me.cmdManipDuplicate.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdManipDuplicate.Name = "cmdManipDuplicate"
-        Me.cmdManipDuplicate.Size = New System.Drawing.Size(75, 23)
+        Me.cmdManipDuplicate.Size = New System.Drawing.Size(94, 29)
         Me.cmdManipDuplicate.TabIndex = 20
         Me.cmdManipDuplicate.Text = "Duplicate"
         Me.cmdManipDuplicate.UseVisualStyleBackColor = True
         '
         'cmdManipDelete
         '
-        Me.cmdManipDelete.Location = New System.Drawing.Point(166, 103)
+        Me.cmdManipDelete.Location = New System.Drawing.Point(273, 163)
+        Me.cmdManipDelete.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdManipDelete.Name = "cmdManipDelete"
-        Me.cmdManipDelete.Size = New System.Drawing.Size(75, 23)
+        Me.cmdManipDelete.Size = New System.Drawing.Size(94, 29)
         Me.cmdManipDelete.TabIndex = 17
         Me.cmdManipDelete.Text = "Delete"
         Me.cmdManipDelete.UseVisualStyleBackColor = True
@@ -310,26 +329,29 @@ Partial Class sdgCalculationsSummmary
         'lblManipulations
         '
         Me.lblManipulations.AutoSize = True
-        Me.lblManipulations.Location = New System.Drawing.Point(9, 17)
+        Me.lblManipulations.Location = New System.Drawing.Point(11, 21)
+        Me.lblManipulations.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblManipulations.Name = "lblManipulations"
-        Me.lblManipulations.Size = New System.Drawing.Size(75, 13)
+        Me.lblManipulations.Size = New System.Drawing.Size(93, 16)
         Me.lblManipulations.TabIndex = 16
         Me.lblManipulations.Text = "Manipulations:"
         '
         'cmdManipEdit
         '
-        Me.cmdManipEdit.Location = New System.Drawing.Point(166, 74)
+        Me.cmdManipEdit.Location = New System.Drawing.Point(273, 126)
+        Me.cmdManipEdit.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdManipEdit.Name = "cmdManipEdit"
-        Me.cmdManipEdit.Size = New System.Drawing.Size(75, 23)
+        Me.cmdManipEdit.Size = New System.Drawing.Size(94, 29)
         Me.cmdManipEdit.TabIndex = 18
         Me.cmdManipEdit.Text = "Edit"
         Me.cmdManipEdit.UseVisualStyleBackColor = True
         '
         'cmdManipAdd
         '
-        Me.cmdManipAdd.Location = New System.Drawing.Point(166, 45)
+        Me.cmdManipAdd.Location = New System.Drawing.Point(273, 90)
+        Me.cmdManipAdd.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdManipAdd.Name = "cmdManipAdd"
-        Me.cmdManipAdd.Size = New System.Drawing.Size(75, 23)
+        Me.cmdManipAdd.Size = New System.Drawing.Size(94, 29)
         Me.cmdManipAdd.TabIndex = 19
         Me.cmdManipAdd.Text = "Add"
         Me.cmdManipAdd.UseVisualStyleBackColor = True
@@ -342,10 +364,11 @@ Partial Class sdgCalculationsSummmary
         Me.tbSubCalcs.Controls.Add(Me.cmdSubCalcAdd)
         Me.tbSubCalcs.Controls.Add(Me.lblSubCalcs)
         Me.tbSubCalcs.Controls.Add(Me.cmdSubCalcEdit)
-        Me.tbSubCalcs.Location = New System.Drawing.Point(4, 22)
+        Me.tbSubCalcs.Location = New System.Drawing.Point(4, 25)
+        Me.tbSubCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.tbSubCalcs.Name = "tbSubCalcs"
-        Me.tbSubCalcs.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSubCalcs.Size = New System.Drawing.Size(795, 507)
+        Me.tbSubCalcs.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.tbSubCalcs.Size = New System.Drawing.Size(996, 637)
         Me.tbSubCalcs.TabIndex = 2
         Me.tbSubCalcs.Text = "Sub Calculations"
         Me.tbSubCalcs.UseVisualStyleBackColor = True
@@ -353,36 +376,40 @@ Partial Class sdgCalculationsSummmary
         'lstSubCalcs
         '
         Me.lstSubCalcs.HideSelection = False
-        Me.lstSubCalcs.Location = New System.Drawing.Point(9, 33)
+        Me.lstSubCalcs.Location = New System.Drawing.Point(11, 41)
+        Me.lstSubCalcs.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.lstSubCalcs.Name = "lstSubCalcs"
-        Me.lstSubCalcs.Size = New System.Drawing.Size(121, 133)
+        Me.lstSubCalcs.Size = New System.Drawing.Size(150, 165)
         Me.lstSubCalcs.TabIndex = 21
         Me.lstSubCalcs.UseCompatibleStateImageBehavior = False
         Me.lstSubCalcs.View = System.Windows.Forms.View.List
         '
         'cmdSubCalcDuplicate
         '
-        Me.cmdSubCalcDuplicate.Location = New System.Drawing.Point(166, 132)
+        Me.cmdSubCalcDuplicate.Location = New System.Drawing.Point(208, 165)
+        Me.cmdSubCalcDuplicate.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdSubCalcDuplicate.Name = "cmdSubCalcDuplicate"
-        Me.cmdSubCalcDuplicate.Size = New System.Drawing.Size(75, 23)
+        Me.cmdSubCalcDuplicate.Size = New System.Drawing.Size(94, 29)
         Me.cmdSubCalcDuplicate.TabIndex = 26
         Me.cmdSubCalcDuplicate.Text = "Duplicate"
         Me.cmdSubCalcDuplicate.UseVisualStyleBackColor = True
         '
         'cmdSubCalcDelete
         '
-        Me.cmdSubCalcDelete.Location = New System.Drawing.Point(166, 103)
+        Me.cmdSubCalcDelete.Location = New System.Drawing.Point(208, 129)
+        Me.cmdSubCalcDelete.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdSubCalcDelete.Name = "cmdSubCalcDelete"
-        Me.cmdSubCalcDelete.Size = New System.Drawing.Size(75, 23)
+        Me.cmdSubCalcDelete.Size = New System.Drawing.Size(94, 29)
         Me.cmdSubCalcDelete.TabIndex = 23
         Me.cmdSubCalcDelete.Text = "Delete"
         Me.cmdSubCalcDelete.UseVisualStyleBackColor = True
         '
         'cmdSubCalcAdd
         '
-        Me.cmdSubCalcAdd.Location = New System.Drawing.Point(166, 45)
+        Me.cmdSubCalcAdd.Location = New System.Drawing.Point(208, 56)
+        Me.cmdSubCalcAdd.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdSubCalcAdd.Name = "cmdSubCalcAdd"
-        Me.cmdSubCalcAdd.Size = New System.Drawing.Size(75, 23)
+        Me.cmdSubCalcAdd.Size = New System.Drawing.Size(94, 29)
         Me.cmdSubCalcAdd.TabIndex = 25
         Me.cmdSubCalcAdd.Text = "Add"
         Me.cmdSubCalcAdd.UseVisualStyleBackColor = True
@@ -390,17 +417,19 @@ Partial Class sdgCalculationsSummmary
         'lblSubCalcs
         '
         Me.lblSubCalcs.AutoSize = True
-        Me.lblSubCalcs.Location = New System.Drawing.Point(9, 17)
+        Me.lblSubCalcs.Location = New System.Drawing.Point(11, 21)
+        Me.lblSubCalcs.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblSubCalcs.Name = "lblSubCalcs"
-        Me.lblSubCalcs.Size = New System.Drawing.Size(89, 13)
+        Me.lblSubCalcs.Size = New System.Drawing.Size(111, 16)
         Me.lblSubCalcs.TabIndex = 22
         Me.lblSubCalcs.Text = "Sub-Calculations:"
         '
         'cmdSubCalcEdit
         '
-        Me.cmdSubCalcEdit.Location = New System.Drawing.Point(166, 74)
+        Me.cmdSubCalcEdit.Location = New System.Drawing.Point(208, 92)
+        Me.cmdSubCalcEdit.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.cmdSubCalcEdit.Name = "cmdSubCalcEdit"
-        Me.cmdSubCalcEdit.Size = New System.Drawing.Size(75, 23)
+        Me.cmdSubCalcEdit.Size = New System.Drawing.Size(94, 29)
         Me.cmdSubCalcEdit.TabIndex = 24
         Me.cmdSubCalcEdit.Text = "Edit"
         Me.cmdSubCalcEdit.UseVisualStyleBackColor = True
@@ -408,20 +437,22 @@ Partial Class sdgCalculationsSummmary
         'ucrBaseSubDialog
         '
         Me.ucrBaseSubDialog.AutoSize = True
-        Me.ucrBaseSubDialog.Location = New System.Drawing.Point(307, 533)
+        Me.ucrBaseSubDialog.Location = New System.Drawing.Point(384, 666)
+        Me.ucrBaseSubDialog.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5)
         Me.ucrBaseSubDialog.Name = "ucrBaseSubDialog"
-        Me.ucrBaseSubDialog.Size = New System.Drawing.Size(224, 30)
+        Me.ucrBaseSubDialog.Size = New System.Drawing.Size(281, 38)
         Me.ucrBaseSubDialog.TabIndex = 0
         '
         'sdgCalculationsSummmary
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(806, 565)
+        Me.ClientSize = New System.Drawing.Size(1008, 706)
         Me.Controls.Add(Me.ucrBaseSubDialog)
         Me.Controls.Add(Me.tbSummaryCalcs)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "sdgCalculationsSummmary"
diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb
index 2432df90623..b45d72b4af1 100644
--- a/instat/sdgProportionsPercentages.vb
+++ b/instat/sdgProportionsPercentages.vb
@@ -49,7 +49,6 @@ Public Class sdgProportionsPercentages
 
         ucrChkProportionsPercentages.SetParameter(New RParameter("percentage_type"))
         ucrChkProportionsPercentages.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34))
-        ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34))
         ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages")
 
         ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
@@ -70,6 +69,8 @@ Public Class sdgProportionsPercentages
             InitialiseControls()
         End If
         clsDefaultFunction = clsNewDefaultFunction
+        clsDefaultFunction.AddParameter("percentage_type", Chr(34) & "factors" & Chr(34))
+
         SetRCode(Me, clsDefaultFunction, bReset)
     End Sub
 
diff --git a/instat/sdgSummaries.Designer.vb b/instat/sdgSummaries.Designer.vb
index 1a3609d27a0..4f1e8cd8ec8 100644
--- a/instat/sdgSummaries.Designer.vb
+++ b/instat/sdgSummaries.Designer.vb
@@ -41,96 +41,35 @@ Partial Class sdgSummaries
         Me.components = New System.ComponentModel.Container()
         Me.tbCircular = New System.Windows.Forms.TabPage()
         Me.grpCircScale = New System.Windows.Forms.GroupBox()
-        Me.ucrChkCircRange = New instat.ucrCheck()
-        Me.ucrChkAngVar = New instat.ucrCheck()
-        Me.ucrChkrho = New instat.ucrCheck()
-        Me.ucrChkAngDev = New instat.ucrCheck()
-        Me.ucrChkVar = New instat.ucrCheck()
-        Me.ucrChkSd = New instat.ucrCheck()
         Me.grpCircLocation = New System.Windows.Forms.GroupBox()
-        Me.ucrChkCircMedian = New instat.ucrCheck()
-        Me.ucrChkMin = New instat.ucrCheck()
-        Me.ucrChkMedianH = New instat.ucrCheck()
-        Me.ucrChkQ3 = New instat.ucrCheck()
-        Me.ucrChkQ1 = New instat.ucrCheck()
-        Me.ucrChkMax = New instat.ucrCheck()
-        Me.ucrChkCircMean = New instat.ucrCheck()
         Me.tbModel = New System.Windows.Forms.TabPage()
-        Me.ucrChkStandardErrorOfMean = New instat.ucrCheck()
         Me.tbPosition = New System.Windows.Forms.TabPage()
-        Me.ucrChkOrderBy = New instat.ucrCheck()
         Me.lblOrderBy = New System.Windows.Forms.Label()
         Me.grpPosition = New System.Windows.Forms.GroupBox()
-        Me.ucrChkSetseed = New instat.ucrCheck()
-        Me.ucrNudSeed = New instat.ucrNud()
-        Me.ucrChkSample = New instat.ucrCheck()
-        Me.ucrInputN = New instat.ucrInputTextBox()
         Me.lblInputN = New System.Windows.Forms.Label()
-        Me.ucrChkFirst = New instat.ucrCheck()
-        Me.ucrChkLast = New instat.ucrCheck()
-        Me.ucrChknth = New instat.ucrCheck()
-        Me.ucrSelectorOrderBy = New instat.ucrSelectorByDataFrameAddRemove()
-        Me.ucrReceiverOrderBy = New instat.ucrReceiverSingle()
         Me.tbTwoVariables = New System.Windows.Forms.TabPage()
         Me.lblSecondVariable = New System.Windows.Forms.Label()
         Me.grpRelationships = New System.Windows.Forms.GroupBox()
-        Me.ucrChkCovariance = New instat.ucrCheck()
-        Me.ucrChkCorrelations = New instat.ucrCheck()
         Me.grpHyroGOF = New System.Windows.Forms.GroupBox()
         Me.lblJmia = New System.Windows.Forms.Label()
-        Me.ucrInputJmia = New instat.ucrInputTextBox()
-        Me.ucrChkSelectAll = New instat.ucrCheck()
-        Me.ucrChkRelativeIndexOfAgreement = New instat.ucrCheck()
-        Me.ucrChkRatioOfStandardDeviation = New instat.ucrCheck()
-        Me.ucrChkCoefDetermination = New instat.ucrCheck()
-        Me.ucrChkRatioOfRootMeanSquaredError = New instat.ucrCheck()
-        Me.ucrChkRelativeNashSutcliffeEff = New instat.ucrCheck()
-        Me.ucrChkModifiedIndexOfAgreement = New instat.ucrCheck()
-        Me.ucrChkCoefPersistence = New instat.ucrCheck()
-        Me.ucrChkNashSutcliffeEfficiency = New instat.ucrCheck()
-        Me.ucrChkSumOfSquaredResiduals = New instat.ucrCheck()
-        Me.ucrChkKlingGuptaEfficiency = New instat.ucrCheck()
-        Me.ucrChkVolumetricEfficiency = New instat.ucrCheck()
-        Me.ucrChkPercentBias = New instat.ucrCheck()
-        Me.ucrChkModNashSutcliffeEff = New instat.ucrCheck()
-        Me.ucrChkMeanError = New instat.ucrCheck()
-        Me.ucrChkMeanSquaredError = New instat.ucrCheck()
-        Me.ucrChkRootMeanSquaredError = New instat.ucrCheck()
         Me.cmdHelp = New System.Windows.Forms.Button()
-        Me.ucrChkNormRootMeanSquaredError = New instat.ucrCheck()
-        Me.ucrChkMeanAbsoluteError = New instat.ucrCheck()
-        Me.ucrChkIndexOfAgreement = New instat.ucrCheck()
-        Me.ucrReceiverSecondVariable = New instat.ucrReceiverSingle()
-        Me.ucrSelectorSecondVariable = New instat.ucrSelectorByDataFrameAddRemove()
         Me.tbMore = New System.Windows.Forms.TabPage()
         Me.grpProportionsPercentiles = New System.Windows.Forms.GroupBox()
-        Me.ucrInputQuantile = New instat.ucrInputTextBox()
-        Me.ucrChkQuantile = New instat.ucrCheck()
-        Me.ucrInputCountValue = New instat.ucrInputTextBox()
-        Me.ucrInputComboCountTest = New instat.ucrInputComboBox()
-        Me.ucrChkProportion = New instat.ucrCheck()
-        Me.ucrChkCount = New instat.ucrCheck()
-        Me.ucrChkPercentage = New instat.ucrCheck()
-        Me.ucrInputPropValue = New instat.ucrInputTextBox()
-        Me.ucrInputComboPropTest = New instat.ucrInputComboBox()
-        Me.ucrInputPercentile = New instat.ucrInputTextBox()
-        Me.ucrChkPercentile = New instat.ucrCheck()
         Me.grpLocation = New System.Windows.Forms.GroupBox()
         Me.lblFractionTrimmed = New System.Windows.Forms.Label()
-        Me.ucrNudFraction = New instat.ucrNud()
-        Me.ucrChkTrimmedMean = New instat.ucrCheck()
         Me.grpScale = New System.Windows.Forms.GroupBox()
-        Me.ucrChkSn = New instat.ucrCheck()
-        Me.ucrChkQn = New instat.ucrCheck()
-        Me.ucrChkCoefficientOfVariation = New instat.ucrCheck()
-        Me.ucrChkMedianAbsoluteDeviation = New instat.ucrCheck()
         Me.grpSkewness = New System.Windows.Forms.GroupBox()
-        Me.ucrChkMc = New instat.ucrCheck()
-        Me.ucrChkSkewness = New instat.ucrCheck()
         Me.grpKurtosis = New System.Windows.Forms.GroupBox()
-        Me.ucrChkKurtosis = New instat.ucrCheck()
+        Me.cmdOptions = New System.Windows.Forms.Button()
         Me.tbsum = New System.Windows.Forms.TabPage()
         Me.grpDecilesQuintiles = New System.Windows.Forms.GroupBox()
+        Me.grpCommon = New System.Windows.Forms.GroupBox()
+        Me.grpQuartilesTerciles = New System.Windows.Forms.GroupBox()
+        Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox()
+        Me.grpNumeric = New System.Windows.Forms.GroupBox()
+        Me.tbSummaries = New System.Windows.Forms.TabControl()
+        Me.ttVerificationSummaries = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ucrButtonsSummaries = New instat.ucrButtonsSubdialogue()
         Me.ucrChkP60 = New instat.ucrCheck()
         Me.ucrChkP90 = New instat.ucrCheck()
         Me.ucrChkP70 = New instat.ucrCheck()
@@ -139,30 +78,94 @@ Partial Class sdgSummaries
         Me.ucrChkP30 = New instat.ucrCheck()
         Me.ucrChkP10 = New instat.ucrCheck()
         Me.ucrChkP20 = New instat.ucrCheck()
-        Me.grpCommon = New System.Windows.Forms.GroupBox()
         Me.ucrChkn_distinct = New instat.ucrCheck()
         Me.ucrChkNTotal = New instat.ucrCheck()
         Me.ucrChkMode = New instat.ucrCheck()
         Me.ucrChkNMissing = New instat.ucrCheck()
         Me.ucrChkNonMissing = New instat.ucrCheck()
-        Me.grpQuartilesTerciles = New System.Windows.Forms.GroupBox()
         Me.ucrChkP67 = New instat.ucrCheck()
         Me.ucrChkP33 = New instat.ucrCheck()
         Me.ucrChkP25 = New instat.ucrCheck()
         Me.ucrChkP75 = New instat.ucrCheck()
-        Me.grpNotOrderedFactor = New System.Windows.Forms.GroupBox()
         Me.ucrChkRange = New instat.ucrCheck()
         Me.ucrChkMaximum = New instat.ucrCheck()
         Me.ucrChkMinimum = New instat.ucrCheck()
-        Me.grpNumeric = New System.Windows.Forms.GroupBox()
         Me.ucrChkVariance = New instat.ucrCheck()
         Me.ucrChkMedian = New instat.ucrCheck()
         Me.ucrChkStdDev = New instat.ucrCheck()
         Me.ucrChkSum = New instat.ucrCheck()
         Me.ucrChkMean = New instat.ucrCheck()
-        Me.tbSummaries = New System.Windows.Forms.TabControl()
-        Me.ttVerificationSummaries = New System.Windows.Forms.ToolTip(Me.components)
-        Me.ucrButtonsSummaries = New instat.ucrButtonsSubdialogue()
+        Me.ucrInputQuantile = New instat.ucrInputTextBox()
+        Me.ucrChkQuantile = New instat.ucrCheck()
+        Me.ucrInputCountValue = New instat.ucrInputTextBox()
+        Me.ucrInputComboCountTest = New instat.ucrInputComboBox()
+        Me.ucrChkProportion = New instat.ucrCheck()
+        Me.ucrChkCount = New instat.ucrCheck()
+        Me.ucrChkPercentage = New instat.ucrCheck()
+        Me.ucrInputPropValue = New instat.ucrInputTextBox()
+        Me.ucrInputComboPropTest = New instat.ucrInputComboBox()
+        Me.ucrInputPercentile = New instat.ucrInputTextBox()
+        Me.ucrChkPercentile = New instat.ucrCheck()
+        Me.ucrNudFraction = New instat.ucrNud()
+        Me.ucrChkTrimmedMean = New instat.ucrCheck()
+        Me.ucrChkSn = New instat.ucrCheck()
+        Me.ucrChkQn = New instat.ucrCheck()
+        Me.ucrChkCoefficientOfVariation = New instat.ucrCheck()
+        Me.ucrChkMedianAbsoluteDeviation = New instat.ucrCheck()
+        Me.ucrChkMc = New instat.ucrCheck()
+        Me.ucrChkSkewness = New instat.ucrCheck()
+        Me.ucrChkProportionsPercentages = New instat.ucrCheck()
+        Me.ucrChkKurtosis = New instat.ucrCheck()
+        Me.ucrChkCovariance = New instat.ucrCheck()
+        Me.ucrChkCorrelations = New instat.ucrCheck()
+        Me.ucrInputJmia = New instat.ucrInputTextBox()
+        Me.ucrChkSelectAll = New instat.ucrCheck()
+        Me.ucrChkRelativeIndexOfAgreement = New instat.ucrCheck()
+        Me.ucrChkRatioOfStandardDeviation = New instat.ucrCheck()
+        Me.ucrChkCoefDetermination = New instat.ucrCheck()
+        Me.ucrChkRatioOfRootMeanSquaredError = New instat.ucrCheck()
+        Me.ucrChkRelativeNashSutcliffeEff = New instat.ucrCheck()
+        Me.ucrChkModifiedIndexOfAgreement = New instat.ucrCheck()
+        Me.ucrChkCoefPersistence = New instat.ucrCheck()
+        Me.ucrChkNashSutcliffeEfficiency = New instat.ucrCheck()
+        Me.ucrChkSumOfSquaredResiduals = New instat.ucrCheck()
+        Me.ucrChkKlingGuptaEfficiency = New instat.ucrCheck()
+        Me.ucrChkVolumetricEfficiency = New instat.ucrCheck()
+        Me.ucrChkPercentBias = New instat.ucrCheck()
+        Me.ucrChkModNashSutcliffeEff = New instat.ucrCheck()
+        Me.ucrChkMeanError = New instat.ucrCheck()
+        Me.ucrChkMeanSquaredError = New instat.ucrCheck()
+        Me.ucrChkRootMeanSquaredError = New instat.ucrCheck()
+        Me.ucrChkNormRootMeanSquaredError = New instat.ucrCheck()
+        Me.ucrChkMeanAbsoluteError = New instat.ucrCheck()
+        Me.ucrChkIndexOfAgreement = New instat.ucrCheck()
+        Me.ucrReceiverSecondVariable = New instat.ucrReceiverSingle()
+        Me.ucrSelectorSecondVariable = New instat.ucrSelectorByDataFrameAddRemove()
+        Me.ucrChkOrderBy = New instat.ucrCheck()
+        Me.ucrChkSetseed = New instat.ucrCheck()
+        Me.ucrNudSeed = New instat.ucrNud()
+        Me.ucrChkSample = New instat.ucrCheck()
+        Me.ucrInputN = New instat.ucrInputTextBox()
+        Me.ucrChkFirst = New instat.ucrCheck()
+        Me.ucrChkLast = New instat.ucrCheck()
+        Me.ucrChknth = New instat.ucrCheck()
+        Me.ucrSelectorOrderBy = New instat.ucrSelectorByDataFrameAddRemove()
+        Me.ucrReceiverOrderBy = New instat.ucrReceiverSingle()
+        Me.ucrChkStandardErrorOfMean = New instat.ucrCheck()
+        Me.ucrChkCircRange = New instat.ucrCheck()
+        Me.ucrChkAngVar = New instat.ucrCheck()
+        Me.ucrChkrho = New instat.ucrCheck()
+        Me.ucrChkAngDev = New instat.ucrCheck()
+        Me.ucrChkVar = New instat.ucrCheck()
+        Me.ucrChkSd = New instat.ucrCheck()
+        Me.ucrChkCircMedian = New instat.ucrCheck()
+        Me.ucrChkMin = New instat.ucrCheck()
+        Me.ucrChkMedianH = New instat.ucrCheck()
+        Me.ucrChkQ3 = New instat.ucrCheck()
+        Me.ucrChkQ1 = New instat.ucrCheck()
+        Me.ucrChkMax = New instat.ucrCheck()
+        Me.ucrChkCircMean = New instat.ucrCheck()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.tbCircular.SuspendLayout()
         Me.grpCircScale.SuspendLayout()
         Me.grpCircLocation.SuspendLayout()
@@ -185,17 +188,17 @@ Partial Class sdgSummaries
         Me.grpNotOrderedFactor.SuspendLayout()
         Me.grpNumeric.SuspendLayout()
         Me.tbSummaries.SuspendLayout()
+        Me.GroupBox1.SuspendLayout()
         Me.SuspendLayout()
         '
         'tbCircular
         '
         Me.tbCircular.Controls.Add(Me.grpCircScale)
         Me.tbCircular.Controls.Add(Me.grpCircLocation)
-        Me.tbCircular.Location = New System.Drawing.Point(4, 22)
-        Me.tbCircular.Margin = New System.Windows.Forms.Padding(2)
+        Me.tbCircular.Location = New System.Drawing.Point(4, 29)
         Me.tbCircular.Name = "tbCircular"
-        Me.tbCircular.Padding = New System.Windows.Forms.Padding(2)
-        Me.tbCircular.Size = New System.Drawing.Size(409, 383)
+        Me.tbCircular.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbCircular.Size = New System.Drawing.Size(618, 581)
         Me.tbCircular.TabIndex = 8
         Me.tbCircular.Text = "Circular"
         Me.tbCircular.UseVisualStyleBackColor = True
@@ -208,75 +211,13 @@ Partial Class sdgSummaries
         Me.grpCircScale.Controls.Add(Me.ucrChkAngDev)
         Me.grpCircScale.Controls.Add(Me.ucrChkVar)
         Me.grpCircScale.Controls.Add(Me.ucrChkSd)
-        Me.grpCircScale.Location = New System.Drawing.Point(4, 103)
-        Me.grpCircScale.Margin = New System.Windows.Forms.Padding(2)
+        Me.grpCircScale.Location = New System.Drawing.Point(6, 154)
         Me.grpCircScale.Name = "grpCircScale"
-        Me.grpCircScale.Padding = New System.Windows.Forms.Padding(2)
-        Me.grpCircScale.Size = New System.Drawing.Size(401, 81)
+        Me.grpCircScale.Size = New System.Drawing.Size(602, 122)
         Me.grpCircScale.TabIndex = 1
         Me.grpCircScale.TabStop = False
         Me.grpCircScale.Text = "Scale"
         '
-        'ucrChkCircRange
-        '
-        Me.ucrChkCircRange.AutoSize = True
-        Me.ucrChkCircRange.Checked = False
-        Me.ucrChkCircRange.Location = New System.Drawing.Point(21, 47)
-        Me.ucrChkCircRange.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkCircRange.Name = "ucrChkCircRange"
-        Me.ucrChkCircRange.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkCircRange.TabIndex = 1
-        '
-        'ucrChkAngVar
-        '
-        Me.ucrChkAngVar.AutoSize = True
-        Me.ucrChkAngVar.Checked = False
-        Me.ucrChkAngVar.Location = New System.Drawing.Point(213, 21)
-        Me.ucrChkAngVar.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkAngVar.Name = "ucrChkAngVar"
-        Me.ucrChkAngVar.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkAngVar.TabIndex = 4
-        '
-        'ucrChkrho
-        '
-        Me.ucrChkrho.AutoSize = True
-        Me.ucrChkrho.Checked = False
-        Me.ucrChkrho.Location = New System.Drawing.Point(124, 47)
-        Me.ucrChkrho.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkrho.Name = "ucrChkrho"
-        Me.ucrChkrho.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkrho.TabIndex = 3
-        '
-        'ucrChkAngDev
-        '
-        Me.ucrChkAngDev.AutoSize = True
-        Me.ucrChkAngDev.Checked = False
-        Me.ucrChkAngDev.Location = New System.Drawing.Point(213, 47)
-        Me.ucrChkAngDev.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkAngDev.Name = "ucrChkAngDev"
-        Me.ucrChkAngDev.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkAngDev.TabIndex = 5
-        '
-        'ucrChkVar
-        '
-        Me.ucrChkVar.AutoSize = True
-        Me.ucrChkVar.Checked = False
-        Me.ucrChkVar.Location = New System.Drawing.Point(124, 19)
-        Me.ucrChkVar.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkVar.Name = "ucrChkVar"
-        Me.ucrChkVar.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkVar.TabIndex = 2
-        '
-        'ucrChkSd
-        '
-        Me.ucrChkSd.AutoSize = True
-        Me.ucrChkSd.Checked = False
-        Me.ucrChkSd.Location = New System.Drawing.Point(21, 19)
-        Me.ucrChkSd.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkSd.Name = "ucrChkSd"
-        Me.ucrChkSd.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkSd.TabIndex = 0
-        '
         'grpCircLocation
         '
         Me.grpCircLocation.Controls.Add(Me.ucrChkCircMedian)
@@ -286,106 +227,25 @@ Partial Class sdgSummaries
         Me.grpCircLocation.Controls.Add(Me.ucrChkQ1)
         Me.grpCircLocation.Controls.Add(Me.ucrChkMax)
         Me.grpCircLocation.Controls.Add(Me.ucrChkCircMean)
-        Me.grpCircLocation.Location = New System.Drawing.Point(4, 9)
-        Me.grpCircLocation.Margin = New System.Windows.Forms.Padding(2)
+        Me.grpCircLocation.Location = New System.Drawing.Point(6, 14)
         Me.grpCircLocation.Name = "grpCircLocation"
-        Me.grpCircLocation.Padding = New System.Windows.Forms.Padding(2)
-        Me.grpCircLocation.Size = New System.Drawing.Size(401, 90)
+        Me.grpCircLocation.Size = New System.Drawing.Size(602, 135)
         Me.grpCircLocation.TabIndex = 0
         Me.grpCircLocation.TabStop = False
         Me.grpCircLocation.Text = "Location"
         '
-        'ucrChkCircMedian
-        '
-        Me.ucrChkCircMedian.AutoSize = True
-        Me.ucrChkCircMedian.Checked = False
-        Me.ucrChkCircMedian.Location = New System.Drawing.Point(124, 26)
-        Me.ucrChkCircMedian.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkCircMedian.Name = "ucrChkCircMedian"
-        Me.ucrChkCircMedian.Size = New System.Drawing.Size(81, 23)
-        Me.ucrChkCircMedian.TabIndex = 2
-        '
-        'ucrChkMin
-        '
-        Me.ucrChkMin.AutoSize = True
-        Me.ucrChkMin.Checked = False
-        Me.ucrChkMin.Location = New System.Drawing.Point(213, 26)
-        Me.ucrChkMin.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkMin.Name = "ucrChkMin"
-        Me.ucrChkMin.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkMin.TabIndex = 4
-        '
-        'ucrChkMedianH
-        '
-        Me.ucrChkMedianH.AutoSize = True
-        Me.ucrChkMedianH.Checked = False
-        Me.ucrChkMedianH.Location = New System.Drawing.Point(300, 26)
-        Me.ucrChkMedianH.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkMedianH.Name = "ucrChkMedianH"
-        Me.ucrChkMedianH.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkMedianH.TabIndex = 6
-        '
-        'ucrChkQ3
-        '
-        Me.ucrChkQ3.AutoSize = True
-        Me.ucrChkQ3.Checked = False
-        Me.ucrChkQ3.Location = New System.Drawing.Point(124, 54)
-        Me.ucrChkQ3.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkQ3.Name = "ucrChkQ3"
-        Me.ucrChkQ3.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkQ3.TabIndex = 3
-        '
-        'ucrChkQ1
-        '
-        Me.ucrChkQ1.AutoSize = True
-        Me.ucrChkQ1.Checked = False
-        Me.ucrChkQ1.Location = New System.Drawing.Point(21, 54)
-        Me.ucrChkQ1.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkQ1.Name = "ucrChkQ1"
-        Me.ucrChkQ1.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkQ1.TabIndex = 1
-        '
-        'ucrChkMax
-        '
-        Me.ucrChkMax.AutoSize = True
-        Me.ucrChkMax.Checked = False
-        Me.ucrChkMax.Location = New System.Drawing.Point(213, 54)
-        Me.ucrChkMax.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkMax.Name = "ucrChkMax"
-        Me.ucrChkMax.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkMax.TabIndex = 5
-        '
-        'ucrChkCircMean
-        '
-        Me.ucrChkCircMean.AutoSize = True
-        Me.ucrChkCircMean.Checked = False
-        Me.ucrChkCircMean.Location = New System.Drawing.Point(21, 26)
-        Me.ucrChkCircMean.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrChkCircMean.Name = "ucrChkCircMean"
-        Me.ucrChkCircMean.Size = New System.Drawing.Size(86, 23)
-        Me.ucrChkCircMean.TabIndex = 0
-        '
         'tbModel
         '
         Me.tbModel.Controls.Add(Me.ucrChkStandardErrorOfMean)
-        Me.tbModel.Location = New System.Drawing.Point(4, 22)
+        Me.tbModel.Location = New System.Drawing.Point(4, 29)
+        Me.tbModel.Margin = New System.Windows.Forms.Padding(4)
         Me.tbModel.Name = "tbModel"
-        Me.tbModel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbModel.Size = New System.Drawing.Size(409, 383)
+        Me.tbModel.Padding = New System.Windows.Forms.Padding(4)
+        Me.tbModel.Size = New System.Drawing.Size(618, 581)
         Me.tbModel.TabIndex = 6
         Me.tbModel.Text = "Model"
         Me.tbModel.UseVisualStyleBackColor = True
         '
-        'ucrChkStandardErrorOfMean
-        '
-        Me.ucrChkStandardErrorOfMean.AutoSize = True
-        Me.ucrChkStandardErrorOfMean.Checked = False
-        Me.ucrChkStandardErrorOfMean.Location = New System.Drawing.Point(16, 21)
-        Me.ucrChkStandardErrorOfMean.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkStandardErrorOfMean.Name = "ucrChkStandardErrorOfMean"
-        Me.ucrChkStandardErrorOfMean.Size = New System.Drawing.Size(295, 23)
-        Me.ucrChkStandardErrorOfMean.TabIndex = 1
-        '
         'tbPosition
         '
         Me.tbPosition.Controls.Add(Me.ucrChkOrderBy)
@@ -393,31 +253,23 @@ Partial Class sdgSummaries
         Me.tbPosition.Controls.Add(Me.grpPosition)
         Me.tbPosition.Controls.Add(Me.ucrSelectorOrderBy)
         Me.tbPosition.Controls.Add(Me.ucrReceiverOrderBy)
-        Me.tbPosition.Location = New System.Drawing.Point(4, 22)
+        Me.tbPosition.Location = New System.Drawing.Point(4, 29)
+        Me.tbPosition.Margin = New System.Windows.Forms.Padding(4)
         Me.tbPosition.Name = "tbPosition"
-        Me.tbPosition.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbPosition.Size = New System.Drawing.Size(409, 383)
+        Me.tbPosition.Padding = New System.Windows.Forms.Padding(4)
+        Me.tbPosition.Size = New System.Drawing.Size(618, 581)
         Me.tbPosition.TabIndex = 7
         Me.tbPosition.Text = "Position"
         Me.tbPosition.UseVisualStyleBackColor = True
         '
-        'ucrChkOrderBy
-        '
-        Me.ucrChkOrderBy.AutoSize = True
-        Me.ucrChkOrderBy.Checked = False
-        Me.ucrChkOrderBy.Location = New System.Drawing.Point(12, 101)
-        Me.ucrChkOrderBy.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkOrderBy.Name = "ucrChkOrderBy"
-        Me.ucrChkOrderBy.Size = New System.Drawing.Size(188, 23)
-        Me.ucrChkOrderBy.TabIndex = 1
-        '
-        'lblOrderBy
+        'lblOrderBy
         '
         Me.lblOrderBy.AutoSize = True
         Me.lblOrderBy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblOrderBy.Location = New System.Drawing.Point(229, 160)
+        Me.lblOrderBy.Location = New System.Drawing.Point(344, 240)
+        Me.lblOrderBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblOrderBy.Name = "lblOrderBy"
-        Me.lblOrderBy.Size = New System.Drawing.Size(51, 13)
+        Me.lblOrderBy.Size = New System.Drawing.Size(75, 20)
         Me.lblOrderBy.TabIndex = 3
         Me.lblOrderBy.Text = "Order By:"
         '
@@ -431,124 +283,26 @@ Partial Class sdgSummaries
         Me.grpPosition.Controls.Add(Me.ucrChkFirst)
         Me.grpPosition.Controls.Add(Me.ucrChkLast)
         Me.grpPosition.Controls.Add(Me.ucrChknth)
-        Me.grpPosition.Location = New System.Drawing.Point(6, 6)
+        Me.grpPosition.Location = New System.Drawing.Point(9, 9)
+        Me.grpPosition.Margin = New System.Windows.Forms.Padding(4)
         Me.grpPosition.Name = "grpPosition"
-        Me.grpPosition.Size = New System.Drawing.Size(397, 80)
+        Me.grpPosition.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpPosition.Size = New System.Drawing.Size(596, 120)
         Me.grpPosition.TabIndex = 0
         Me.grpPosition.TabStop = False
         Me.grpPosition.Text = "Position"
         '
-        'ucrChkSetseed
-        '
-        Me.ucrChkSetseed.AutoSize = True
-        Me.ucrChkSetseed.Checked = False
-        Me.ucrChkSetseed.Location = New System.Drawing.Point(166, 45)
-        Me.ucrChkSetseed.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkSetseed.Name = "ucrChkSetseed"
-        Me.ucrChkSetseed.Size = New System.Drawing.Size(101, 23)
-        Me.ucrChkSetseed.TabIndex = 8
-        '
-        'ucrNudSeed
-        '
-        Me.ucrNudSeed.AutoSize = True
-        Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
-        Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0})
-        Me.ucrNudSeed.Location = New System.Drawing.Point(273, 45)
-        Me.ucrNudSeed.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
-        Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
-        Me.ucrNudSeed.Name = "ucrNudSeed"
-        Me.ucrNudSeed.Size = New System.Drawing.Size(50, 20)
-        Me.ucrNudSeed.TabIndex = 7
-        Me.ucrNudSeed.Value = New Decimal(New Integer() {0, 0, 0, 0})
-        '
-        'ucrChkSample
-        '
-        Me.ucrChkSample.AutoSize = True
-        Me.ucrChkSample.Checked = False
-        Me.ucrChkSample.Location = New System.Drawing.Point(8, 45)
-        Me.ucrChkSample.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkSample.Name = "ucrChkSample"
-        Me.ucrChkSample.Size = New System.Drawing.Size(113, 23)
-        Me.ucrChkSample.TabIndex = 5
-        '
-        'ucrInputN
-        '
-        Me.ucrInputN.AddQuotesIfUnrecognised = True
-        Me.ucrInputN.AutoSize = True
-        Me.ucrInputN.IsMultiline = False
-        Me.ucrInputN.IsReadOnly = False
-        Me.ucrInputN.Location = New System.Drawing.Point(233, 19)
-        Me.ucrInputN.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
-        Me.ucrInputN.Name = "ucrInputN"
-        Me.ucrInputN.Size = New System.Drawing.Size(64, 20)
-        Me.ucrInputN.TabIndex = 3
-        '
         'lblInputN
         '
         Me.lblInputN.AutoSize = True
         Me.lblInputN.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblInputN.Location = New System.Drawing.Point(215, 22)
+        Me.lblInputN.Location = New System.Drawing.Point(322, 33)
+        Me.lblInputN.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblInputN.Name = "lblInputN"
-        Me.lblInputN.Size = New System.Drawing.Size(16, 13)
+        Me.lblInputN.Size = New System.Drawing.Size(22, 20)
         Me.lblInputN.TabIndex = 2
         Me.lblInputN.Text = "n:"
         '
-        'ucrChkFirst
-        '
-        Me.ucrChkFirst.AutoSize = True
-        Me.ucrChkFirst.Checked = False
-        Me.ucrChkFirst.Location = New System.Drawing.Point(8, 19)
-        Me.ucrChkFirst.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkFirst.Name = "ucrChkFirst"
-        Me.ucrChkFirst.Size = New System.Drawing.Size(101, 23)
-        Me.ucrChkFirst.TabIndex = 0
-        '
-        'ucrChkLast
-        '
-        Me.ucrChkLast.AutoSize = True
-        Me.ucrChkLast.Checked = False
-        Me.ucrChkLast.Location = New System.Drawing.Point(309, 19)
-        Me.ucrChkLast.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkLast.Name = "ucrChkLast"
-        Me.ucrChkLast.Size = New System.Drawing.Size(80, 23)
-        Me.ucrChkLast.TabIndex = 4
-        '
-        'ucrChknth
-        '
-        Me.ucrChknth.AutoSize = True
-        Me.ucrChknth.Checked = False
-        Me.ucrChknth.Location = New System.Drawing.Point(166, 21)
-        Me.ucrChknth.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChknth.Name = "ucrChknth"
-        Me.ucrChknth.Size = New System.Drawing.Size(59, 23)
-        Me.ucrChknth.TabIndex = 1
-        '
-        'ucrSelectorOrderBy
-        '
-        Me.ucrSelectorOrderBy.AutoSize = True
-        Me.ucrSelectorOrderBy.bDropUnusedFilterLevels = False
-        Me.ucrSelectorOrderBy.bShowHiddenColumns = False
-        Me.ucrSelectorOrderBy.bUseCurrentFilter = True
-        Me.ucrSelectorOrderBy.Location = New System.Drawing.Point(10, 132)
-        Me.ucrSelectorOrderBy.Margin = New System.Windows.Forms.Padding(0)
-        Me.ucrSelectorOrderBy.Name = "ucrSelectorOrderBy"
-        Me.ucrSelectorOrderBy.Size = New System.Drawing.Size(213, 183)
-        Me.ucrSelectorOrderBy.TabIndex = 2
-        '
-        'ucrReceiverOrderBy
-        '
-        Me.ucrReceiverOrderBy.AutoSize = True
-        Me.ucrReceiverOrderBy.frmParent = Nothing
-        Me.ucrReceiverOrderBy.Location = New System.Drawing.Point(231, 176)
-        Me.ucrReceiverOrderBy.Margin = New System.Windows.Forms.Padding(0)
-        Me.ucrReceiverOrderBy.Name = "ucrReceiverOrderBy"
-        Me.ucrReceiverOrderBy.Selector = Nothing
-        Me.ucrReceiverOrderBy.Size = New System.Drawing.Size(120, 20)
-        Me.ucrReceiverOrderBy.strNcFilePath = ""
-        Me.ucrReceiverOrderBy.TabIndex = 4
-        Me.ucrReceiverOrderBy.ucrSelector = Nothing
-        '
         'tbTwoVariables
         '
         Me.tbTwoVariables.Controls.Add(Me.lblSecondVariable)
@@ -556,10 +310,11 @@ Partial Class sdgSummaries
         Me.tbTwoVariables.Controls.Add(Me.grpHyroGOF)
         Me.tbTwoVariables.Controls.Add(Me.ucrReceiverSecondVariable)
         Me.tbTwoVariables.Controls.Add(Me.ucrSelectorSecondVariable)
-        Me.tbTwoVariables.Location = New System.Drawing.Point(4, 22)
+        Me.tbTwoVariables.Location = New System.Drawing.Point(4, 29)
+        Me.tbTwoVariables.Margin = New System.Windows.Forms.Padding(4)
         Me.tbTwoVariables.Name = "tbTwoVariables"
-        Me.tbTwoVariables.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbTwoVariables.Size = New System.Drawing.Size(409, 383)
+        Me.tbTwoVariables.Padding = New System.Windows.Forms.Padding(4)
+        Me.tbTwoVariables.Size = New System.Drawing.Size(618, 581)
         Me.tbTwoVariables.TabIndex = 5
         Me.tbTwoVariables.Text = " Two-Variables"
         Me.tbTwoVariables.UseVisualStyleBackColor = True
@@ -568,9 +323,10 @@ Partial Class sdgSummaries
         '
         Me.lblSecondVariable.AutoSize = True
         Me.lblSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblSecondVariable.Location = New System.Drawing.Point(263, 207)
+        Me.lblSecondVariable.Location = New System.Drawing.Point(394, 310)
+        Me.lblSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblSecondVariable.Name = "lblSecondVariable"
-        Me.lblSecondVariable.Size = New System.Drawing.Size(88, 13)
+        Me.lblSecondVariable.Size = New System.Drawing.Size(130, 20)
         Me.lblSecondVariable.TabIndex = 3
         Me.lblSecondVariable.Text = "Second Variable:"
         '
@@ -578,33 +334,15 @@ Partial Class sdgSummaries
         '
         Me.grpRelationships.Controls.Add(Me.ucrChkCovariance)
         Me.grpRelationships.Controls.Add(Me.ucrChkCorrelations)
-        Me.grpRelationships.Location = New System.Drawing.Point(4, 6)
+        Me.grpRelationships.Location = New System.Drawing.Point(6, 9)
+        Me.grpRelationships.Margin = New System.Windows.Forms.Padding(4)
         Me.grpRelationships.Name = "grpRelationships"
-        Me.grpRelationships.Size = New System.Drawing.Size(399, 38)
+        Me.grpRelationships.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpRelationships.Size = New System.Drawing.Size(598, 57)
         Me.grpRelationships.TabIndex = 0
         Me.grpRelationships.TabStop = False
         Me.grpRelationships.Text = "Relationships"
         '
-        'ucrChkCovariance
-        '
-        Me.ucrChkCovariance.AutoSize = True
-        Me.ucrChkCovariance.Checked = False
-        Me.ucrChkCovariance.Location = New System.Drawing.Point(166, 10)
-        Me.ucrChkCovariance.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkCovariance.Name = "ucrChkCovariance"
-        Me.ucrChkCovariance.Size = New System.Drawing.Size(167, 23)
-        Me.ucrChkCovariance.TabIndex = 1
-        '
-        'ucrChkCorrelations
-        '
-        Me.ucrChkCorrelations.AutoSize = True
-        Me.ucrChkCorrelations.Checked = False
-        Me.ucrChkCorrelations.Location = New System.Drawing.Point(15, 13)
-        Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkCorrelations.Name = "ucrChkCorrelations"
-        Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23)
-        Me.ucrChkCorrelations.TabIndex = 0
-        '
         'grpHyroGOF
         '
         Me.grpHyroGOF.Controls.Add(Me.lblJmia)
@@ -630,9 +368,11 @@ Partial Class sdgSummaries
         Me.grpHyroGOF.Controls.Add(Me.ucrChkNormRootMeanSquaredError)
         Me.grpHyroGOF.Controls.Add(Me.ucrChkMeanAbsoluteError)
         Me.grpHyroGOF.Controls.Add(Me.ucrChkIndexOfAgreement)
-        Me.grpHyroGOF.Location = New System.Drawing.Point(6, 45)
+        Me.grpHyroGOF.Location = New System.Drawing.Point(9, 68)
+        Me.grpHyroGOF.Margin = New System.Windows.Forms.Padding(4)
         Me.grpHyroGOF.Name = "grpHyroGOF"
-        Me.grpHyroGOF.Size = New System.Drawing.Size(399, 145)
+        Me.grpHyroGOF.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpHyroGOF.Size = New System.Drawing.Size(598, 218)
         Me.grpHyroGOF.TabIndex = 1
         Me.grpHyroGOF.TabStop = False
         Me.grpHyroGOF.Text = "HydroGOF"
@@ -641,292 +381,514 @@ Partial Class sdgSummaries
         '
         Me.lblJmia.AutoSize = True
         Me.lblJmia.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblJmia.Location = New System.Drawing.Point(284, 125)
+        Me.lblJmia.Location = New System.Drawing.Point(426, 188)
+        Me.lblJmia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.lblJmia.Name = "lblJmia"
-        Me.lblJmia.Size = New System.Drawing.Size(12, 13)
+        Me.lblJmia.Size = New System.Drawing.Size(16, 20)
         Me.lblJmia.TabIndex = 20
         Me.lblJmia.Text = "j:"
         '
-        'ucrInputJmia
-        '
-        Me.ucrInputJmia.AddQuotesIfUnrecognised = True
-        Me.ucrInputJmia.AutoSize = True
-        Me.ucrInputJmia.IsMultiline = False
-        Me.ucrInputJmia.IsReadOnly = False
-        Me.ucrInputJmia.Location = New System.Drawing.Point(299, 122)
-        Me.ucrInputJmia.Name = "ucrInputJmia"
-        Me.ucrInputJmia.Size = New System.Drawing.Size(32, 21)
-        Me.ucrInputJmia.TabIndex = 21
-        '
-        'ucrChkSelectAll
-        '
-        Me.ucrChkSelectAll.AutoSize = True
-        Me.ucrChkSelectAll.Checked = False
-        Me.ucrChkSelectAll.Location = New System.Drawing.Point(9, 15)
-        Me.ucrChkSelectAll.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkSelectAll.Name = "ucrChkSelectAll"
-        Me.ucrChkSelectAll.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkSelectAll.TabIndex = 0
+        'cmdHelp
         '
-        'ucrChkRelativeIndexOfAgreement
+        Me.cmdHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.cmdHelp.Location = New System.Drawing.Point(496, 180)
+        Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4)
+        Me.cmdHelp.Name = "cmdHelp"
+        Me.cmdHelp.Size = New System.Drawing.Size(102, 34)
+        Me.cmdHelp.TabIndex = 22
+        Me.cmdHelp.Text = "Help"
+        Me.cmdHelp.UseVisualStyleBackColor = True
         '
-        Me.ucrChkRelativeIndexOfAgreement.AutoSize = True
-        Me.ucrChkRelativeIndexOfAgreement.Checked = False
-        Me.ucrChkRelativeIndexOfAgreement.Location = New System.Drawing.Point(204, 75)
-        Me.ucrChkRelativeIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRelativeIndexOfAgreement.Name = "ucrChkRelativeIndexOfAgreement"
-        Me.ucrChkRelativeIndexOfAgreement.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkRelativeIndexOfAgreement.TabIndex = 13
+        'tbMore
         '
-        'ucrChkRatioOfStandardDeviation
+        Me.tbMore.Controls.Add(Me.GroupBox1)
+        Me.tbMore.Controls.Add(Me.grpProportionsPercentiles)
+        Me.tbMore.Controls.Add(Me.grpLocation)
+        Me.tbMore.Controls.Add(Me.grpScale)
+        Me.tbMore.Controls.Add(Me.grpSkewness)
+        Me.tbMore.Controls.Add(Me.grpKurtosis)
+        Me.tbMore.Location = New System.Drawing.Point(4, 29)
+        Me.tbMore.Margin = New System.Windows.Forms.Padding(4)
+        Me.tbMore.Name = "tbMore"
+        Me.tbMore.Padding = New System.Windows.Forms.Padding(4)
+        Me.tbMore.Size = New System.Drawing.Size(618, 601)
+        Me.tbMore.TabIndex = 1
+        Me.tbMore.Text = "More"
+        Me.tbMore.UseVisualStyleBackColor = True
         '
-        Me.ucrChkRatioOfStandardDeviation.AutoSize = True
-        Me.ucrChkRatioOfStandardDeviation.Checked = False
-        Me.ucrChkRatioOfStandardDeviation.Location = New System.Drawing.Point(94, 54)
-        Me.ucrChkRatioOfStandardDeviation.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRatioOfStandardDeviation.Name = "ucrChkRatioOfStandardDeviation"
-        Me.ucrChkRatioOfStandardDeviation.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkRatioOfStandardDeviation.TabIndex = 7
+        'grpProportionsPercentiles
         '
-        'ucrChkCoefDetermination
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputQuantile)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkQuantile)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputCountValue)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboCountTest)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkProportion)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkCount)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentage)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPropValue)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboPropTest)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPercentile)
+        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentile)
+        Me.grpProportionsPercentiles.Location = New System.Drawing.Point(15, 9)
+        Me.grpProportionsPercentiles.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpProportionsPercentiles.Name = "grpProportionsPercentiles"
+        Me.grpProportionsPercentiles.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpProportionsPercentiles.Size = New System.Drawing.Size(590, 183)
+        Me.grpProportionsPercentiles.TabIndex = 0
+        Me.grpProportionsPercentiles.TabStop = False
+        Me.grpProportionsPercentiles.Text = "Proportions/Percentiles/Count"
         '
-        Me.ucrChkCoefDetermination.AutoSize = True
-        Me.ucrChkCoefDetermination.Checked = False
-        Me.ucrChkCoefDetermination.Location = New System.Drawing.Point(204, 116)
-        Me.ucrChkCoefDetermination.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkCoefDetermination.Name = "ucrChkCoefDetermination"
-        Me.ucrChkCoefDetermination.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkCoefDetermination.TabIndex = 15
+        'grpLocation
         '
-        'ucrChkRatioOfRootMeanSquaredError
+        Me.grpLocation.Controls.Add(Me.lblFractionTrimmed)
+        Me.grpLocation.Controls.Add(Me.ucrNudFraction)
+        Me.grpLocation.Controls.Add(Me.ucrChkTrimmedMean)
+        Me.grpLocation.Location = New System.Drawing.Point(15, 197)
+        Me.grpLocation.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpLocation.Name = "grpLocation"
+        Me.grpLocation.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpLocation.Size = New System.Drawing.Size(590, 78)
+        Me.grpLocation.TabIndex = 0
+        Me.grpLocation.TabStop = False
+        Me.grpLocation.Text = "Location"
         '
-        Me.ucrChkRatioOfRootMeanSquaredError.AutoSize = True
-        Me.ucrChkRatioOfRootMeanSquaredError.Checked = False
-        Me.ucrChkRatioOfRootMeanSquaredError.Location = New System.Drawing.Point(94, 34)
-        Me.ucrChkRatioOfRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRatioOfRootMeanSquaredError.Name = "ucrChkRatioOfRootMeanSquaredError"
-        Me.ucrChkRatioOfRootMeanSquaredError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkRatioOfRootMeanSquaredError.TabIndex = 6
+        'lblFractionTrimmed
         '
-        'ucrChkRelativeNashSutcliffeEff
+        Me.lblFractionTrimmed.AutoSize = True
+        Me.lblFractionTrimmed.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.lblFractionTrimmed.Location = New System.Drawing.Point(312, 32)
+        Me.lblFractionTrimmed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblFractionTrimmed.Name = "lblFractionTrimmed"
+        Me.lblFractionTrimmed.Size = New System.Drawing.Size(136, 20)
+        Me.lblFractionTrimmed.TabIndex = 1
+        Me.lblFractionTrimmed.Text = "Fraction Trimmed:"
         '
-        Me.ucrChkRelativeNashSutcliffeEff.AutoSize = True
-        Me.ucrChkRelativeNashSutcliffeEff.Checked = False
-        Me.ucrChkRelativeNashSutcliffeEff.Location = New System.Drawing.Point(94, 115)
-        Me.ucrChkRelativeNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRelativeNashSutcliffeEff.Name = "ucrChkRelativeNashSutcliffeEff"
-        Me.ucrChkRelativeNashSutcliffeEff.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkRelativeNashSutcliffeEff.TabIndex = 10
+        'grpScale
         '
-        'ucrChkModifiedIndexOfAgreement
+        Me.grpScale.Controls.Add(Me.ucrChkSn)
+        Me.grpScale.Controls.Add(Me.ucrChkQn)
+        Me.grpScale.Controls.Add(Me.ucrChkCoefficientOfVariation)
+        Me.grpScale.Controls.Add(Me.ucrChkMedianAbsoluteDeviation)
+        Me.grpScale.Location = New System.Drawing.Point(15, 279)
+        Me.grpScale.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpScale.Name = "grpScale"
+        Me.grpScale.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpScale.Size = New System.Drawing.Size(590, 111)
+        Me.grpScale.TabIndex = 1
+        Me.grpScale.TabStop = False
+        Me.grpScale.Text = "Scale"
         '
-        Me.ucrChkModifiedIndexOfAgreement.AutoSize = True
-        Me.ucrChkModifiedIndexOfAgreement.Checked = False
-        Me.ucrChkModifiedIndexOfAgreement.Location = New System.Drawing.Point(204, 36)
-        Me.ucrChkModifiedIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkModifiedIndexOfAgreement.Name = "ucrChkModifiedIndexOfAgreement"
-        Me.ucrChkModifiedIndexOfAgreement.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkModifiedIndexOfAgreement.TabIndex = 11
+        'grpSkewness
         '
-        'ucrChkCoefPersistence
+        Me.grpSkewness.Controls.Add(Me.ucrChkMc)
+        Me.grpSkewness.Controls.Add(Me.ucrChkSkewness)
+        Me.grpSkewness.Location = New System.Drawing.Point(15, 395)
+        Me.grpSkewness.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpSkewness.Name = "grpSkewness"
+        Me.grpSkewness.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpSkewness.Size = New System.Drawing.Size(590, 74)
+        Me.grpSkewness.TabIndex = 2
+        Me.grpSkewness.TabStop = False
+        Me.grpSkewness.Text = "Skewness"
         '
-        Me.ucrChkCoefPersistence.AutoSize = True
-        Me.ucrChkCoefPersistence.Checked = False
-        Me.ucrChkCoefPersistence.Location = New System.Drawing.Point(204, 95)
-        Me.ucrChkCoefPersistence.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkCoefPersistence.Name = "ucrChkCoefPersistence"
-        Me.ucrChkCoefPersistence.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkCoefPersistence.TabIndex = 14
+        'grpKurtosis
         '
-        'ucrChkNashSutcliffeEfficiency
+        Me.grpKurtosis.Controls.Add(Me.ucrChkKurtosis)
+        Me.grpKurtosis.Location = New System.Drawing.Point(15, 467)
+        Me.grpKurtosis.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpKurtosis.Name = "grpKurtosis"
+        Me.grpKurtosis.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpKurtosis.Size = New System.Drawing.Size(590, 62)
+        Me.grpKurtosis.TabIndex = 3
+        Me.grpKurtosis.TabStop = False
+        Me.grpKurtosis.Text = "Kurtosis"
         '
-        Me.ucrChkNashSutcliffeEfficiency.AutoSize = True
-        Me.ucrChkNashSutcliffeEfficiency.Checked = False
-        Me.ucrChkNashSutcliffeEfficiency.Location = New System.Drawing.Point(94, 75)
-        Me.ucrChkNashSutcliffeEfficiency.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkNashSutcliffeEfficiency.Name = "ucrChkNashSutcliffeEfficiency"
-        Me.ucrChkNashSutcliffeEfficiency.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkNashSutcliffeEfficiency.TabIndex = 8
+        'cmdOptions
         '
-        'ucrChkSumOfSquaredResiduals
+        Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.cmdOptions.Location = New System.Drawing.Point(471, 20)
+        Me.cmdOptions.Margin = New System.Windows.Forms.Padding(4)
+        Me.cmdOptions.Name = "cmdOptions"
+        Me.cmdOptions.Size = New System.Drawing.Size(111, 34)
+        Me.cmdOptions.TabIndex = 10
+        Me.cmdOptions.Tag = "Options"
+        Me.cmdOptions.Text = "Options"
+        Me.cmdOptions.UseVisualStyleBackColor = True
         '
-        Me.ucrChkSumOfSquaredResiduals.AutoSize = True
-        Me.ucrChkSumOfSquaredResiduals.Checked = False
-        Me.ucrChkSumOfSquaredResiduals.Location = New System.Drawing.Point(306, 100)
-        Me.ucrChkSumOfSquaredResiduals.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkSumOfSquaredResiduals.Name = "ucrChkSumOfSquaredResiduals"
-        Me.ucrChkSumOfSquaredResiduals.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkSumOfSquaredResiduals.TabIndex = 19
+        'tbsum
         '
-        'ucrChkKlingGuptaEfficiency
+        Me.tbsum.Controls.Add(Me.grpDecilesQuintiles)
+        Me.tbsum.Controls.Add(Me.grpCommon)
+        Me.tbsum.Controls.Add(Me.grpQuartilesTerciles)
+        Me.tbsum.Controls.Add(Me.grpNotOrderedFactor)
+        Me.tbsum.Controls.Add(Me.grpNumeric)
+        Me.tbsum.Location = New System.Drawing.Point(4, 29)
+        Me.tbsum.Margin = New System.Windows.Forms.Padding(4)
+        Me.tbsum.Name = "tbsum"
+        Me.tbsum.Padding = New System.Windows.Forms.Padding(4)
+        Me.tbsum.Size = New System.Drawing.Size(618, 581)
+        Me.tbsum.TabIndex = 0
+        Me.tbsum.Text = "Summaries"
+        Me.tbsum.UseVisualStyleBackColor = True
         '
-        Me.ucrChkKlingGuptaEfficiency.AutoSize = True
-        Me.ucrChkKlingGuptaEfficiency.Checked = False
-        Me.ucrChkKlingGuptaEfficiency.Location = New System.Drawing.Point(306, 38)
-        Me.ucrChkKlingGuptaEfficiency.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkKlingGuptaEfficiency.Name = "ucrChkKlingGuptaEfficiency"
-        Me.ucrChkKlingGuptaEfficiency.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkKlingGuptaEfficiency.TabIndex = 16
+        'grpDecilesQuintiles
         '
-        'ucrChkVolumetricEfficiency
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP60)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP90)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP70)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP80)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP40)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP30)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP10)
+        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP20)
+        Me.grpDecilesQuintiles.Location = New System.Drawing.Point(15, 434)
+        Me.grpDecilesQuintiles.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpDecilesQuintiles.Name = "grpDecilesQuintiles"
+        Me.grpDecilesQuintiles.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpDecilesQuintiles.Size = New System.Drawing.Size(590, 130)
+        Me.grpDecilesQuintiles.TabIndex = 4
+        Me.grpDecilesQuintiles.TabStop = False
+        Me.grpDecilesQuintiles.Tag = ""
+        Me.grpDecilesQuintiles.Text = "Deciles && Quintiles"
         '
-        Me.ucrChkVolumetricEfficiency.AutoSize = True
-        Me.ucrChkVolumetricEfficiency.Checked = False
-        Me.ucrChkVolumetricEfficiency.Location = New System.Drawing.Point(306, 58)
-        Me.ucrChkVolumetricEfficiency.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkVolumetricEfficiency.Name = "ucrChkVolumetricEfficiency"
-        Me.ucrChkVolumetricEfficiency.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkVolumetricEfficiency.TabIndex = 17
+        'grpCommon
         '
-        'ucrChkPercentBias
+        Me.grpCommon.Controls.Add(Me.ucrChkn_distinct)
+        Me.grpCommon.Controls.Add(Me.ucrChkNTotal)
+        Me.grpCommon.Controls.Add(Me.ucrChkMode)
+        Me.grpCommon.Controls.Add(Me.ucrChkNMissing)
+        Me.grpCommon.Controls.Add(Me.ucrChkNonMissing)
+        Me.grpCommon.Location = New System.Drawing.Point(15, 9)
+        Me.grpCommon.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpCommon.Name = "grpCommon"
+        Me.grpCommon.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpCommon.Size = New System.Drawing.Size(590, 120)
+        Me.grpCommon.TabIndex = 0
+        Me.grpCommon.TabStop = False
+        Me.grpCommon.Tag = "Common"
+        Me.grpCommon.Text = "Common"
         '
-        Me.ucrChkPercentBias.AutoSize = True
-        Me.ucrChkPercentBias.Checked = False
-        Me.ucrChkPercentBias.Location = New System.Drawing.Point(8, 116)
-        Me.ucrChkPercentBias.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkPercentBias.Name = "ucrChkPercentBias"
-        Me.ucrChkPercentBias.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkPercentBias.TabIndex = 5
+        'grpQuartilesTerciles
         '
-        'ucrChkModNashSutcliffeEff
+        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP67)
+        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP33)
+        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP25)
+        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP75)
+        Me.grpQuartilesTerciles.Location = New System.Drawing.Point(15, 345)
+        Me.grpQuartilesTerciles.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpQuartilesTerciles.Name = "grpQuartilesTerciles"
+        Me.grpQuartilesTerciles.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpQuartilesTerciles.Size = New System.Drawing.Size(590, 84)
+        Me.grpQuartilesTerciles.TabIndex = 3
+        Me.grpQuartilesTerciles.TabStop = False
+        Me.grpQuartilesTerciles.Tag = "Quartiles"
+        Me.grpQuartilesTerciles.Text = "Quartiles && Terciles"
         '
-        Me.ucrChkModNashSutcliffeEff.AutoSize = True
-        Me.ucrChkModNashSutcliffeEff.Checked = False
-        Me.ucrChkModNashSutcliffeEff.Location = New System.Drawing.Point(94, 95)
-        Me.ucrChkModNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkModNashSutcliffeEff.Name = "ucrChkModNashSutcliffeEff"
-        Me.ucrChkModNashSutcliffeEff.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkModNashSutcliffeEff.TabIndex = 9
+        'grpNotOrderedFactor
         '
-        'ucrChkMeanError
+        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkRange)
+        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMaximum)
+        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMinimum)
+        Me.grpNotOrderedFactor.Location = New System.Drawing.Point(15, 138)
+        Me.grpNotOrderedFactor.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor"
+        Me.grpNotOrderedFactor.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpNotOrderedFactor.Size = New System.Drawing.Size(590, 76)
+        Me.grpNotOrderedFactor.TabIndex = 1
+        Me.grpNotOrderedFactor.TabStop = False
+        Me.grpNotOrderedFactor.Tag = "All_but_unordered_Factor"
+        Me.grpNotOrderedFactor.Text = "All but (unordered) Factor"
         '
-        Me.ucrChkMeanError.AutoSize = True
-        Me.ucrChkMeanError.Checked = False
-        Me.ucrChkMeanError.Location = New System.Drawing.Point(8, 34)
-        Me.ucrChkMeanError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMeanError.Name = "ucrChkMeanError"
-        Me.ucrChkMeanError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkMeanError.TabIndex = 1
+        'grpNumeric
         '
-        'ucrChkMeanSquaredError
+        Me.grpNumeric.Controls.Add(Me.ucrChkVariance)
+        Me.grpNumeric.Controls.Add(Me.ucrChkMedian)
+        Me.grpNumeric.Controls.Add(Me.ucrChkStdDev)
+        Me.grpNumeric.Controls.Add(Me.ucrChkSum)
+        Me.grpNumeric.Controls.Add(Me.ucrChkMean)
+        Me.grpNumeric.Location = New System.Drawing.Point(15, 224)
+        Me.grpNumeric.Margin = New System.Windows.Forms.Padding(4)
+        Me.grpNumeric.Name = "grpNumeric"
+        Me.grpNumeric.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpNumeric.Size = New System.Drawing.Size(590, 117)
+        Me.grpNumeric.TabIndex = 2
+        Me.grpNumeric.TabStop = False
+        Me.grpNumeric.Tag = "Numeric"
+        Me.grpNumeric.Text = "Numeric"
         '
-        Me.ucrChkMeanSquaredError.AutoSize = True
-        Me.ucrChkMeanSquaredError.Checked = False
-        Me.ucrChkMeanSquaredError.Location = New System.Drawing.Point(306, 79)
-        Me.ucrChkMeanSquaredError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMeanSquaredError.Name = "ucrChkMeanSquaredError"
-        Me.ucrChkMeanSquaredError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkMeanSquaredError.TabIndex = 18
+        'tbSummaries
         '
-        'ucrChkRootMeanSquaredError
+        Me.tbSummaries.Controls.Add(Me.tbsum)
+        Me.tbSummaries.Controls.Add(Me.tbMore)
+        Me.tbSummaries.Controls.Add(Me.tbTwoVariables)
+        Me.tbSummaries.Controls.Add(Me.tbPosition)
+        Me.tbSummaries.Controls.Add(Me.tbModel)
+        Me.tbSummaries.Controls.Add(Me.tbCircular)
+        Me.tbSummaries.Location = New System.Drawing.Point(9, 10)
+        Me.tbSummaries.Margin = New System.Windows.Forms.Padding(4)
+        Me.tbSummaries.Name = "tbSummaries"
+        Me.tbSummaries.SelectedIndex = 0
+        Me.tbSummaries.Size = New System.Drawing.Size(626, 634)
+        Me.tbSummaries.TabIndex = 0
         '
-        Me.ucrChkRootMeanSquaredError.AutoSize = True
-        Me.ucrChkRootMeanSquaredError.Checked = False
-        Me.ucrChkRootMeanSquaredError.Location = New System.Drawing.Point(8, 74)
-        Me.ucrChkRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRootMeanSquaredError.Name = "ucrChkRootMeanSquaredError"
-        Me.ucrChkRootMeanSquaredError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkRootMeanSquaredError.TabIndex = 3
+        'ucrButtonsSummaries
         '
-        'cmdHelp
+        Me.ucrButtonsSummaries.AutoSize = True
+        Me.ucrButtonsSummaries.Location = New System.Drawing.Point(153, 645)
+        Me.ucrButtonsSummaries.Margin = New System.Windows.Forms.Padding(6)
+        Me.ucrButtonsSummaries.Name = "ucrButtonsSummaries"
+        Me.ucrButtonsSummaries.Size = New System.Drawing.Size(336, 46)
+        Me.ucrButtonsSummaries.TabIndex = 1
         '
-        Me.cmdHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.cmdHelp.Location = New System.Drawing.Point(331, 120)
-        Me.cmdHelp.Name = "cmdHelp"
-        Me.cmdHelp.Size = New System.Drawing.Size(68, 23)
-        Me.cmdHelp.TabIndex = 22
-        Me.cmdHelp.Text = "Help"
-        Me.cmdHelp.UseVisualStyleBackColor = True
+        'ucrChkP60
         '
-        'ucrChkNormRootMeanSquaredError
+        Me.ucrChkP60.AutoSize = True
+        Me.ucrChkP60.Checked = False
+        Me.ucrChkP60.Location = New System.Drawing.Point(10, 76)
+        Me.ucrChkP60.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP60.Name = "ucrChkP60"
+        Me.ucrChkP60.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP60.TabIndex = 7
         '
-        Me.ucrChkNormRootMeanSquaredError.AutoSize = True
-        Me.ucrChkNormRootMeanSquaredError.Checked = False
-        Me.ucrChkNormRootMeanSquaredError.Location = New System.Drawing.Point(8, 95)
-        Me.ucrChkNormRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkNormRootMeanSquaredError.Name = "ucrChkNormRootMeanSquaredError"
-        Me.ucrChkNormRootMeanSquaredError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkNormRootMeanSquaredError.TabIndex = 4
+        'ucrChkP90
         '
-        'ucrChkMeanAbsoluteError
+        Me.ucrChkP90.AutoSize = True
+        Me.ucrChkP90.Checked = False
+        Me.ucrChkP90.Location = New System.Drawing.Point(438, 76)
+        Me.ucrChkP90.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP90.Name = "ucrChkP90"
+        Me.ucrChkP90.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP90.TabIndex = 6
         '
-        Me.ucrChkMeanAbsoluteError.AutoSize = True
-        Me.ucrChkMeanAbsoluteError.Checked = False
-        Me.ucrChkMeanAbsoluteError.Location = New System.Drawing.Point(8, 54)
-        Me.ucrChkMeanAbsoluteError.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMeanAbsoluteError.Name = "ucrChkMeanAbsoluteError"
-        Me.ucrChkMeanAbsoluteError.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkMeanAbsoluteError.TabIndex = 2
+        'ucrChkP70
         '
-        'ucrChkIndexOfAgreement
+        Me.ucrChkP70.AutoSize = True
+        Me.ucrChkP70.Checked = False
+        Me.ucrChkP70.Location = New System.Drawing.Point(144, 76)
+        Me.ucrChkP70.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP70.Name = "ucrChkP70"
+        Me.ucrChkP70.Size = New System.Drawing.Size(99, 51)
+        Me.ucrChkP70.TabIndex = 5
         '
-        Me.ucrChkIndexOfAgreement.AutoSize = True
-        Me.ucrChkIndexOfAgreement.Checked = False
-        Me.ucrChkIndexOfAgreement.Location = New System.Drawing.Point(204, 57)
-        Me.ucrChkIndexOfAgreement.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkIndexOfAgreement.Name = "ucrChkIndexOfAgreement"
-        Me.ucrChkIndexOfAgreement.Size = New System.Drawing.Size(87, 23)
-        Me.ucrChkIndexOfAgreement.TabIndex = 12
+        'ucrChkP80
         '
-        'ucrReceiverSecondVariable
+        Me.ucrChkP80.AutoSize = True
+        Me.ucrChkP80.Checked = False
+        Me.ucrChkP80.Location = New System.Drawing.Point(252, 76)
+        Me.ucrChkP80.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP80.Name = "ucrChkP80"
+        Me.ucrChkP80.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP80.TabIndex = 4
         '
-        Me.ucrReceiverSecondVariable.AutoSize = True
-        Me.ucrReceiverSecondVariable.frmParent = Nothing
-        Me.ucrReceiverSecondVariable.Location = New System.Drawing.Point(266, 223)
-        Me.ucrReceiverSecondVariable.Margin = New System.Windows.Forms.Padding(0)
-        Me.ucrReceiverSecondVariable.Name = "ucrReceiverSecondVariable"
-        Me.ucrReceiverSecondVariable.Selector = Nothing
-        Me.ucrReceiverSecondVariable.Size = New System.Drawing.Size(120, 20)
-        Me.ucrReceiverSecondVariable.strNcFilePath = ""
-        Me.ucrReceiverSecondVariable.TabIndex = 4
-        Me.ucrReceiverSecondVariable.ucrSelector = Nothing
+        'ucrChkP40
         '
-        'ucrSelectorSecondVariable
+        Me.ucrChkP40.AutoSize = True
+        Me.ucrChkP40.Checked = False
+        Me.ucrChkP40.Location = New System.Drawing.Point(438, 32)
+        Me.ucrChkP40.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP40.Name = "ucrChkP40"
+        Me.ucrChkP40.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP40.TabIndex = 3
         '
-        Me.ucrSelectorSecondVariable.AutoSize = True
-        Me.ucrSelectorSecondVariable.bDropUnusedFilterLevels = False
-        Me.ucrSelectorSecondVariable.bShowHiddenColumns = False
-        Me.ucrSelectorSecondVariable.bUseCurrentFilter = True
-        Me.ucrSelectorSecondVariable.Location = New System.Drawing.Point(8, 193)
-        Me.ucrSelectorSecondVariable.Margin = New System.Windows.Forms.Padding(0)
-        Me.ucrSelectorSecondVariable.Name = "ucrSelectorSecondVariable"
-        Me.ucrSelectorSecondVariable.Size = New System.Drawing.Size(213, 188)
-        Me.ucrSelectorSecondVariable.TabIndex = 2
+        'ucrChkP30
         '
-        'tbMore
+        Me.ucrChkP30.AutoSize = True
+        Me.ucrChkP30.Checked = False
+        Me.ucrChkP30.Location = New System.Drawing.Point(252, 32)
+        Me.ucrChkP30.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP30.Name = "ucrChkP30"
+        Me.ucrChkP30.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP30.TabIndex = 2
         '
-        Me.tbMore.Controls.Add(Me.grpProportionsPercentiles)
-        Me.tbMore.Controls.Add(Me.grpLocation)
-        Me.tbMore.Controls.Add(Me.grpScale)
-        Me.tbMore.Controls.Add(Me.grpSkewness)
-        Me.tbMore.Controls.Add(Me.grpKurtosis)
-        Me.tbMore.Location = New System.Drawing.Point(4, 22)
-        Me.tbMore.Name = "tbMore"
-        Me.tbMore.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMore.Size = New System.Drawing.Size(409, 383)
-        Me.tbMore.TabIndex = 1
-        Me.tbMore.Text = "More"
-        Me.tbMore.UseVisualStyleBackColor = True
+        'ucrChkP10
         '
-        'grpProportionsPercentiles
+        Me.ucrChkP10.AutoSize = True
+        Me.ucrChkP10.Checked = False
+        Me.ucrChkP10.Location = New System.Drawing.Point(10, 32)
+        Me.ucrChkP10.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP10.Name = "ucrChkP10"
+        Me.ucrChkP10.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP10.TabIndex = 0
         '
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputQuantile)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkQuantile)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputCountValue)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboCountTest)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkProportion)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkCount)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentage)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPropValue)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputComboPropTest)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrInputPercentile)
-        Me.grpProportionsPercentiles.Controls.Add(Me.ucrChkPercentile)
-        Me.grpProportionsPercentiles.Location = New System.Drawing.Point(10, 6)
-        Me.grpProportionsPercentiles.Name = "grpProportionsPercentiles"
-        Me.grpProportionsPercentiles.Size = New System.Drawing.Size(393, 122)
-        Me.grpProportionsPercentiles.TabIndex = 0
-        Me.grpProportionsPercentiles.TabStop = False
-        Me.grpProportionsPercentiles.Text = "Proportions/Percentiles/Count"
+        'ucrChkP20
+        '
+        Me.ucrChkP20.AutoSize = True
+        Me.ucrChkP20.Checked = False
+        Me.ucrChkP20.Location = New System.Drawing.Point(144, 32)
+        Me.ucrChkP20.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP20.Name = "ucrChkP20"
+        Me.ucrChkP20.Size = New System.Drawing.Size(99, 51)
+        Me.ucrChkP20.TabIndex = 1
+        '
+        'ucrChkn_distinct
+        '
+        Me.ucrChkn_distinct.AutoSize = True
+        Me.ucrChkn_distinct.Checked = False
+        Me.ucrChkn_distinct.Location = New System.Drawing.Point(252, 74)
+        Me.ucrChkn_distinct.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkn_distinct.Name = "ucrChkn_distinct"
+        Me.ucrChkn_distinct.Size = New System.Drawing.Size(152, 51)
+        Me.ucrChkn_distinct.TabIndex = 3
+        '
+        'ucrChkNTotal
+        '
+        Me.ucrChkNTotal.AutoSize = True
+        Me.ucrChkNTotal.Checked = False
+        Me.ucrChkNTotal.Location = New System.Drawing.Point(252, 28)
+        Me.ucrChkNTotal.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkNTotal.Name = "ucrChkNTotal"
+        Me.ucrChkNTotal.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkNTotal.TabIndex = 2
+        '
+        'ucrChkMode
+        '
+        Me.ucrChkMode.AutoSize = True
+        Me.ucrChkMode.Checked = False
+        Me.ucrChkMode.Location = New System.Drawing.Point(10, 74)
+        Me.ucrChkMode.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMode.Name = "ucrChkMode"
+        Me.ucrChkMode.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkMode.TabIndex = 1
+        '
+        'ucrChkNMissing
+        '
+        Me.ucrChkNMissing.AutoSize = True
+        Me.ucrChkNMissing.Checked = False
+        Me.ucrChkNMissing.Location = New System.Drawing.Point(438, 28)
+        Me.ucrChkNMissing.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkNMissing.Name = "ucrChkNMissing"
+        Me.ucrChkNMissing.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkNMissing.TabIndex = 4
+        '
+        'ucrChkNonMissing
+        '
+        Me.ucrChkNonMissing.AutoSize = True
+        Me.ucrChkNonMissing.Checked = False
+        Me.ucrChkNonMissing.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkNonMissing.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkNonMissing.Name = "ucrChkNonMissing"
+        Me.ucrChkNonMissing.Size = New System.Drawing.Size(194, 51)
+        Me.ucrChkNonMissing.TabIndex = 0
+        '
+        'ucrChkP67
+        '
+        Me.ucrChkP67.AutoSize = True
+        Me.ucrChkP67.Checked = False
+        Me.ucrChkP67.Location = New System.Drawing.Point(252, 28)
+        Me.ucrChkP67.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP67.Name = "ucrChkP67"
+        Me.ucrChkP67.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP67.TabIndex = 3
+        '
+        'ucrChkP33
+        '
+        Me.ucrChkP33.AutoSize = True
+        Me.ucrChkP33.Checked = False
+        Me.ucrChkP33.Location = New System.Drawing.Point(144, 28)
+        Me.ucrChkP33.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP33.Name = "ucrChkP33"
+        Me.ucrChkP33.Size = New System.Drawing.Size(99, 51)
+        Me.ucrChkP33.TabIndex = 2
+        '
+        'ucrChkP25
+        '
+        Me.ucrChkP25.AutoSize = True
+        Me.ucrChkP25.Checked = False
+        Me.ucrChkP25.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkP25.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP25.Name = "ucrChkP25"
+        Me.ucrChkP25.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP25.TabIndex = 0
+        '
+        'ucrChkP75
+        '
+        Me.ucrChkP75.AutoSize = True
+        Me.ucrChkP75.Checked = False
+        Me.ucrChkP75.Location = New System.Drawing.Point(438, 28)
+        Me.ucrChkP75.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkP75.Name = "ucrChkP75"
+        Me.ucrChkP75.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkP75.TabIndex = 1
+        '
+        'ucrChkRange
+        '
+        Me.ucrChkRange.AutoSize = True
+        Me.ucrChkRange.Checked = False
+        Me.ucrChkRange.Location = New System.Drawing.Point(438, 28)
+        Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRange.Name = "ucrChkRange"
+        Me.ucrChkRange.Size = New System.Drawing.Size(128, 51)
+        Me.ucrChkRange.TabIndex = 1
+        '
+        'ucrChkMaximum
+        '
+        Me.ucrChkMaximum.AutoSize = True
+        Me.ucrChkMaximum.Checked = False
+        Me.ucrChkMaximum.Location = New System.Drawing.Point(252, 28)
+        Me.ucrChkMaximum.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMaximum.Name = "ucrChkMaximum"
+        Me.ucrChkMaximum.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkMaximum.TabIndex = 2
+        '
+        'ucrChkMinimum
+        '
+        Me.ucrChkMinimum.AutoSize = True
+        Me.ucrChkMinimum.Checked = False
+        Me.ucrChkMinimum.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkMinimum.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMinimum.Name = "ucrChkMinimum"
+        Me.ucrChkMinimum.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkMinimum.TabIndex = 0
+        '
+        'ucrChkVariance
+        '
+        Me.ucrChkVariance.AutoSize = True
+        Me.ucrChkVariance.Checked = False
+        Me.ucrChkVariance.Location = New System.Drawing.Point(252, 74)
+        Me.ucrChkVariance.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkVariance.Name = "ucrChkVariance"
+        Me.ucrChkVariance.Size = New System.Drawing.Size(236, 51)
+        Me.ucrChkVariance.TabIndex = 3
+        '
+        'ucrChkMedian
+        '
+        Me.ucrChkMedian.AutoSize = True
+        Me.ucrChkMedian.Checked = False
+        Me.ucrChkMedian.Location = New System.Drawing.Point(438, 28)
+        Me.ucrChkMedian.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMedian.Name = "ucrChkMedian"
+        Me.ucrChkMedian.Size = New System.Drawing.Size(154, 51)
+        Me.ucrChkMedian.TabIndex = 4
+        '
+        'ucrChkStdDev
+        '
+        Me.ucrChkStdDev.AutoSize = True
+        Me.ucrChkStdDev.Checked = False
+        Me.ucrChkStdDev.Location = New System.Drawing.Point(10, 74)
+        Me.ucrChkStdDev.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkStdDev.Name = "ucrChkStdDev"
+        Me.ucrChkStdDev.Size = New System.Drawing.Size(232, 51)
+        Me.ucrChkStdDev.TabIndex = 1
+        '
+        'ucrChkSum
+        '
+        Me.ucrChkSum.AutoSize = True
+        Me.ucrChkSum.Checked = False
+        Me.ucrChkSum.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkSum.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkSum.Name = "ucrChkSum"
+        Me.ucrChkSum.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkSum.TabIndex = 0
+        '
+        'ucrChkMean
+        '
+        Me.ucrChkMean.AutoSize = True
+        Me.ucrChkMean.Checked = False
+        Me.ucrChkMean.Location = New System.Drawing.Point(252, 28)
+        Me.ucrChkMean.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMean.Name = "ucrChkMean"
+        Me.ucrChkMean.Size = New System.Drawing.Size(150, 51)
+        Me.ucrChkMean.TabIndex = 2
         '
         'ucrInputQuantile
         '
@@ -934,20 +896,20 @@ Partial Class sdgSummaries
         Me.ucrInputQuantile.AutoSize = True
         Me.ucrInputQuantile.IsMultiline = False
         Me.ucrInputQuantile.IsReadOnly = False
-        Me.ucrInputQuantile.Location = New System.Drawing.Point(119, 93)
-        Me.ucrInputQuantile.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrInputQuantile.Location = New System.Drawing.Point(178, 140)
+        Me.ucrInputQuantile.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrInputQuantile.Name = "ucrInputQuantile"
-        Me.ucrInputQuantile.Size = New System.Drawing.Size(52, 21)
+        Me.ucrInputQuantile.Size = New System.Drawing.Size(78, 32)
         Me.ucrInputQuantile.TabIndex = 10
         '
         'ucrChkQuantile
         '
         Me.ucrChkQuantile.AutoSize = True
         Me.ucrChkQuantile.Checked = False
-        Me.ucrChkQuantile.Location = New System.Drawing.Point(7, 96)
-        Me.ucrChkQuantile.Margin = New System.Windows.Forms.Padding(4)
+        Me.ucrChkQuantile.Location = New System.Drawing.Point(10, 144)
+        Me.ucrChkQuantile.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
         Me.ucrChkQuantile.Name = "ucrChkQuantile"
-        Me.ucrChkQuantile.Size = New System.Drawing.Size(108, 23)
+        Me.ucrChkQuantile.Size = New System.Drawing.Size(162, 51)
         Me.ucrChkQuantile.TabIndex = 9
         '
         'ucrInputCountValue
@@ -956,10 +918,10 @@ Partial Class sdgSummaries
         Me.ucrInputCountValue.AutoSize = True
         Me.ucrInputCountValue.IsMultiline = False
         Me.ucrInputCountValue.IsReadOnly = False
-        Me.ucrInputCountValue.Location = New System.Drawing.Point(175, 68)
-        Me.ucrInputCountValue.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
+        Me.ucrInputCountValue.Location = New System.Drawing.Point(262, 102)
+        Me.ucrInputCountValue.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
         Me.ucrInputCountValue.Name = "ucrInputCountValue"
-        Me.ucrInputCountValue.Size = New System.Drawing.Size(51, 20)
+        Me.ucrInputCountValue.Size = New System.Drawing.Size(76, 30)
         Me.ucrInputCountValue.TabIndex = 8
         '
         'ucrInputComboCountTest
@@ -969,40 +931,40 @@ Partial Class sdgSummaries
         Me.ucrInputComboCountTest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.ucrInputComboCountTest.GetSetSelectedIndex = -1
         Me.ucrInputComboCountTest.IsReadOnly = False
-        Me.ucrInputComboCountTest.Location = New System.Drawing.Point(119, 68)
-        Me.ucrInputComboCountTest.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
+        Me.ucrInputComboCountTest.Location = New System.Drawing.Point(178, 102)
+        Me.ucrInputComboCountTest.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
         Me.ucrInputComboCountTest.Name = "ucrInputComboCountTest"
-        Me.ucrInputComboCountTest.Size = New System.Drawing.Size(51, 25)
+        Me.ucrInputComboCountTest.Size = New System.Drawing.Size(76, 38)
         Me.ucrInputComboCountTest.TabIndex = 7
         '
         'ucrChkProportion
         '
         Me.ucrChkProportion.AutoSize = True
         Me.ucrChkProportion.Checked = False
-        Me.ucrChkProportion.Location = New System.Drawing.Point(7, 45)
-        Me.ucrChkProportion.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkProportion.Location = New System.Drawing.Point(10, 68)
+        Me.ucrChkProportion.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkProportion.Name = "ucrChkProportion"
-        Me.ucrChkProportion.Size = New System.Drawing.Size(108, 23)
+        Me.ucrChkProportion.Size = New System.Drawing.Size(162, 51)
         Me.ucrChkProportion.TabIndex = 2
         '
         'ucrChkCount
         '
         Me.ucrChkCount.AutoSize = True
         Me.ucrChkCount.Checked = False
-        Me.ucrChkCount.Location = New System.Drawing.Point(7, 71)
-        Me.ucrChkCount.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkCount.Location = New System.Drawing.Point(10, 106)
+        Me.ucrChkCount.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkCount.Name = "ucrChkCount"
-        Me.ucrChkCount.Size = New System.Drawing.Size(108, 23)
+        Me.ucrChkCount.Size = New System.Drawing.Size(162, 51)
         Me.ucrChkCount.TabIndex = 6
         '
         'ucrChkPercentage
         '
         Me.ucrChkPercentage.AutoSize = True
         Me.ucrChkPercentage.Checked = False
-        Me.ucrChkPercentage.Location = New System.Drawing.Point(238, 45)
-        Me.ucrChkPercentage.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkPercentage.Location = New System.Drawing.Point(357, 68)
+        Me.ucrChkPercentage.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkPercentage.Name = "ucrChkPercentage"
-        Me.ucrChkPercentage.Size = New System.Drawing.Size(101, 23)
+        Me.ucrChkPercentage.Size = New System.Drawing.Size(152, 51)
         Me.ucrChkPercentage.TabIndex = 5
         '
         'ucrInputPropValue
@@ -1011,10 +973,10 @@ Partial Class sdgSummaries
         Me.ucrInputPropValue.AutoSize = True
         Me.ucrInputPropValue.IsMultiline = False
         Me.ucrInputPropValue.IsReadOnly = False
-        Me.ucrInputPropValue.Location = New System.Drawing.Point(175, 43)
-        Me.ucrInputPropValue.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
+        Me.ucrInputPropValue.Location = New System.Drawing.Point(262, 64)
+        Me.ucrInputPropValue.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
         Me.ucrInputPropValue.Name = "ucrInputPropValue"
-        Me.ucrInputPropValue.Size = New System.Drawing.Size(51, 20)
+        Me.ucrInputPropValue.Size = New System.Drawing.Size(76, 30)
         Me.ucrInputPropValue.TabIndex = 4
         '
         'ucrInputComboPropTest
@@ -1024,10 +986,10 @@ Partial Class sdgSummaries
         Me.ucrInputComboPropTest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.ucrInputComboPropTest.GetSetSelectedIndex = -1
         Me.ucrInputComboPropTest.IsReadOnly = False
-        Me.ucrInputComboPropTest.Location = New System.Drawing.Point(119, 43)
-        Me.ucrInputComboPropTest.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
+        Me.ucrInputComboPropTest.Location = New System.Drawing.Point(178, 64)
+        Me.ucrInputComboPropTest.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
         Me.ucrInputComboPropTest.Name = "ucrInputComboPropTest"
-        Me.ucrInputComboPropTest.Size = New System.Drawing.Size(51, 25)
+        Me.ucrInputComboPropTest.Size = New System.Drawing.Size(76, 38)
         Me.ucrInputComboPropTest.TabIndex = 3
         '
         'ucrInputPercentile
@@ -1036,55 +998,33 @@ Partial Class sdgSummaries
         Me.ucrInputPercentile.AutoSize = True
         Me.ucrInputPercentile.IsMultiline = False
         Me.ucrInputPercentile.IsReadOnly = False
-        Me.ucrInputPercentile.Location = New System.Drawing.Point(119, 19)
-        Me.ucrInputPercentile.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6)
+        Me.ucrInputPercentile.Location = New System.Drawing.Point(178, 28)
+        Me.ucrInputPercentile.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
         Me.ucrInputPercentile.Name = "ucrInputPercentile"
-        Me.ucrInputPercentile.Size = New System.Drawing.Size(51, 20)
+        Me.ucrInputPercentile.Size = New System.Drawing.Size(76, 30)
         Me.ucrInputPercentile.TabIndex = 1
         '
         'ucrChkPercentile
         '
         Me.ucrChkPercentile.AutoSize = True
         Me.ucrChkPercentile.Checked = False
-        Me.ucrChkPercentile.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkPercentile.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkPercentile.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkPercentile.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkPercentile.Name = "ucrChkPercentile"
-        Me.ucrChkPercentile.Size = New System.Drawing.Size(108, 23)
+        Me.ucrChkPercentile.Size = New System.Drawing.Size(162, 51)
         Me.ucrChkPercentile.TabIndex = 0
         '
-        'grpLocation
-        '
-        Me.grpLocation.Controls.Add(Me.lblFractionTrimmed)
-        Me.grpLocation.Controls.Add(Me.ucrNudFraction)
-        Me.grpLocation.Controls.Add(Me.ucrChkTrimmedMean)
-        Me.grpLocation.Location = New System.Drawing.Point(10, 134)
-        Me.grpLocation.Name = "grpLocation"
-        Me.grpLocation.Size = New System.Drawing.Size(393, 52)
-        Me.grpLocation.TabIndex = 0
-        Me.grpLocation.TabStop = False
-        Me.grpLocation.Text = "Location"
-        '
-        'lblFractionTrimmed
-        '
-        Me.lblFractionTrimmed.AutoSize = True
-        Me.lblFractionTrimmed.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblFractionTrimmed.Location = New System.Drawing.Point(208, 21)
-        Me.lblFractionTrimmed.Name = "lblFractionTrimmed"
-        Me.lblFractionTrimmed.Size = New System.Drawing.Size(91, 13)
-        Me.lblFractionTrimmed.TabIndex = 1
-        Me.lblFractionTrimmed.Text = "Fraction Trimmed:"
-        '
         'ucrNudFraction
         '
         Me.ucrNudFraction.AutoSize = True
         Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
         Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0})
-        Me.ucrNudFraction.Location = New System.Drawing.Point(303, 18)
-        Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrNudFraction.Location = New System.Drawing.Point(454, 27)
+        Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
         Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
         Me.ucrNudFraction.Name = "ucrNudFraction"
-        Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20)
+        Me.ucrNudFraction.Size = New System.Drawing.Size(75, 30)
         Me.ucrNudFraction.TabIndex = 2
         Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0})
         '
@@ -1092,488 +1032,623 @@ Partial Class sdgSummaries
         '
         Me.ucrChkTrimmedMean.AutoSize = True
         Me.ucrChkTrimmedMean.Checked = False
-        Me.ucrChkTrimmedMean.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkTrimmedMean.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkTrimmedMean.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkTrimmedMean.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkTrimmedMean.Name = "ucrChkTrimmedMean"
-        Me.ucrChkTrimmedMean.Size = New System.Drawing.Size(120, 23)
+        Me.ucrChkTrimmedMean.Size = New System.Drawing.Size(180, 51)
         Me.ucrChkTrimmedMean.TabIndex = 0
         '
-        'grpScale
-        '
-        Me.grpScale.Controls.Add(Me.ucrChkSn)
-        Me.grpScale.Controls.Add(Me.ucrChkQn)
-        Me.grpScale.Controls.Add(Me.ucrChkCoefficientOfVariation)
-        Me.grpScale.Controls.Add(Me.ucrChkMedianAbsoluteDeviation)
-        Me.grpScale.Location = New System.Drawing.Point(10, 193)
-        Me.grpScale.Name = "grpScale"
-        Me.grpScale.Size = New System.Drawing.Size(393, 74)
-        Me.grpScale.TabIndex = 1
-        Me.grpScale.TabStop = False
-        Me.grpScale.Text = "Scale"
-        '
         'ucrChkSn
         '
         Me.ucrChkSn.AutoSize = True
         Me.ucrChkSn.Checked = False
-        Me.ucrChkSn.Location = New System.Drawing.Point(208, 46)
-        Me.ucrChkSn.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkSn.Location = New System.Drawing.Point(312, 69)
+        Me.ucrChkSn.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkSn.Name = "ucrChkSn"
-        Me.ucrChkSn.Size = New System.Drawing.Size(101, 23)
+        Me.ucrChkSn.Size = New System.Drawing.Size(152, 51)
         Me.ucrChkSn.TabIndex = 3
         '
         'ucrChkQn
         '
         Me.ucrChkQn.AutoSize = True
         Me.ucrChkQn.Checked = False
-        Me.ucrChkQn.Location = New System.Drawing.Point(208, 19)
-        Me.ucrChkQn.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkQn.Location = New System.Drawing.Point(312, 28)
+        Me.ucrChkQn.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkQn.Name = "ucrChkQn"
-        Me.ucrChkQn.Size = New System.Drawing.Size(101, 23)
+        Me.ucrChkQn.Size = New System.Drawing.Size(152, 51)
         Me.ucrChkQn.TabIndex = 2
         '
         'ucrChkCoefficientOfVariation
         '
         Me.ucrChkCoefficientOfVariation.AutoSize = True
         Me.ucrChkCoefficientOfVariation.Checked = False
-        Me.ucrChkCoefficientOfVariation.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkCoefficientOfVariation.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkCoefficientOfVariation.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkCoefficientOfVariation.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkCoefficientOfVariation.Name = "ucrChkCoefficientOfVariation"
-        Me.ucrChkCoefficientOfVariation.Size = New System.Drawing.Size(200, 23)
+        Me.ucrChkCoefficientOfVariation.Size = New System.Drawing.Size(300, 51)
         Me.ucrChkCoefficientOfVariation.TabIndex = 0
         '
         'ucrChkMedianAbsoluteDeviation
         '
         Me.ucrChkMedianAbsoluteDeviation.AutoSize = True
         Me.ucrChkMedianAbsoluteDeviation.Checked = False
-        Me.ucrChkMedianAbsoluteDeviation.Location = New System.Drawing.Point(7, 45)
-        Me.ucrChkMedianAbsoluteDeviation.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkMedianAbsoluteDeviation.Location = New System.Drawing.Point(10, 68)
+        Me.ucrChkMedianAbsoluteDeviation.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkMedianAbsoluteDeviation.Name = "ucrChkMedianAbsoluteDeviation"
-        Me.ucrChkMedianAbsoluteDeviation.Size = New System.Drawing.Size(262, 23)
-        Me.ucrChkMedianAbsoluteDeviation.TabIndex = 1
-        '
-        'grpSkewness
-        '
-        Me.grpSkewness.Controls.Add(Me.ucrChkMc)
-        Me.grpSkewness.Controls.Add(Me.ucrChkSkewness)
-        Me.grpSkewness.Location = New System.Drawing.Point(10, 273)
-        Me.grpSkewness.Name = "grpSkewness"
-        Me.grpSkewness.Size = New System.Drawing.Size(393, 49)
-        Me.grpSkewness.TabIndex = 2
-        Me.grpSkewness.TabStop = False
-        Me.grpSkewness.Text = "Skewness"
+        Me.ucrChkMedianAbsoluteDeviation.Size = New System.Drawing.Size(393, 51)
+        Me.ucrChkMedianAbsoluteDeviation.TabIndex = 1
         '
         'ucrChkMc
         '
         Me.ucrChkMc.AutoSize = True
         Me.ucrChkMc.Checked = False
-        Me.ucrChkMc.Location = New System.Drawing.Point(208, 19)
-        Me.ucrChkMc.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkMc.Location = New System.Drawing.Point(312, 28)
+        Me.ucrChkMc.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkMc.Name = "ucrChkMc"
-        Me.ucrChkMc.Size = New System.Drawing.Size(101, 23)
+        Me.ucrChkMc.Size = New System.Drawing.Size(152, 51)
         Me.ucrChkMc.TabIndex = 1
         '
         'ucrChkSkewness
         '
         Me.ucrChkSkewness.AutoSize = True
         Me.ucrChkSkewness.Checked = False
-        Me.ucrChkSkewness.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkSkewness.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkSkewness.Location = New System.Drawing.Point(10, 28)
+        Me.ucrChkSkewness.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkSkewness.Name = "ucrChkSkewness"
-        Me.ucrChkSkewness.Size = New System.Drawing.Size(254, 23)
+        Me.ucrChkSkewness.Size = New System.Drawing.Size(381, 51)
         Me.ucrChkSkewness.TabIndex = 0
         '
-        'grpKurtosis
+        'ucrChkProportionsPercentages
         '
-        Me.grpKurtosis.Controls.Add(Me.ucrChkKurtosis)
-        Me.grpKurtosis.Location = New System.Drawing.Point(10, 329)
-        Me.grpKurtosis.Name = "grpKurtosis"
-        Me.grpKurtosis.Size = New System.Drawing.Size(393, 50)
-        Me.grpKurtosis.TabIndex = 3
-        Me.grpKurtosis.TabStop = False
-        Me.grpKurtosis.Text = "Kurtosis"
+        Me.ucrChkProportionsPercentages.AutoSize = True
+        Me.ucrChkProportionsPercentages.Checked = False
+        Me.ucrChkProportionsPercentages.Location = New System.Drawing.Point(10, 19)
+        Me.ucrChkProportionsPercentages.Margin = New System.Windows.Forms.Padding(9)
+        Me.ucrChkProportionsPercentages.Name = "ucrChkProportionsPercentages"
+        Me.ucrChkProportionsPercentages.Size = New System.Drawing.Size(438, 34)
+        Me.ucrChkProportionsPercentages.TabIndex = 1
         '
         'ucrChkKurtosis
         '
         Me.ucrChkKurtosis.AutoSize = True
         Me.ucrChkKurtosis.Checked = False
-        Me.ucrChkKurtosis.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkKurtosis.Margin = New System.Windows.Forms.Padding(5)
+        Me.ucrChkKurtosis.Location = New System.Drawing.Point(10, 25)
+        Me.ucrChkKurtosis.Margin = New System.Windows.Forms.Padding(8)
         Me.ucrChkKurtosis.Name = "ucrChkKurtosis"
-        Me.ucrChkKurtosis.Size = New System.Drawing.Size(120, 23)
+        Me.ucrChkKurtosis.Size = New System.Drawing.Size(180, 34)
         Me.ucrChkKurtosis.TabIndex = 0
         '
-        'tbsum
+        'ucrChkCovariance
         '
-        Me.tbsum.Controls.Add(Me.grpDecilesQuintiles)
-        Me.tbsum.Controls.Add(Me.grpCommon)
-        Me.tbsum.Controls.Add(Me.grpQuartilesTerciles)
-        Me.tbsum.Controls.Add(Me.grpNotOrderedFactor)
-        Me.tbsum.Controls.Add(Me.grpNumeric)
-        Me.tbsum.Location = New System.Drawing.Point(4, 22)
-        Me.tbsum.Name = "tbsum"
-        Me.tbsum.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbsum.Size = New System.Drawing.Size(409, 383)
-        Me.tbsum.TabIndex = 0
-        Me.tbsum.Text = "Summaries"
-        Me.tbsum.UseVisualStyleBackColor = True
+        Me.ucrChkCovariance.AutoSize = True
+        Me.ucrChkCovariance.Checked = False
+        Me.ucrChkCovariance.Location = New System.Drawing.Point(249, 15)
+        Me.ucrChkCovariance.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkCovariance.Name = "ucrChkCovariance"
+        Me.ucrChkCovariance.Size = New System.Drawing.Size(250, 51)
+        Me.ucrChkCovariance.TabIndex = 1
         '
-        'grpDecilesQuintiles
+        'ucrChkCorrelations
         '
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP60)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP90)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP70)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP80)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP40)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP30)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP10)
-        Me.grpDecilesQuintiles.Controls.Add(Me.ucrChkP20)
-        Me.grpDecilesQuintiles.Location = New System.Drawing.Point(10, 289)
-        Me.grpDecilesQuintiles.Name = "grpDecilesQuintiles"
-        Me.grpDecilesQuintiles.Size = New System.Drawing.Size(393, 87)
-        Me.grpDecilesQuintiles.TabIndex = 4
-        Me.grpDecilesQuintiles.TabStop = False
-        Me.grpDecilesQuintiles.Tag = ""
-        Me.grpDecilesQuintiles.Text = "Deciles && Quintiles"
+        Me.ucrChkCorrelations.AutoSize = True
+        Me.ucrChkCorrelations.Checked = False
+        Me.ucrChkCorrelations.Location = New System.Drawing.Point(22, 20)
+        Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkCorrelations.Name = "ucrChkCorrelations"
+        Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 51)
+        Me.ucrChkCorrelations.TabIndex = 0
         '
-        'ucrChkP60
+        'ucrInputJmia
         '
-        Me.ucrChkP60.AutoSize = True
-        Me.ucrChkP60.Checked = False
-        Me.ucrChkP60.Location = New System.Drawing.Point(7, 51)
-        Me.ucrChkP60.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP60.Name = "ucrChkP60"
-        Me.ucrChkP60.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP60.TabIndex = 7
+        Me.ucrInputJmia.AddQuotesIfUnrecognised = True
+        Me.ucrInputJmia.AutoSize = True
+        Me.ucrInputJmia.IsMultiline = False
+        Me.ucrInputJmia.IsReadOnly = False
+        Me.ucrInputJmia.Location = New System.Drawing.Point(448, 183)
+        Me.ucrInputJmia.Margin = New System.Windows.Forms.Padding(14)
+        Me.ucrInputJmia.Name = "ucrInputJmia"
+        Me.ucrInputJmia.Size = New System.Drawing.Size(48, 32)
+        Me.ucrInputJmia.TabIndex = 21
         '
-        'ucrChkP90
+        'ucrChkSelectAll
         '
-        Me.ucrChkP90.AutoSize = True
-        Me.ucrChkP90.Checked = False
-        Me.ucrChkP90.Location = New System.Drawing.Point(292, 51)
-        Me.ucrChkP90.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP90.Name = "ucrChkP90"
-        Me.ucrChkP90.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP90.TabIndex = 6
+        Me.ucrChkSelectAll.AutoSize = True
+        Me.ucrChkSelectAll.Checked = False
+        Me.ucrChkSelectAll.Location = New System.Drawing.Point(14, 22)
+        Me.ucrChkSelectAll.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkSelectAll.Name = "ucrChkSelectAll"
+        Me.ucrChkSelectAll.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkSelectAll.TabIndex = 0
         '
-        'ucrChkP70
+        'ucrChkRelativeIndexOfAgreement
         '
-        Me.ucrChkP70.AutoSize = True
-        Me.ucrChkP70.Checked = False
-        Me.ucrChkP70.Location = New System.Drawing.Point(96, 51)
-        Me.ucrChkP70.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP70.Name = "ucrChkP70"
-        Me.ucrChkP70.Size = New System.Drawing.Size(66, 23)
-        Me.ucrChkP70.TabIndex = 5
+        Me.ucrChkRelativeIndexOfAgreement.AutoSize = True
+        Me.ucrChkRelativeIndexOfAgreement.Checked = False
+        Me.ucrChkRelativeIndexOfAgreement.Location = New System.Drawing.Point(306, 112)
+        Me.ucrChkRelativeIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRelativeIndexOfAgreement.Name = "ucrChkRelativeIndexOfAgreement"
+        Me.ucrChkRelativeIndexOfAgreement.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkRelativeIndexOfAgreement.TabIndex = 13
         '
-        'ucrChkP80
+        'ucrChkRatioOfStandardDeviation
         '
-        Me.ucrChkP80.AutoSize = True
-        Me.ucrChkP80.Checked = False
-        Me.ucrChkP80.Location = New System.Drawing.Point(168, 51)
-        Me.ucrChkP80.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP80.Name = "ucrChkP80"
-        Me.ucrChkP80.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP80.TabIndex = 4
+        Me.ucrChkRatioOfStandardDeviation.AutoSize = True
+        Me.ucrChkRatioOfStandardDeviation.Checked = False
+        Me.ucrChkRatioOfStandardDeviation.Location = New System.Drawing.Point(141, 81)
+        Me.ucrChkRatioOfStandardDeviation.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRatioOfStandardDeviation.Name = "ucrChkRatioOfStandardDeviation"
+        Me.ucrChkRatioOfStandardDeviation.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkRatioOfStandardDeviation.TabIndex = 7
         '
-        'ucrChkP40
+        'ucrChkCoefDetermination
         '
-        Me.ucrChkP40.AutoSize = True
-        Me.ucrChkP40.Checked = False
-        Me.ucrChkP40.Location = New System.Drawing.Point(292, 21)
-        Me.ucrChkP40.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP40.Name = "ucrChkP40"
-        Me.ucrChkP40.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP40.TabIndex = 3
+        Me.ucrChkCoefDetermination.AutoSize = True
+        Me.ucrChkCoefDetermination.Checked = False
+        Me.ucrChkCoefDetermination.Location = New System.Drawing.Point(306, 174)
+        Me.ucrChkCoefDetermination.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkCoefDetermination.Name = "ucrChkCoefDetermination"
+        Me.ucrChkCoefDetermination.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkCoefDetermination.TabIndex = 15
         '
-        'ucrChkP30
+        'ucrChkRatioOfRootMeanSquaredError
         '
-        Me.ucrChkP30.AutoSize = True
-        Me.ucrChkP30.Checked = False
-        Me.ucrChkP30.Location = New System.Drawing.Point(168, 21)
-        Me.ucrChkP30.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP30.Name = "ucrChkP30"
-        Me.ucrChkP30.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP30.TabIndex = 2
+        Me.ucrChkRatioOfRootMeanSquaredError.AutoSize = True
+        Me.ucrChkRatioOfRootMeanSquaredError.Checked = False
+        Me.ucrChkRatioOfRootMeanSquaredError.Location = New System.Drawing.Point(141, 51)
+        Me.ucrChkRatioOfRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRatioOfRootMeanSquaredError.Name = "ucrChkRatioOfRootMeanSquaredError"
+        Me.ucrChkRatioOfRootMeanSquaredError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkRatioOfRootMeanSquaredError.TabIndex = 6
         '
-        'ucrChkP10
+        'ucrChkRelativeNashSutcliffeEff
         '
-        Me.ucrChkP10.AutoSize = True
-        Me.ucrChkP10.Checked = False
-        Me.ucrChkP10.Location = New System.Drawing.Point(7, 21)
-        Me.ucrChkP10.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP10.Name = "ucrChkP10"
-        Me.ucrChkP10.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP10.TabIndex = 0
+        Me.ucrChkRelativeNashSutcliffeEff.AutoSize = True
+        Me.ucrChkRelativeNashSutcliffeEff.Checked = False
+        Me.ucrChkRelativeNashSutcliffeEff.Location = New System.Drawing.Point(141, 172)
+        Me.ucrChkRelativeNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRelativeNashSutcliffeEff.Name = "ucrChkRelativeNashSutcliffeEff"
+        Me.ucrChkRelativeNashSutcliffeEff.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkRelativeNashSutcliffeEff.TabIndex = 10
         '
-        'ucrChkP20
+        'ucrChkModifiedIndexOfAgreement
         '
-        Me.ucrChkP20.AutoSize = True
-        Me.ucrChkP20.Checked = False
-        Me.ucrChkP20.Location = New System.Drawing.Point(96, 21)
-        Me.ucrChkP20.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP20.Name = "ucrChkP20"
-        Me.ucrChkP20.Size = New System.Drawing.Size(66, 23)
-        Me.ucrChkP20.TabIndex = 1
+        Me.ucrChkModifiedIndexOfAgreement.AutoSize = True
+        Me.ucrChkModifiedIndexOfAgreement.Checked = False
+        Me.ucrChkModifiedIndexOfAgreement.Location = New System.Drawing.Point(306, 54)
+        Me.ucrChkModifiedIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkModifiedIndexOfAgreement.Name = "ucrChkModifiedIndexOfAgreement"
+        Me.ucrChkModifiedIndexOfAgreement.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkModifiedIndexOfAgreement.TabIndex = 11
         '
-        'grpCommon
+        'ucrChkCoefPersistence
         '
-        Me.grpCommon.Controls.Add(Me.ucrChkn_distinct)
-        Me.grpCommon.Controls.Add(Me.ucrChkNTotal)
-        Me.grpCommon.Controls.Add(Me.ucrChkMode)
-        Me.grpCommon.Controls.Add(Me.ucrChkNMissing)
-        Me.grpCommon.Controls.Add(Me.ucrChkNonMissing)
-        Me.grpCommon.Location = New System.Drawing.Point(10, 6)
-        Me.grpCommon.Name = "grpCommon"
-        Me.grpCommon.Size = New System.Drawing.Size(393, 80)
-        Me.grpCommon.TabIndex = 0
-        Me.grpCommon.TabStop = False
-        Me.grpCommon.Tag = "Common"
-        Me.grpCommon.Text = "Common"
+        Me.ucrChkCoefPersistence.AutoSize = True
+        Me.ucrChkCoefPersistence.Checked = False
+        Me.ucrChkCoefPersistence.Location = New System.Drawing.Point(306, 142)
+        Me.ucrChkCoefPersistence.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkCoefPersistence.Name = "ucrChkCoefPersistence"
+        Me.ucrChkCoefPersistence.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkCoefPersistence.TabIndex = 14
+        '
+        'ucrChkNashSutcliffeEfficiency
+        '
+        Me.ucrChkNashSutcliffeEfficiency.AutoSize = True
+        Me.ucrChkNashSutcliffeEfficiency.Checked = False
+        Me.ucrChkNashSutcliffeEfficiency.Location = New System.Drawing.Point(141, 112)
+        Me.ucrChkNashSutcliffeEfficiency.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkNashSutcliffeEfficiency.Name = "ucrChkNashSutcliffeEfficiency"
+        Me.ucrChkNashSutcliffeEfficiency.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkNashSutcliffeEfficiency.TabIndex = 8
+        '
+        'ucrChkSumOfSquaredResiduals
+        '
+        Me.ucrChkSumOfSquaredResiduals.AutoSize = True
+        Me.ucrChkSumOfSquaredResiduals.Checked = False
+        Me.ucrChkSumOfSquaredResiduals.Location = New System.Drawing.Point(459, 150)
+        Me.ucrChkSumOfSquaredResiduals.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkSumOfSquaredResiduals.Name = "ucrChkSumOfSquaredResiduals"
+        Me.ucrChkSumOfSquaredResiduals.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkSumOfSquaredResiduals.TabIndex = 19
+        '
+        'ucrChkKlingGuptaEfficiency
+        '
+        Me.ucrChkKlingGuptaEfficiency.AutoSize = True
+        Me.ucrChkKlingGuptaEfficiency.Checked = False
+        Me.ucrChkKlingGuptaEfficiency.Location = New System.Drawing.Point(459, 57)
+        Me.ucrChkKlingGuptaEfficiency.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkKlingGuptaEfficiency.Name = "ucrChkKlingGuptaEfficiency"
+        Me.ucrChkKlingGuptaEfficiency.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkKlingGuptaEfficiency.TabIndex = 16
+        '
+        'ucrChkVolumetricEfficiency
+        '
+        Me.ucrChkVolumetricEfficiency.AutoSize = True
+        Me.ucrChkVolumetricEfficiency.Checked = False
+        Me.ucrChkVolumetricEfficiency.Location = New System.Drawing.Point(459, 87)
+        Me.ucrChkVolumetricEfficiency.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkVolumetricEfficiency.Name = "ucrChkVolumetricEfficiency"
+        Me.ucrChkVolumetricEfficiency.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkVolumetricEfficiency.TabIndex = 17
+        '
+        'ucrChkPercentBias
+        '
+        Me.ucrChkPercentBias.AutoSize = True
+        Me.ucrChkPercentBias.Checked = False
+        Me.ucrChkPercentBias.Location = New System.Drawing.Point(12, 174)
+        Me.ucrChkPercentBias.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkPercentBias.Name = "ucrChkPercentBias"
+        Me.ucrChkPercentBias.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkPercentBias.TabIndex = 5
+        '
+        'ucrChkModNashSutcliffeEff
+        '
+        Me.ucrChkModNashSutcliffeEff.AutoSize = True
+        Me.ucrChkModNashSutcliffeEff.Checked = False
+        Me.ucrChkModNashSutcliffeEff.Location = New System.Drawing.Point(141, 142)
+        Me.ucrChkModNashSutcliffeEff.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkModNashSutcliffeEff.Name = "ucrChkModNashSutcliffeEff"
+        Me.ucrChkModNashSutcliffeEff.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkModNashSutcliffeEff.TabIndex = 9
+        '
+        'ucrChkMeanError
+        '
+        Me.ucrChkMeanError.AutoSize = True
+        Me.ucrChkMeanError.Checked = False
+        Me.ucrChkMeanError.Location = New System.Drawing.Point(12, 51)
+        Me.ucrChkMeanError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMeanError.Name = "ucrChkMeanError"
+        Me.ucrChkMeanError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkMeanError.TabIndex = 1
+        '
+        'ucrChkMeanSquaredError
+        '
+        Me.ucrChkMeanSquaredError.AutoSize = True
+        Me.ucrChkMeanSquaredError.Checked = False
+        Me.ucrChkMeanSquaredError.Location = New System.Drawing.Point(459, 118)
+        Me.ucrChkMeanSquaredError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMeanSquaredError.Name = "ucrChkMeanSquaredError"
+        Me.ucrChkMeanSquaredError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkMeanSquaredError.TabIndex = 18
+        '
+        'ucrChkRootMeanSquaredError
+        '
+        Me.ucrChkRootMeanSquaredError.AutoSize = True
+        Me.ucrChkRootMeanSquaredError.Checked = False
+        Me.ucrChkRootMeanSquaredError.Location = New System.Drawing.Point(12, 111)
+        Me.ucrChkRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkRootMeanSquaredError.Name = "ucrChkRootMeanSquaredError"
+        Me.ucrChkRootMeanSquaredError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkRootMeanSquaredError.TabIndex = 3
+        '
+        'ucrChkNormRootMeanSquaredError
+        '
+        Me.ucrChkNormRootMeanSquaredError.AutoSize = True
+        Me.ucrChkNormRootMeanSquaredError.Checked = False
+        Me.ucrChkNormRootMeanSquaredError.Location = New System.Drawing.Point(12, 142)
+        Me.ucrChkNormRootMeanSquaredError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkNormRootMeanSquaredError.Name = "ucrChkNormRootMeanSquaredError"
+        Me.ucrChkNormRootMeanSquaredError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkNormRootMeanSquaredError.TabIndex = 4
+        '
+        'ucrChkMeanAbsoluteError
+        '
+        Me.ucrChkMeanAbsoluteError.AutoSize = True
+        Me.ucrChkMeanAbsoluteError.Checked = False
+        Me.ucrChkMeanAbsoluteError.Location = New System.Drawing.Point(12, 81)
+        Me.ucrChkMeanAbsoluteError.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkMeanAbsoluteError.Name = "ucrChkMeanAbsoluteError"
+        Me.ucrChkMeanAbsoluteError.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkMeanAbsoluteError.TabIndex = 2
+        '
+        'ucrChkIndexOfAgreement
+        '
+        Me.ucrChkIndexOfAgreement.AutoSize = True
+        Me.ucrChkIndexOfAgreement.Checked = False
+        Me.ucrChkIndexOfAgreement.Location = New System.Drawing.Point(306, 86)
+        Me.ucrChkIndexOfAgreement.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkIndexOfAgreement.Name = "ucrChkIndexOfAgreement"
+        Me.ucrChkIndexOfAgreement.Size = New System.Drawing.Size(130, 51)
+        Me.ucrChkIndexOfAgreement.TabIndex = 12
+        '
+        'ucrReceiverSecondVariable
+        '
+        Me.ucrReceiverSecondVariable.AutoSize = True
+        Me.ucrReceiverSecondVariable.frmParent = Nothing
+        Me.ucrReceiverSecondVariable.Location = New System.Drawing.Point(399, 334)
+        Me.ucrReceiverSecondVariable.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucrReceiverSecondVariable.Name = "ucrReceiverSecondVariable"
+        Me.ucrReceiverSecondVariable.Selector = Nothing
+        Me.ucrReceiverSecondVariable.Size = New System.Drawing.Size(180, 30)
+        Me.ucrReceiverSecondVariable.strNcFilePath = ""
+        Me.ucrReceiverSecondVariable.TabIndex = 4
+        Me.ucrReceiverSecondVariable.ucrSelector = Nothing
+        '
+        'ucrSelectorSecondVariable
+        '
+        Me.ucrSelectorSecondVariable.AutoSize = True
+        Me.ucrSelectorSecondVariable.bDropUnusedFilterLevels = False
+        Me.ucrSelectorSecondVariable.bShowHiddenColumns = False
+        Me.ucrSelectorSecondVariable.bUseCurrentFilter = True
+        Me.ucrSelectorSecondVariable.Location = New System.Drawing.Point(12, 290)
+        Me.ucrSelectorSecondVariable.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucrSelectorSecondVariable.Name = "ucrSelectorSecondVariable"
+        Me.ucrSelectorSecondVariable.Size = New System.Drawing.Size(480, 411)
+        Me.ucrSelectorSecondVariable.TabIndex = 2
+        '
+        'ucrChkOrderBy
+        '
+        Me.ucrChkOrderBy.AutoSize = True
+        Me.ucrChkOrderBy.Checked = False
+        Me.ucrChkOrderBy.Location = New System.Drawing.Point(18, 152)
+        Me.ucrChkOrderBy.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkOrderBy.Name = "ucrChkOrderBy"
+        Me.ucrChkOrderBy.Size = New System.Drawing.Size(282, 51)
+        Me.ucrChkOrderBy.TabIndex = 1
+        '
+        'ucrChkSetseed
+        '
+        Me.ucrChkSetseed.AutoSize = True
+        Me.ucrChkSetseed.Checked = False
+        Me.ucrChkSetseed.Location = New System.Drawing.Point(249, 68)
+        Me.ucrChkSetseed.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkSetseed.Name = "ucrChkSetseed"
+        Me.ucrChkSetseed.Size = New System.Drawing.Size(152, 51)
+        Me.ucrChkSetseed.TabIndex = 8
         '
-        'ucrChkn_distinct
+        'ucrNudSeed
         '
-        Me.ucrChkn_distinct.AutoSize = True
-        Me.ucrChkn_distinct.Checked = False
-        Me.ucrChkn_distinct.Location = New System.Drawing.Point(168, 49)
-        Me.ucrChkn_distinct.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkn_distinct.Name = "ucrChkn_distinct"
-        Me.ucrChkn_distinct.Size = New System.Drawing.Size(101, 23)
-        Me.ucrChkn_distinct.TabIndex = 3
+        Me.ucrNudSeed.AutoSize = True
+        Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0})
+        Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0})
+        Me.ucrNudSeed.Location = New System.Drawing.Point(410, 68)
+        Me.ucrNudSeed.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0})
+        Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0})
+        Me.ucrNudSeed.Name = "ucrNudSeed"
+        Me.ucrNudSeed.Size = New System.Drawing.Size(75, 30)
+        Me.ucrNudSeed.TabIndex = 7
+        Me.ucrNudSeed.Value = New Decimal(New Integer() {0, 0, 0, 0})
         '
-        'ucrChkNTotal
+        'ucrChkSample
         '
-        Me.ucrChkNTotal.AutoSize = True
-        Me.ucrChkNTotal.Checked = False
-        Me.ucrChkNTotal.Location = New System.Drawing.Point(168, 19)
-        Me.ucrChkNTotal.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkNTotal.Name = "ucrChkNTotal"
-        Me.ucrChkNTotal.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkNTotal.TabIndex = 2
+        Me.ucrChkSample.AutoSize = True
+        Me.ucrChkSample.Checked = False
+        Me.ucrChkSample.Location = New System.Drawing.Point(12, 68)
+        Me.ucrChkSample.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkSample.Name = "ucrChkSample"
+        Me.ucrChkSample.Size = New System.Drawing.Size(170, 51)
+        Me.ucrChkSample.TabIndex = 5
         '
-        'ucrChkMode
+        'ucrInputN
         '
-        Me.ucrChkMode.AutoSize = True
-        Me.ucrChkMode.Checked = False
-        Me.ucrChkMode.Location = New System.Drawing.Point(7, 49)
-        Me.ucrChkMode.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMode.Name = "ucrChkMode"
-        Me.ucrChkMode.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkMode.TabIndex = 1
+        Me.ucrInputN.AddQuotesIfUnrecognised = True
+        Me.ucrInputN.AutoSize = True
+        Me.ucrInputN.IsMultiline = False
+        Me.ucrInputN.IsReadOnly = False
+        Me.ucrInputN.Location = New System.Drawing.Point(350, 28)
+        Me.ucrInputN.Margin = New System.Windows.Forms.Padding(10, 9, 10, 9)
+        Me.ucrInputN.Name = "ucrInputN"
+        Me.ucrInputN.Size = New System.Drawing.Size(96, 30)
+        Me.ucrInputN.TabIndex = 3
         '
-        'ucrChkNMissing
+        'ucrChkFirst
         '
-        Me.ucrChkNMissing.AutoSize = True
-        Me.ucrChkNMissing.Checked = False
-        Me.ucrChkNMissing.Location = New System.Drawing.Point(292, 19)
-        Me.ucrChkNMissing.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkNMissing.Name = "ucrChkNMissing"
-        Me.ucrChkNMissing.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkNMissing.TabIndex = 4
+        Me.ucrChkFirst.AutoSize = True
+        Me.ucrChkFirst.Checked = False
+        Me.ucrChkFirst.Location = New System.Drawing.Point(12, 28)
+        Me.ucrChkFirst.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkFirst.Name = "ucrChkFirst"
+        Me.ucrChkFirst.Size = New System.Drawing.Size(152, 51)
+        Me.ucrChkFirst.TabIndex = 0
         '
-        'ucrChkNonMissing
+        'ucrChkLast
         '
-        Me.ucrChkNonMissing.AutoSize = True
-        Me.ucrChkNonMissing.Checked = False
-        Me.ucrChkNonMissing.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkNonMissing.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkNonMissing.Name = "ucrChkNonMissing"
-        Me.ucrChkNonMissing.Size = New System.Drawing.Size(129, 23)
-        Me.ucrChkNonMissing.TabIndex = 0
+        Me.ucrChkLast.AutoSize = True
+        Me.ucrChkLast.Checked = False
+        Me.ucrChkLast.Location = New System.Drawing.Point(464, 28)
+        Me.ucrChkLast.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkLast.Name = "ucrChkLast"
+        Me.ucrChkLast.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkLast.TabIndex = 4
         '
-        'grpQuartilesTerciles
+        'ucrChknth
         '
-        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP67)
-        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP33)
-        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP25)
-        Me.grpQuartilesTerciles.Controls.Add(Me.ucrChkP75)
-        Me.grpQuartilesTerciles.Location = New System.Drawing.Point(10, 230)
-        Me.grpQuartilesTerciles.Name = "grpQuartilesTerciles"
-        Me.grpQuartilesTerciles.Size = New System.Drawing.Size(393, 56)
-        Me.grpQuartilesTerciles.TabIndex = 3
-        Me.grpQuartilesTerciles.TabStop = False
-        Me.grpQuartilesTerciles.Tag = "Quartiles"
-        Me.grpQuartilesTerciles.Text = "Quartiles && Terciles"
+        Me.ucrChknth.AutoSize = True
+        Me.ucrChknth.Checked = False
+        Me.ucrChknth.Location = New System.Drawing.Point(249, 32)
+        Me.ucrChknth.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChknth.Name = "ucrChknth"
+        Me.ucrChknth.Size = New System.Drawing.Size(88, 51)
+        Me.ucrChknth.TabIndex = 1
         '
-        'ucrChkP67
+        'ucrSelectorOrderBy
         '
-        Me.ucrChkP67.AutoSize = True
-        Me.ucrChkP67.Checked = False
-        Me.ucrChkP67.Location = New System.Drawing.Point(168, 19)
-        Me.ucrChkP67.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP67.Name = "ucrChkP67"
-        Me.ucrChkP67.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP67.TabIndex = 3
+        Me.ucrSelectorOrderBy.AutoSize = True
+        Me.ucrSelectorOrderBy.bDropUnusedFilterLevels = False
+        Me.ucrSelectorOrderBy.bShowHiddenColumns = False
+        Me.ucrSelectorOrderBy.bUseCurrentFilter = True
+        Me.ucrSelectorOrderBy.Location = New System.Drawing.Point(15, 198)
+        Me.ucrSelectorOrderBy.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucrSelectorOrderBy.Name = "ucrSelectorOrderBy"
+        Me.ucrSelectorOrderBy.Size = New System.Drawing.Size(480, 411)
+        Me.ucrSelectorOrderBy.TabIndex = 2
         '
-        'ucrChkP33
+        'ucrReceiverOrderBy
         '
-        Me.ucrChkP33.AutoSize = True
-        Me.ucrChkP33.Checked = False
-        Me.ucrChkP33.Location = New System.Drawing.Point(96, 19)
-        Me.ucrChkP33.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP33.Name = "ucrChkP33"
-        Me.ucrChkP33.Size = New System.Drawing.Size(66, 23)
-        Me.ucrChkP33.TabIndex = 2
+        Me.ucrReceiverOrderBy.AutoSize = True
+        Me.ucrReceiverOrderBy.frmParent = Nothing
+        Me.ucrReceiverOrderBy.Location = New System.Drawing.Point(346, 264)
+        Me.ucrReceiverOrderBy.Margin = New System.Windows.Forms.Padding(0)
+        Me.ucrReceiverOrderBy.Name = "ucrReceiverOrderBy"
+        Me.ucrReceiverOrderBy.Selector = Nothing
+        Me.ucrReceiverOrderBy.Size = New System.Drawing.Size(180, 30)
+        Me.ucrReceiverOrderBy.strNcFilePath = ""
+        Me.ucrReceiverOrderBy.TabIndex = 4
+        Me.ucrReceiverOrderBy.ucrSelector = Nothing
         '
-        'ucrChkP25
+        'ucrChkStandardErrorOfMean
         '
-        Me.ucrChkP25.AutoSize = True
-        Me.ucrChkP25.Checked = False
-        Me.ucrChkP25.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkP25.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP25.Name = "ucrChkP25"
-        Me.ucrChkP25.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP25.TabIndex = 0
+        Me.ucrChkStandardErrorOfMean.AutoSize = True
+        Me.ucrChkStandardErrorOfMean.Checked = False
+        Me.ucrChkStandardErrorOfMean.Location = New System.Drawing.Point(24, 32)
+        Me.ucrChkStandardErrorOfMean.Margin = New System.Windows.Forms.Padding(8)
+        Me.ucrChkStandardErrorOfMean.Name = "ucrChkStandardErrorOfMean"
+        Me.ucrChkStandardErrorOfMean.Size = New System.Drawing.Size(442, 51)
+        Me.ucrChkStandardErrorOfMean.TabIndex = 1
         '
-        'ucrChkP75
+        'ucrChkCircRange
         '
-        Me.ucrChkP75.AutoSize = True
-        Me.ucrChkP75.Checked = False
-        Me.ucrChkP75.Location = New System.Drawing.Point(292, 19)
-        Me.ucrChkP75.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkP75.Name = "ucrChkP75"
-        Me.ucrChkP75.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkP75.TabIndex = 1
+        Me.ucrChkCircRange.AutoSize = True
+        Me.ucrChkCircRange.Checked = False
+        Me.ucrChkCircRange.Location = New System.Drawing.Point(32, 70)
+        Me.ucrChkCircRange.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkCircRange.Name = "ucrChkCircRange"
+        Me.ucrChkCircRange.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkCircRange.TabIndex = 1
         '
-        'grpNotOrderedFactor
+        'ucrChkAngVar
         '
-        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkRange)
-        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMaximum)
-        Me.grpNotOrderedFactor.Controls.Add(Me.ucrChkMinimum)
-        Me.grpNotOrderedFactor.Location = New System.Drawing.Point(10, 92)
-        Me.grpNotOrderedFactor.Name = "grpNotOrderedFactor"
-        Me.grpNotOrderedFactor.Size = New System.Drawing.Size(393, 51)
-        Me.grpNotOrderedFactor.TabIndex = 1
-        Me.grpNotOrderedFactor.TabStop = False
-        Me.grpNotOrderedFactor.Tag = "All_but_unordered_Factor"
-        Me.grpNotOrderedFactor.Text = "All but (unordered) Factor"
+        Me.ucrChkAngVar.AutoSize = True
+        Me.ucrChkAngVar.Checked = False
+        Me.ucrChkAngVar.Location = New System.Drawing.Point(320, 32)
+        Me.ucrChkAngVar.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkAngVar.Name = "ucrChkAngVar"
+        Me.ucrChkAngVar.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkAngVar.TabIndex = 4
         '
-        'ucrChkRange
+        'ucrChkrho
         '
-        Me.ucrChkRange.AutoSize = True
-        Me.ucrChkRange.Checked = False
-        Me.ucrChkRange.Location = New System.Drawing.Point(292, 19)
-        Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkRange.Name = "ucrChkRange"
-        Me.ucrChkRange.Size = New System.Drawing.Size(85, 23)
-        Me.ucrChkRange.TabIndex = 1
+        Me.ucrChkrho.AutoSize = True
+        Me.ucrChkrho.Checked = False
+        Me.ucrChkrho.Location = New System.Drawing.Point(186, 70)
+        Me.ucrChkrho.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkrho.Name = "ucrChkrho"
+        Me.ucrChkrho.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkrho.TabIndex = 3
         '
-        'ucrChkMaximum
+        'ucrChkAngDev
         '
-        Me.ucrChkMaximum.AutoSize = True
-        Me.ucrChkMaximum.Checked = False
-        Me.ucrChkMaximum.Location = New System.Drawing.Point(168, 19)
-        Me.ucrChkMaximum.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMaximum.Name = "ucrChkMaximum"
-        Me.ucrChkMaximum.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkMaximum.TabIndex = 2
+        Me.ucrChkAngDev.AutoSize = True
+        Me.ucrChkAngDev.Checked = False
+        Me.ucrChkAngDev.Location = New System.Drawing.Point(320, 70)
+        Me.ucrChkAngDev.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkAngDev.Name = "ucrChkAngDev"
+        Me.ucrChkAngDev.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkAngDev.TabIndex = 5
         '
-        'ucrChkMinimum
+        'ucrChkVar
         '
-        Me.ucrChkMinimum.AutoSize = True
-        Me.ucrChkMinimum.Checked = False
-        Me.ucrChkMinimum.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkMinimum.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMinimum.Name = "ucrChkMinimum"
-        Me.ucrChkMinimum.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkMinimum.TabIndex = 0
+        Me.ucrChkVar.AutoSize = True
+        Me.ucrChkVar.Checked = False
+        Me.ucrChkVar.Location = New System.Drawing.Point(186, 28)
+        Me.ucrChkVar.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkVar.Name = "ucrChkVar"
+        Me.ucrChkVar.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkVar.TabIndex = 2
         '
-        'grpNumeric
+        'ucrChkSd
         '
-        Me.grpNumeric.Controls.Add(Me.ucrChkVariance)
-        Me.grpNumeric.Controls.Add(Me.ucrChkMedian)
-        Me.grpNumeric.Controls.Add(Me.ucrChkStdDev)
-        Me.grpNumeric.Controls.Add(Me.ucrChkSum)
-        Me.grpNumeric.Controls.Add(Me.ucrChkMean)
-        Me.grpNumeric.Location = New System.Drawing.Point(10, 149)
-        Me.grpNumeric.Name = "grpNumeric"
-        Me.grpNumeric.Size = New System.Drawing.Size(393, 78)
-        Me.grpNumeric.TabIndex = 2
-        Me.grpNumeric.TabStop = False
-        Me.grpNumeric.Tag = "Numeric"
-        Me.grpNumeric.Text = "Numeric"
+        Me.ucrChkSd.AutoSize = True
+        Me.ucrChkSd.Checked = False
+        Me.ucrChkSd.Location = New System.Drawing.Point(32, 28)
+        Me.ucrChkSd.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkSd.Name = "ucrChkSd"
+        Me.ucrChkSd.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkSd.TabIndex = 0
         '
-        'ucrChkVariance
+        'ucrChkCircMedian
         '
-        Me.ucrChkVariance.AutoSize = True
-        Me.ucrChkVariance.Checked = False
-        Me.ucrChkVariance.Location = New System.Drawing.Point(168, 49)
-        Me.ucrChkVariance.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkVariance.Name = "ucrChkVariance"
-        Me.ucrChkVariance.Size = New System.Drawing.Size(157, 23)
-        Me.ucrChkVariance.TabIndex = 3
+        Me.ucrChkCircMedian.AutoSize = True
+        Me.ucrChkCircMedian.Checked = False
+        Me.ucrChkCircMedian.Location = New System.Drawing.Point(186, 39)
+        Me.ucrChkCircMedian.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkCircMedian.Name = "ucrChkCircMedian"
+        Me.ucrChkCircMedian.Size = New System.Drawing.Size(122, 51)
+        Me.ucrChkCircMedian.TabIndex = 2
         '
-        'ucrChkMedian
+        'ucrChkMin
         '
-        Me.ucrChkMedian.AutoSize = True
-        Me.ucrChkMedian.Checked = False
-        Me.ucrChkMedian.Location = New System.Drawing.Point(292, 19)
-        Me.ucrChkMedian.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMedian.Name = "ucrChkMedian"
-        Me.ucrChkMedian.Size = New System.Drawing.Size(103, 23)
-        Me.ucrChkMedian.TabIndex = 4
+        Me.ucrChkMin.AutoSize = True
+        Me.ucrChkMin.Checked = False
+        Me.ucrChkMin.Location = New System.Drawing.Point(320, 39)
+        Me.ucrChkMin.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkMin.Name = "ucrChkMin"
+        Me.ucrChkMin.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkMin.TabIndex = 4
         '
-        'ucrChkStdDev
+        'ucrChkMedianH
         '
-        Me.ucrChkStdDev.AutoSize = True
-        Me.ucrChkStdDev.Checked = False
-        Me.ucrChkStdDev.Location = New System.Drawing.Point(7, 49)
-        Me.ucrChkStdDev.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkStdDev.Name = "ucrChkStdDev"
-        Me.ucrChkStdDev.Size = New System.Drawing.Size(155, 23)
-        Me.ucrChkStdDev.TabIndex = 1
+        Me.ucrChkMedianH.AutoSize = True
+        Me.ucrChkMedianH.Checked = False
+        Me.ucrChkMedianH.Location = New System.Drawing.Point(450, 39)
+        Me.ucrChkMedianH.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkMedianH.Name = "ucrChkMedianH"
+        Me.ucrChkMedianH.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkMedianH.TabIndex = 6
         '
-        'ucrChkSum
+        'ucrChkQ3
         '
-        Me.ucrChkSum.AutoSize = True
-        Me.ucrChkSum.Checked = False
-        Me.ucrChkSum.Location = New System.Drawing.Point(7, 19)
-        Me.ucrChkSum.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkSum.Name = "ucrChkSum"
-        Me.ucrChkSum.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkSum.TabIndex = 0
+        Me.ucrChkQ3.AutoSize = True
+        Me.ucrChkQ3.Checked = False
+        Me.ucrChkQ3.Location = New System.Drawing.Point(186, 81)
+        Me.ucrChkQ3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkQ3.Name = "ucrChkQ3"
+        Me.ucrChkQ3.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkQ3.TabIndex = 3
         '
-        'ucrChkMean
+        'ucrChkQ1
         '
-        Me.ucrChkMean.AutoSize = True
-        Me.ucrChkMean.Checked = False
-        Me.ucrChkMean.Location = New System.Drawing.Point(168, 19)
-        Me.ucrChkMean.Margin = New System.Windows.Forms.Padding(5)
-        Me.ucrChkMean.Name = "ucrChkMean"
-        Me.ucrChkMean.Size = New System.Drawing.Size(100, 23)
-        Me.ucrChkMean.TabIndex = 2
+        Me.ucrChkQ1.AutoSize = True
+        Me.ucrChkQ1.Checked = False
+        Me.ucrChkQ1.Location = New System.Drawing.Point(32, 81)
+        Me.ucrChkQ1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkQ1.Name = "ucrChkQ1"
+        Me.ucrChkQ1.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkQ1.TabIndex = 1
         '
-        'tbSummaries
+        'ucrChkMax
         '
-        Me.tbSummaries.Controls.Add(Me.tbsum)
-        Me.tbSummaries.Controls.Add(Me.tbMore)
-        Me.tbSummaries.Controls.Add(Me.tbTwoVariables)
-        Me.tbSummaries.Controls.Add(Me.tbPosition)
-        Me.tbSummaries.Controls.Add(Me.tbModel)
-        Me.tbSummaries.Controls.Add(Me.tbCircular)
-        Me.tbSummaries.Location = New System.Drawing.Point(6, 7)
-        Me.tbSummaries.Name = "tbSummaries"
-        Me.tbSummaries.SelectedIndex = 0
-        Me.tbSummaries.Size = New System.Drawing.Size(417, 409)
-        Me.tbSummaries.TabIndex = 0
+        Me.ucrChkMax.AutoSize = True
+        Me.ucrChkMax.Checked = False
+        Me.ucrChkMax.Location = New System.Drawing.Point(320, 81)
+        Me.ucrChkMax.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkMax.Name = "ucrChkMax"
+        Me.ucrChkMax.Size = New System.Drawing.Size(120, 51)
+        Me.ucrChkMax.TabIndex = 5
         '
-        'ucrButtonsSummaries
+        'ucrChkCircMean
         '
-        Me.ucrButtonsSummaries.AutoSize = True
-        Me.ucrButtonsSummaries.Location = New System.Drawing.Point(100, 418)
-        Me.ucrButtonsSummaries.Margin = New System.Windows.Forms.Padding(4)
-        Me.ucrButtonsSummaries.Name = "ucrButtonsSummaries"
-        Me.ucrButtonsSummaries.Size = New System.Drawing.Size(224, 31)
-        Me.ucrButtonsSummaries.TabIndex = 1
+        Me.ucrChkCircMean.AutoSize = True
+        Me.ucrChkCircMean.Checked = False
+        Me.ucrChkCircMean.Location = New System.Drawing.Point(32, 39)
+        Me.ucrChkCircMean.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6)
+        Me.ucrChkCircMean.Name = "ucrChkCircMean"
+        Me.ucrChkCircMean.Size = New System.Drawing.Size(129, 51)
+        Me.ucrChkCircMean.TabIndex = 0
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.cmdOptions)
+        Me.GroupBox1.Controls.Add(Me.ucrChkProportionsPercentages)
+        Me.GroupBox1.Location = New System.Drawing.Point(15, 528)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4)
+        Me.GroupBox1.Size = New System.Drawing.Size(590, 62)
+        Me.GroupBox1.TabIndex = 4
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Percentages"
         '
         'sdgSummaries
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
         Me.AutoSize = True
-        Me.ClientSize = New System.Drawing.Size(429, 448)
+        Me.ClientSize = New System.Drawing.Size(644, 698)
         Me.Controls.Add(Me.ucrButtonsSummaries)
         Me.Controls.Add(Me.tbSummaries)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.Margin = New System.Windows.Forms.Padding(4)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "sdgSummaries"
@@ -1620,6 +1695,8 @@ Partial Class sdgSummaries
         Me.grpNumeric.ResumeLayout(False)
         Me.grpNumeric.PerformLayout()
         Me.tbSummaries.ResumeLayout(False)
+        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1749,4 +1826,7 @@ Partial Class sdgSummaries
     Friend WithEvents ucrChkSample As ucrCheck
     Friend WithEvents ucrChkSetseed As ucrCheck
     Friend WithEvents ucrNudSeed As ucrNud
+    Friend WithEvents ucrChkProportionsPercentages As ucrCheck
+    Friend WithEvents cmdOptions As Button
+    Friend WithEvents GroupBox1 As GroupBox
 End Class
\ No newline at end of file
diff --git a/instat/sdgSummaries.vb b/instat/sdgSummaries.vb
index 79d90333c37..ee20059ba3f 100644
--- a/instat/sdgSummaries.vb
+++ b/instat/sdgSummaries.vb
@@ -16,7 +16,7 @@
 
 Imports instat.Translations
 Public Class sdgSummaries
-    Public clsListFunction, clsDefaultFunction, clsConcFunction As New RFunction
+    Public clsListFunction, clsDefaultFunction, clsConcFunction, clsDummyFunction As New RFunction
     Public bControlsInitialised As Boolean = False
     Private lstCheckboxes As New List(Of ucrCheck)
     Private lstVerifCheckboxes As New List(Of ucrCheck)
@@ -25,6 +25,7 @@ Public Class sdgSummaries
     Private strWeightLabel As String
     Public bEnable2VariableTab As Boolean = True
     Public bOkEnabled As Boolean = True
+    Private bResetSubdialog As Boolean = False
 
     Private Sub sdgDescribe_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
@@ -327,6 +328,10 @@ Public Class sdgSummaries
         ucrChkSetseed.AddParameterPresentCondition(True, "seed")
         ucrChkSetseed.AddParameterPresentCondition(False, "seed", False)
 
+        ucrChkProportionsPercentages.SetParameter(New RParameter("percentage_type"))
+        ucrChkProportionsPercentages.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34))
+        ucrChkProportionsPercentages.SetText("Add Percentages")
+
         ucrNudSeed.SetParameter(New RParameter("seed", 11))
 
         lstVerifCheckboxes.AddRange({ucrChkCorrelations, ucrChkCoefDetermination, ucrChkCoefPersistence, ucrChkIndexOfAgreement, ucrChkKlingGuptaEfficiency, ucrChkMeanAbsoluteError, ucrChkModifiedIndexOfAgreement, ucrChkMeanError, ucrChkModNashSutcliffeEff, ucrChkMeanSquaredError, ucrChkNormRootMeanSquaredError, ucrChkNashSutcliffeEfficiency, ucrChkPercentBias, ucrChkRelativeIndexOfAgreement, ucrChkRootMeanSquaredError, ucrChkRelativeNashSutcliffeEff, ucrChkRatioOfStandardDeviation, ucrChkRatioOfRootMeanSquaredError, ucrChkSumOfSquaredResiduals, ucrChkVolumetricEfficiency})
@@ -349,6 +354,8 @@ Public Class sdgSummaries
             ctrTemp.SetParameterIncludeArgumentName(False)
             ctrTemp.SetRDefault(Chr(34) & Chr(34))
         Next
+
+        cmdOptions.Visible = False
         bControlsInitialised = True
         TwoVariablesControls()
         PositionOptions()
@@ -393,6 +400,8 @@ Public Class sdgSummaries
         ucrChkCorrelations.SetText("Correlations" & strWeightLabel)
         ucrChkCovariance.SetText("Covariance" & strWeightLabel)
 
+        clsDummyFunction.AddParameter("percentage_type", "none")
+
         'This is meant to force selector select the current dataframe as selected in the main dialog
         ucrBaseSelector = ucrNewBaseSelector
         If ucrBaseSelector IsNot Nothing AndAlso ucrBaseSelector.strCurrentDataFrame <> "" Then
@@ -490,10 +499,12 @@ Public Class sdgSummaries
         ucrChkSumOfSquaredResiduals.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True)
         ucrChkVolumetricEfficiency.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True)
         ucrChkSample.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True)
-
+        ucrChkProportionsPercentages.SetRCode(clsDefaultFunction, bReset, bCloneIfNeeded:=True)
         If bReset Then
             ucrSelectorSecondVariable.Reset()
             ucrSelectorOrderBy.Reset()
+
+
             If strDefaultTab <> "" Then
                 For i As Integer = 0 To tbSummaries.TabPages.Count - 1
                     If tbSummaries.TabPages(i).Text = strDefaultTab Then
@@ -510,6 +521,7 @@ Public Class sdgSummaries
                 tbSummaries.SelectedIndex = 0
             End If
         End If
+        bResetSubdialog = True
     End Sub
 
     Public ReadOnly Property SummaryCount As Integer
@@ -605,6 +617,16 @@ Public Class sdgSummaries
         frmMain.clsRLink.RunScript(clsHelp.ToScript, strComment:="Opening help page for" & " " & strPackageName & " " & "Package. Generated from dialog Modelling", iCallType:=2, bSeparateThread:=False, bUpdateGrids:=False)
     End Sub
 
+    Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click
+        sdgProportionsPercentages.SetRFunction(clsDefaultFunction, bResetSubdialog)
+        sdgProportionsPercentages.ShowDialog()
+        bResetSubdialog = False
+    End Sub
+
+    Private Sub ucrChkProportionsPercentages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlValueChanged
+        cmdOptions.Visible = ucrChkProportionsPercentages.Checked
+    End Sub
+
     Private Sub ucrChkOrderBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOrderBy.ControlValueChanged
         PositionOptions()
         OrderByCheckEnabled()
diff --git a/instat/sdgTimeSeries.vb b/instat/sdgTimeSeries.vb
index 708ca1bff9c..c6c7eafe921 100644
--- a/instat/sdgTimeSeries.vb
+++ b/instat/sdgTimeSeries.vb
@@ -56,6 +56,7 @@ Public Class sdgTimeSeries
     End Sub
 
     Public Sub InitialiseControls()
+        ucrButtonsSummaries.iHelpTopicID = 268
         ucrPnlSummaries.AddRadioButton(rdoComparison)
         ucrPnlSummaries.AddRadioButton(rdoIndividual)
 
diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R
index 7a4768079d3..5ecfb1f0c10 100644
--- a/instat/static/InstatObject/R/install_packages.R
+++ b/instat/static/InstatObject/R/install_packages.R
@@ -176,6 +176,7 @@ pkgs <-
     "waffle",
     # Data and Code Behind the Stories and Interactives at 'FiveThirtyEight'
     "fivethirtyeight",
+    "CGPfunctions",
     "collapse"
  )
 pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version)
diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb
index 16063dcb64e..728630115ec 100644
--- a/instat/ucrReceiverMultiple.vb
+++ b/instat/ucrReceiverMultiple.vb
@@ -26,7 +26,6 @@ Public Class ucrReceiverMultiple
         If bFirstLoad Then
             If lstSelectedVariables.Columns.Count = 0 Then
                 lstSelectedVariables.Columns.Add("Selected Data")
-                lstSelectedVariables.Columns(0).Width = lstSelectedVariables.Width - 25
             End If
             'by default multiple receivers will not be autoswitched on selection change
             bAutoSwitchFromReceiver = False
@@ -168,12 +167,21 @@ Public Class ucrReceiverMultiple
         'it's not clear when the receiver will ever have more than one data frame
 
         'reset the header text with the name
-        lstSelectedVariables.Groups(0).Header = lstSelectedVariables.Groups(0).Name
+        lstSelectedVariables.Groups(0).Header = ShortenString(lstSelectedVariables.Groups(0).Name)
         If lstSelectedVariables.Groups.Count = 1 AndAlso lstSelectedVariables.Items.Count > 0 Then
             lstSelectedVariables.Groups(0).Header = lstSelectedVariables.Groups(0).Header & " (" & lstSelectedVariables.Items.Count & ")"
         End If
     End Sub
 
+    Private Function ShortenString(strText As String) As String
+        Dim maxLength As Integer = 10
+        If strText.Length > maxLength Then
+            ' Trim the string to the specified length and add ellipsis
+            Return strText.Substring(0, maxLength) & "..."
+        End If
+        Return strText
+    End Function
+
     Public Overrides Function IsEmpty() As Boolean
         Return lstSelectedVariables.Items.Count = 0
     End Function
@@ -502,6 +510,12 @@ Public Class ucrReceiverMultiple
         CheckSingleType()
     End Sub
 
+    Private Sub lstSelectedVariables_ClientSizeChanged(ByVal sender As Object, ByVal e As EventArgs) Handles lstSelectedVariables.ClientSizeChanged
+        If lstSelectedVariables.Columns.Count > 0 Then
+            lstSelectedVariables.Columns(0).Width = lstSelectedVariables.ClientSize.Width
+        End If
+    End Sub
+
     Private Sub ucrReceiverMultiple_SelectionChanged(sender As Object, e As EventArgs) Handles Me.SelectionChanged
         CheckSingleType()
     End Sub