Many small tweaks

11 files changed, 134 insertions, 104 deletions

diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs
index b86874f..0fb9827 100644
--- a/grapher/Constants/Constants.cs
+++ b/grapher/Constants/Constants.cs
@@ -46,6 +46,12 @@ namespace grapher
         /// <summary> Horizontal separation between left side of single dropdown and left side of labels beneath dropdown </summary>
         public const int DropDownLeftSeparation = 10;
 
+        /// <summary> Height of sensitivity chart when displayed alone. </summary>
+        public const int SensitivityChartAloneHeight = 450;
+
+        /// <summary> Height of sensitivity chart when displayed alongside Velocity and Gain charts. </summary>
+        public const int SensitivityChartTogetherHeight = 328;
+
         /// <summary> Width of charts when widened </summary>
         public const int WideChartWidth = 723;
 
@@ -115,10 +121,10 @@ namespace grapher
         public const string DefaultSettingsFileName = @"settings.json";
 
         /// <summary> Text to direcitonality panel title when panel is closed. </summary>
-        public const string DirectionalityTitleClosed = "Directionality\u25BC";
+        public const string DirectionalityTitleClosed = "Anisotropy\u25BC";
 
         /// <summary> Text to direcitonality panel title when panel is open. </summary>
-        public const string DirectionalityTitleOpen = "Directionality\u25B2";
+        public const string DirectionalityTitleOpen = "Anisotropy\u25B2";
 
         /// <summary> Style used by System.Double.Parse </summary>
         public const NumberStyles FloatStyle = NumberStyles.Float | NumberStyles.AllowThousands;
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index 6e1bc3d..d5dc37f 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -71,7 +71,14 @@ namespace grapher
             System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawAcceleration));
             this.optionsPanel = new System.Windows.Forms.Panel();
+            this.FakeBox = new System.Windows.Forms.CheckBox();
             this.DirectionalityPanel = new System.Windows.Forms.Panel();
+            this.LpNormActiveValue = new System.Windows.Forms.Label();
+            this.RangeActiveValueY = new System.Windows.Forms.Label();
+            this.RangeActiveValueX = new System.Windows.Forms.Label();
+            this.DomainActiveValueY = new System.Windows.Forms.Label();
+            this.DomainActiveValueX = new System.Windows.Forms.Label();
+            this.DirectionalityActiveValueTitle = new System.Windows.Forms.Label();
             this.ByComponentCheckBox = new System.Windows.Forms.CheckBox();
             this.WholeCheckBox = new System.Windows.Forms.CheckBox();
             this.DirectionalityRangeLabel = new System.Windows.Forms.Label();
@@ -180,13 +187,6 @@ namespace grapher
             this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
-            this.DirectionalityActiveValueTitle = new System.Windows.Forms.Label();
-            this.DomainActiveValueX = new System.Windows.Forms.Label();
-            this.DomainActiveValueY = new System.Windows.Forms.Label();
-            this.RangeActiveValueX = new System.Windows.Forms.Label();
-            this.RangeActiveValueY = new System.Windows.Forms.Label();
-            this.LpNormActiveValue = new System.Windows.Forms.Label();
-            this.FakeBox = new System.Windows.Forms.CheckBox();
             this.optionsPanel.SuspendLayout();
             this.DirectionalityPanel.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -283,6 +283,16 @@ namespace grapher
             this.optionsPanel.TabIndex = 34;
             this.optionsPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.optionsPanel_Paint);
             // 
+            // FakeBox
+            // 
+            this.FakeBox.AutoSize = true;
+            this.FakeBox.Location = new System.Drawing.Point(31, 538);
+            this.FakeBox.Name = "FakeBox";
+            this.FakeBox.Size = new System.Drawing.Size(47, 17);
+            this.FakeBox.TabIndex = 151;
+            this.FakeBox.Text = "fake";
+            this.FakeBox.UseVisualStyleBackColor = true;
+            // 
             // DirectionalityPanel
             // 
             this.DirectionalityPanel.Controls.Add(this.LpNormActiveValue);
@@ -304,15 +314,70 @@ namespace grapher
             this.DirectionalityPanel.Controls.Add(this.DomainBoxY);
             this.DirectionalityPanel.Controls.Add(this.DomainBoxX);
             this.DirectionalityPanel.Controls.Add(this.DirectionalityLabel);
-            this.DirectionalityPanel.Location = new System.Drawing.Point(28, 369);
+            this.DirectionalityPanel.Location = new System.Drawing.Point(12, 369);
             this.DirectionalityPanel.Name = "DirectionalityPanel";
-            this.DirectionalityPanel.Size = new System.Drawing.Size(301, 126);
+            this.DirectionalityPanel.Size = new System.Drawing.Size(298, 135);
             this.DirectionalityPanel.TabIndex = 150;
             // 
+            // LpNormActiveValue
+            // 
+            this.LpNormActiveValue.AutoSize = true;
+            this.LpNormActiveValue.Location = new System.Drawing.Point(185, 81);
+            this.LpNormActiveValue.Name = "LpNormActiveValue";
+            this.LpNormActiveValue.Size = new System.Drawing.Size(13, 13);
+            this.LpNormActiveValue.TabIndex = 18;
+            this.LpNormActiveValue.Text = "0";
+            // 
+            // RangeActiveValueY
+            // 
+            this.RangeActiveValueY.AutoSize = true;
+            this.RangeActiveValueY.Location = new System.Drawing.Point(204, 55);
+            this.RangeActiveValueY.Name = "RangeActiveValueY";
+            this.RangeActiveValueY.Size = new System.Drawing.Size(13, 13);
+            this.RangeActiveValueY.TabIndex = 17;
+            this.RangeActiveValueY.Text = "0";
+            // 
+            // RangeActiveValueX
+            // 
+            this.RangeActiveValueX.AutoSize = true;
+            this.RangeActiveValueX.Location = new System.Drawing.Point(177, 55);
+            this.RangeActiveValueX.Name = "RangeActiveValueX";
+            this.RangeActiveValueX.Size = new System.Drawing.Size(13, 13);
+            this.RangeActiveValueX.TabIndex = 16;
+            this.RangeActiveValueX.Text = "0";
+            // 
+            // DomainActiveValueY
+            // 
+            this.DomainActiveValueY.AutoSize = true;
+            this.DomainActiveValueY.Location = new System.Drawing.Point(204, 28);
+            this.DomainActiveValueY.Name = "DomainActiveValueY";
+            this.DomainActiveValueY.Size = new System.Drawing.Size(13, 13);
+            this.DomainActiveValueY.TabIndex = 15;
+            this.DomainActiveValueY.Text = "0";
+            // 
+            // DomainActiveValueX
+            // 
+            this.DomainActiveValueX.AutoSize = true;
+            this.DomainActiveValueX.Location = new System.Drawing.Point(177, 28);
+            this.DomainActiveValueX.Name = "DomainActiveValueX";
+            this.DomainActiveValueX.Size = new System.Drawing.Size(13, 13);
+            this.DomainActiveValueX.TabIndex = 14;
+            this.DomainActiveValueX.Text = "0";
+            // 
+            // DirectionalityActiveValueTitle
+            // 
+            this.DirectionalityActiveValueTitle.AutoSize = true;
+            this.DirectionalityActiveValueTitle.Location = new System.Drawing.Point(176, 9);
+            this.DirectionalityActiveValueTitle.Name = "DirectionalityActiveValueTitle";
+            this.DirectionalityActiveValueTitle.Size = new System.Drawing.Size(41, 13);
+            this.DirectionalityActiveValueTitle.TabIndex = 13;
+            this.DirectionalityActiveValueTitle.Text = "Current";
+            // 
             // ByComponentCheckBox
             // 
+            this.ByComponentCheckBox.AutoCheck = false;
             this.ByComponentCheckBox.AutoSize = true;
-            this.ByComponentCheckBox.Location = new System.Drawing.Point(163, 104);
+            this.ByComponentCheckBox.Location = new System.Drawing.Point(180, 104);
             this.ByComponentCheckBox.Name = "ByComponentCheckBox";
             this.ByComponentCheckBox.Size = new System.Drawing.Size(95, 17);
             this.ByComponentCheckBox.TabIndex = 12;
@@ -321,6 +386,7 @@ namespace grapher
             // 
             // WholeCheckBox
             // 
+            this.WholeCheckBox.AutoCheck = false;
             this.WholeCheckBox.AutoSize = true;
             this.WholeCheckBox.Location = new System.Drawing.Point(43, 104);
             this.WholeCheckBox.Name = "WholeCheckBox";
@@ -332,7 +398,7 @@ namespace grapher
             // DirectionalityRangeLabel
             // 
             this.DirectionalityRangeLabel.AutoSize = true;
-            this.DirectionalityRangeLabel.Location = new System.Drawing.Point(9, 55);
+            this.DirectionalityRangeLabel.Location = new System.Drawing.Point(24, 55);
             this.DirectionalityRangeLabel.Name = "DirectionalityRangeLabel";
             this.DirectionalityRangeLabel.Size = new System.Drawing.Size(39, 13);
             this.DirectionalityRangeLabel.TabIndex = 10;
@@ -341,7 +407,7 @@ namespace grapher
             // DirectionalDomainLabel
             // 
             this.DirectionalDomainLabel.AutoSize = true;
-            this.DirectionalDomainLabel.Location = new System.Drawing.Point(9, 28);
+            this.DirectionalDomainLabel.Location = new System.Drawing.Point(23, 28);
             this.DirectionalDomainLabel.Name = "DirectionalDomainLabel";
             this.DirectionalDomainLabel.Size = new System.Drawing.Size(43, 13);
             this.DirectionalDomainLabel.TabIndex = 9;
@@ -349,7 +415,7 @@ namespace grapher
             // 
             // LpNormBox
             // 
-            this.LpNormBox.Location = new System.Drawing.Point(78, 78);
+            this.LpNormBox.Location = new System.Drawing.Point(94, 78);
             this.LpNormBox.Name = "LpNormBox";
             this.LpNormBox.Size = new System.Drawing.Size(76, 20);
             this.LpNormBox.TabIndex = 8;
@@ -357,7 +423,7 @@ namespace grapher
             // LPNormLabel
             // 
             this.LPNormLabel.AutoSize = true;
-            this.LPNormLabel.Location = new System.Drawing.Point(9, 81);
+            this.LPNormLabel.Location = new System.Drawing.Point(23, 81);
             this.LPNormLabel.Name = "LPNormLabel";
             this.LPNormLabel.Size = new System.Drawing.Size(47, 13);
             this.LPNormLabel.TabIndex = 7;
@@ -366,7 +432,7 @@ namespace grapher
             // DirectionalityY
             // 
             this.DirectionalityY.AutoSize = true;
-            this.DirectionalityY.Location = new System.Drawing.Point(129, 9);
+            this.DirectionalityY.Location = new System.Drawing.Point(147, 9);
             this.DirectionalityY.Name = "DirectionalityY";
             this.DirectionalityY.Size = new System.Drawing.Size(14, 13);
             this.DirectionalityY.TabIndex = 6;
@@ -375,7 +441,7 @@ namespace grapher
             // DirectionalityX
             // 
             this.DirectionalityX.AutoSize = true;
-            this.DirectionalityX.Location = new System.Drawing.Point(86, 9);
+            this.DirectionalityX.Location = new System.Drawing.Point(103, 9);
             this.DirectionalityX.Name = "DirectionalityX";
             this.DirectionalityX.Size = new System.Drawing.Size(14, 13);
             this.DirectionalityX.TabIndex = 5;
@@ -383,28 +449,28 @@ namespace grapher
             // 
             // RangeBoxY
             // 
-            this.RangeBoxY.Location = new System.Drawing.Point(120, 52);
+            this.RangeBoxY.Location = new System.Drawing.Point(136, 52);
             this.RangeBoxY.Name = "RangeBoxY";
             this.RangeBoxY.Size = new System.Drawing.Size(34, 20);
             this.RangeBoxY.TabIndex = 4;
             // 
             // RangeBoxX
             // 
-            this.RangeBoxX.Location = new System.Drawing.Point(78, 52);
+            this.RangeBoxX.Location = new System.Drawing.Point(94, 52);
             this.RangeBoxX.Name = "RangeBoxX";
             this.RangeBoxX.Size = new System.Drawing.Size(34, 20);
             this.RangeBoxX.TabIndex = 3;
             // 
             // DomainBoxY
             // 
-            this.DomainBoxY.Location = new System.Drawing.Point(120, 25);
+            this.DomainBoxY.Location = new System.Drawing.Point(136, 25);
             this.DomainBoxY.Name = "DomainBoxY";
             this.DomainBoxY.Size = new System.Drawing.Size(34, 20);
             this.DomainBoxY.TabIndex = 2;
             // 
             // DomainBoxX
             // 
-            this.DomainBoxX.Location = new System.Drawing.Point(78, 25);
+            this.DomainBoxX.Location = new System.Drawing.Point(94, 25);
             this.DomainBoxX.Name = "DomainBoxX";
             this.DomainBoxX.Size = new System.Drawing.Size(34, 20);
             this.DomainBoxX.TabIndex = 1;
@@ -1422,70 +1488,6 @@ namespace grapher
             title6.Text = "Sensitivity";
             this.AccelerationChart.Titles.Add(title6);
             // 
-            // DirectionalityActiveValueTitle
-            // 
-            this.DirectionalityActiveValueTitle.AutoSize = true;
-            this.DirectionalityActiveValueTitle.Location = new System.Drawing.Point(169, 9);
-            this.DirectionalityActiveValueTitle.Name = "DirectionalityActiveValueTitle";
-            this.DirectionalityActiveValueTitle.Size = new System.Drawing.Size(41, 13);
-            this.DirectionalityActiveValueTitle.TabIndex = 13;
-            this.DirectionalityActiveValueTitle.Text = "Current";
-            // 
-            // DomainActiveValueX
-            // 
-            this.DomainActiveValueX.AutoSize = true;
-            this.DomainActiveValueX.Location = new System.Drawing.Point(169, 28);
-            this.DomainActiveValueX.Name = "DomainActiveValueX";
-            this.DomainActiveValueX.Size = new System.Drawing.Size(13, 13);
-            this.DomainActiveValueX.TabIndex = 14;
-            this.DomainActiveValueX.Text = "0";
-            // 
-            // DomainActiveValueY
-            // 
-            this.DomainActiveValueY.AutoSize = true;
-            this.DomainActiveValueY.Location = new System.Drawing.Point(189, 28);
-            this.DomainActiveValueY.Name = "DomainActiveValueY";
-            this.DomainActiveValueY.Size = new System.Drawing.Size(13, 13);
-            this.DomainActiveValueY.TabIndex = 15;
-            this.DomainActiveValueY.Text = "0";
-            // 
-            // RangeActiveValueX
-            // 
-            this.RangeActiveValueX.AutoSize = true;
-            this.RangeActiveValueX.Location = new System.Drawing.Point(169, 55);
-            this.RangeActiveValueX.Name = "RangeActiveValueX";
-            this.RangeActiveValueX.Size = new System.Drawing.Size(13, 13);
-            this.RangeActiveValueX.TabIndex = 16;
-            this.RangeActiveValueX.Text = "0";
-            // 
-            // RangeActiveValueY
-            // 
-            this.RangeActiveValueY.AutoSize = true;
-            this.RangeActiveValueY.Location = new System.Drawing.Point(188, 55);
-            this.RangeActiveValueY.Name = "RangeActiveValueY";
-            this.RangeActiveValueY.Size = new System.Drawing.Size(13, 13);
-            this.RangeActiveValueY.TabIndex = 17;
-            this.RangeActiveValueY.Text = "0";
-            // 
-            // LpNormActiveValue
-            // 
-            this.LpNormActiveValue.AutoSize = true;
-            this.LpNormActiveValue.Location = new System.Drawing.Point(180, 78);
-            this.LpNormActiveValue.Name = "LpNormActiveValue";
-            this.LpNormActiveValue.Size = new System.Drawing.Size(13, 13);
-            this.LpNormActiveValue.TabIndex = 18;
-            this.LpNormActiveValue.Text = "0";
-            // 
-            // FakeBox
-            // 
-            this.FakeBox.AutoSize = true;
-            this.FakeBox.Location = new System.Drawing.Point(28, 502);
-            this.FakeBox.Name = "FakeBox";
-            this.FakeBox.Size = new System.Drawing.Size(47, 17);
-            this.FakeBox.TabIndex = 151;
-            this.FakeBox.Text = "fake";
-            this.FakeBox.UseVisualStyleBackColor = true;
-            // 
             // RawAcceleration
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index 7ed08ef..83af292 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -64,7 +64,6 @@ namespace grapher.Layouts
             IOption limitOption,
             IOption expOption,
             IOption midpointOption,
-            Button button,
             int top)
         {
 
@@ -106,8 +105,7 @@ namespace grapher.Layouts
             IOption offsetOption,
             IOption limitOption,
             IOption expOption,
-            IOption midpointOption,
-            Button button)
+            IOption midpointOption)
         {
             Layout(accelOption,
                 scaleOption,
@@ -117,7 +115,6 @@ namespace grapher.Layouts
                 limitOption,
                 expOption,
                 midpointOption,
-                button,
                 accelOption.Top);
         }
     }
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 045cb23..e125310 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -192,7 +192,7 @@ namespace grapher
 
         private void SetupButtons()
         {
-            WriteButton.Top = AccelCharts.Top + AccelCharts.TopChartHeight - Constants.ButtonVerticalOffset;
+            WriteButton.Top = Constants.SensitivityChartAloneHeight - Constants.ButtonVerticalOffset;
             
             ToggleButton.Appearance = Appearance.Button;
             ToggleButton.FlatStyle = FlatStyle.System;
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index e8def16..de01468 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -376,7 +376,8 @@ namespace grapher.Models
                 domain,
                 range,
                 wholeCheckBox,
-                byComponentCheckBox);
+                byComponentCheckBox,
+                245);
 
             var applyOptions = new ApplyOptions(
                 byComponentXYLock,
diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index b7abb35..ea1345f 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -80,14 +80,6 @@ namespace grapher
             }
         }
 
-        public int TopChartHeight
-        {
-            get
-            {
-                return ChartState.SensitivityChart.Height;
-            }
-        }
-
         private int FormBorderHeight { get; }
 
         private ChartState ChartState { get; set; }
diff --git a/grapher/Models/Charts/ChartState/ChartState.cs b/grapher/Models/Charts/ChartState/ChartState.cs
index 0bb141e..269d269 100644
--- a/grapher/Models/Charts/ChartState/ChartState.cs
+++ b/grapher/Models/Charts/ChartState/ChartState.cs
@@ -77,12 +77,14 @@ namespace grapher.Models.Charts.ChartState
 
         public void ShowVelocityAndGain()
         {
+            SensitivityChart.SetHeight(Constants.SensitivityChartTogetherHeight);
             VelocityChart.Show();
             GainChart.Show();
         }
 
         public void HideVelocityAndGain()
         {
+            SensitivityChart.SetHeight(Constants.SensitivityChartAloneHeight);
             VelocityChart.Hide();
             GainChart.Hide();
         }
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 4410a12..8d3fecb 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -289,7 +289,6 @@ namespace grapher
                 Limit,
                 Exponent,
                 Midpoint,
-                WriteButton,
                 top);
         }
 
diff --git a/grapher/Models/Options/ActiveValueLabelXY.cs b/grapher/Models/Options/ActiveValueLabelXY.cs
index 381779c..f5b593e 100644
--- a/grapher/Models/Options/ActiveValueLabelXY.cs
+++ b/grapher/Models/Options/ActiveValueLabelXY.cs
@@ -140,6 +140,18 @@ namespace grapher.Models.Options
             }
         }
 
+        public void Hide()
+        {
+            X.Hide();
+            Y.Hide();
+        }
+
+        public void Show()
+        {
+            X.Show();
+            Y.Show();
+        }
+
         private void Align (int width)
         {
             FullWidth = width;
diff --git a/grapher/Models/Options/Directionality/DirectionalityOptions.cs b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
index c83ea52..9485877 100644
--- a/grapher/Models/Options/Directionality/DirectionalityOptions.cs
+++ b/grapher/Models/Options/Directionality/DirectionalityOptions.cs
@@ -20,7 +20,8 @@ namespace grapher.Models.Options.Directionality
             OptionXY domain,
             OptionXY range,
             CheckBox wholeCheckBox,
-            CheckBox byComponentCheckBox)
+            CheckBox byComponentCheckBox,
+            int top)
         {
             ContainingPanel = containingPanel;
             DirectionalityLabel = directionalityLabel;
@@ -33,8 +34,18 @@ namespace grapher.Models.Options.Directionality
             WholeCheckBox = wholeCheckBox;
             ByComponentCheckBox = byComponentCheckBox;
 
+            Domain.Fields.LockCheckBox.Checked = false;
+            Range.Fields.LockCheckBox.Checked = false;
+            Domain.Fields.LockCheckBox.Enabled = false;
+            Range.Fields.LockCheckBox.Enabled = false;
+            Domain.Fields.LockCheckBox.Hide();
+            Range.Fields.LockCheckBox.Hide();
+            Domain.Fields.SetSeparate();
+            Range.Fields.SetSeparate();
+
             ContainingPanel.Paint += panel_Paint;
             DirectionalityLabel.Click += title_click;
+            ContainingPanel.Top = top;
             DirectionalityLabel.Left = Constants.DirectionalityTitlePad;
             DirectionalityLabel.Top = Constants.DirectionalityTitlePad;
             IsHidden = false;
@@ -62,6 +73,10 @@ namespace grapher.Models.Options.Directionality
 
         public CheckBox ByComponentCheckBox { get; }
 
+        public int OpenHeight { get => WholeCheckBox.Bottom - DirectionalityLabel.Top + 2 * Constants.DirectionalityTitlePad; }
+
+        public int ClosedHeight { get => DirectionalityLabel.Height + 2 * Constants.DirectionalityTitlePad; }
+
         private bool IsHidden { get; set; }
 
         public DomainArgs GetDomainArgs()
@@ -149,6 +164,8 @@ namespace grapher.Models.Options.Directionality
                 LpNorm.Show();
                 Domain.Show();
                 Range.Show();
+                Domain.Fields.LockCheckBox.Hide();
+                Range.Fields.LockCheckBox.Hide();
                 WholeCheckBox.Show();
                 ByComponentCheckBox.Show();
                 DirectionalityLabel.Text = Constants.DirectionalityTitleOpen;
@@ -173,13 +190,13 @@ namespace grapher.Models.Options.Directionality
 
         private void DrawHidden()
         {
-            ContainingPanel.Height = DirectionalityLabel.Height + 2 * Constants.DirectionalityTitlePad;
+            ContainingPanel.Height = ClosedHeight;
             ContainingPanel.Invalidate();
         }
 
         private void DrawShown()
         {
-            ContainingPanel.Height = WholeCheckBox.Bottom - DirectionalityLabel.Top + 2 * Constants.DirectionalityTitlePad;
+            ContainingPanel.Height = OpenHeight;
             ContainingPanel.Invalidate();
         }
 
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index 3557a06..911d26b 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -137,6 +137,7 @@ namespace grapher
             Fields.Hide();
             Fields.LockCheckBox.Hide();
             Label.Hide();
+            ActiveValueLabels.Hide();
         }
 
         public void Show()
@@ -144,6 +145,7 @@ namespace grapher
             Fields.Show();
             Fields.LockCheckBox.Show();
             Label.Show();
+            ActiveValueLabels.Show();
         }
 
         public override void Show(string name)