Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs	(revision 7244)
@@ -56,17 +56,14 @@
       this.displayNameTextBox = new System.Windows.Forms.TextBox();
       this.axisGroupBox = new System.Windows.Forms.GroupBox();
+      this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
       this.label5 = new System.Windows.Forms.Label();
+      this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
       this.label6 = new System.Windows.Forms.Label();
-      this.panel1 = new System.Windows.Forms.Panel();
-      this.yAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
-      this.panel2 = new System.Windows.Forms.Panel();
-      this.xAxisPrimaryRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisSecondaryRadioButton = new System.Windows.Forms.RadioButton();
       this.label9 = new System.Windows.Forms.Label();
       this.histoGramGroupBox = new System.Windows.Forms.GroupBox();
-      this.panel3 = new System.Windows.Forms.Panel();
+      this.binsExactRadioButton = new System.Windows.Forms.RadioButton();
       this.binsApproximatelyRadioButton = new System.Windows.Forms.RadioButton();
-      this.binsExactRadioButton = new System.Windows.Forms.RadioButton();
       this.lineChartGroupBox = new System.Windows.Forms.GroupBox();
       this.lineWidthNumericUpDown = new System.Windows.Forms.NumericUpDown();
@@ -75,23 +72,26 @@
       this.lineStyleComboBox = new System.Windows.Forms.ComboBox();
       this.label8 = new System.Windows.Forms.Label();
+      this.panel1 = new System.Windows.Forms.Panel();
+      this.panel2 = new System.Windows.Forms.Panel();
       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
       this.commonGroupBox.SuspendLayout();
       this.axisGroupBox.SuspendLayout();
+      this.histoGramGroupBox.SuspendLayout();
+      this.lineChartGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
       this.panel1.SuspendLayout();
       this.panel2.SuspendLayout();
-      this.histoGramGroupBox.SuspendLayout();
-      this.panel3.SuspendLayout();
-      this.lineChartGroupBox.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).BeginInit();
       this.SuspendLayout();
       // 
       // chartTypeComboBox
       // 
+      this.chartTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.chartTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.chartTypeComboBox.FormattingEnabled = true;
-      this.chartTypeComboBox.Location = new System.Drawing.Point(89, 45);
+      this.chartTypeComboBox.Location = new System.Drawing.Point(57, 45);
       this.chartTypeComboBox.Name = "chartTypeComboBox";
-      this.chartTypeComboBox.Size = new System.Drawing.Size(211, 21);
-      this.chartTypeComboBox.TabIndex = 1;
+      this.chartTypeComboBox.Size = new System.Drawing.Size(264, 21);
+      this.chartTypeComboBox.TabIndex = 3;
       this.chartTypeComboBox.SelectedValueChanged += new System.EventHandler(this.chartTypeComboBox_SelectedValueChanged);
       // 
@@ -103,8 +103,8 @@
       // 
       this.colorButton.BackColor = System.Drawing.SystemColors.Control;
-      this.colorButton.Location = new System.Drawing.Point(89, 72);
+      this.colorButton.Location = new System.Drawing.Point(56, 72);
       this.colorButton.Name = "colorButton";
       this.colorButton.Size = new System.Drawing.Size(23, 23);
-      this.colorButton.TabIndex = 3;
+      this.colorButton.TabIndex = 5;
       this.colorButton.UseVisualStyleBackColor = false;
       this.colorButton.Click += new System.EventHandler(this.colorButton_Click);
@@ -114,5 +114,5 @@
       this.startIndexZeroCheckBox.AutoSize = true;
       this.startIndexZeroCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.startIndexZeroCheckBox.Location = new System.Drawing.Point(96, 46);
+      this.startIndexZeroCheckBox.Location = new System.Drawing.Point(81, 46);
       this.startIndexZeroCheckBox.Name = "startIndexZeroCheckBox";
       this.startIndexZeroCheckBox.Size = new System.Drawing.Size(15, 14);
@@ -123,5 +123,7 @@
       // binsNumericUpDown
       // 
-      this.binsNumericUpDown.Location = new System.Drawing.Point(44, 19);
+      this.binsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.binsNumericUpDown.Location = new System.Drawing.Point(57, 19);
       this.binsNumericUpDown.Minimum = new decimal(new int[] {
             1,
@@ -130,5 +132,5 @@
             0});
       this.binsNumericUpDown.Name = "binsNumericUpDown";
-      this.binsNumericUpDown.Size = new System.Drawing.Size(96, 20);
+      this.binsNumericUpDown.Size = new System.Drawing.Size(97, 20);
       this.binsNumericUpDown.TabIndex = 1;
       this.binsNumericUpDown.Value = new decimal(new int[] {
@@ -142,31 +144,32 @@
       // 
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(8, 48);
+      this.label1.Location = new System.Drawing.Point(6, 48);
       this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(58, 13);
-      this.label1.TabIndex = 0;
-      this.label1.Text = "Chart type:";
+      this.label1.Size = new System.Drawing.Size(34, 13);
+      this.label1.TabIndex = 2;
+      this.label1.Text = "&Type:";
       // 
       // label2
       // 
       this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(8, 77);
+      this.label2.Location = new System.Drawing.Point(6, 77);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(34, 13);
-      this.label2.TabIndex = 2;
-      this.label2.Text = "Color:";
+      this.label2.TabIndex = 4;
+      this.label2.Text = "&Color:";
       // 
       // label3
       // 
       this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(8, 21);
+      this.label3.Location = new System.Drawing.Point(6, 21);
       this.label3.Name = "label3";
       this.label3.Size = new System.Drawing.Size(30, 13);
       this.label3.TabIndex = 0;
-      this.label3.Text = "Bins:";
+      this.label3.Text = "&Bins:";
       // 
       // commonGroupBox
       // 
-      this.commonGroupBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.commonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.commonGroupBox.Controls.Add(this.displayNameTextBox);
       this.commonGroupBox.Controls.Add(this.axisGroupBox);
@@ -176,7 +179,7 @@
       this.commonGroupBox.Controls.Add(this.label2);
       this.commonGroupBox.Controls.Add(this.chartTypeComboBox);
-      this.commonGroupBox.Location = new System.Drawing.Point(3, 3);
+      this.commonGroupBox.Location = new System.Drawing.Point(0, 0);
       this.commonGroupBox.Name = "commonGroupBox";
-      this.commonGroupBox.Size = new System.Drawing.Size(313, 181);
+      this.commonGroupBox.Size = new System.Drawing.Size(327, 174);
       this.commonGroupBox.TabIndex = 0;
       this.commonGroupBox.TabStop = false;
@@ -185,165 +188,148 @@
       // displayNameTextBox
       // 
-      this.displayNameTextBox.Location = new System.Drawing.Point(89, 19);
+      this.displayNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.displayNameTextBox.Location = new System.Drawing.Point(57, 19);
       this.displayNameTextBox.Name = "displayNameTextBox";
-      this.displayNameTextBox.Size = new System.Drawing.Size(211, 20);
-      this.displayNameTextBox.TabIndex = 10;
+      this.displayNameTextBox.Size = new System.Drawing.Size(264, 20);
+      this.displayNameTextBox.TabIndex = 1;
       this.displayNameTextBox.Validated += new System.EventHandler(this.displayNameTextBox_Validated);
       // 
       // axisGroupBox
       // 
+      this.axisGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.axisGroupBox.Controls.Add(this.panel2);
+      this.axisGroupBox.Controls.Add(this.panel1);
       this.axisGroupBox.Controls.Add(this.label5);
       this.axisGroupBox.Controls.Add(this.label6);
-      this.axisGroupBox.Controls.Add(this.panel1);
-      this.axisGroupBox.Controls.Add(this.panel2);
       this.axisGroupBox.Location = new System.Drawing.Point(6, 101);
       this.axisGroupBox.Name = "axisGroupBox";
-      this.axisGroupBox.Size = new System.Drawing.Size(299, 75);
-      this.axisGroupBox.TabIndex = 9;
+      this.axisGroupBox.Size = new System.Drawing.Size(315, 67);
+      this.axisGroupBox.TabIndex = 6;
       this.axisGroupBox.TabStop = false;
-      this.axisGroupBox.Text = "Display data on";
+      this.axisGroupBox.Text = "Axes";
+      // 
+      // yAxisSecondaryRadioButton
+      // 
+      this.yAxisSecondaryRadioButton.AutoSize = true;
+      this.yAxisSecondaryRadioButton.Location = new System.Drawing.Point(65, 0);
+      this.yAxisSecondaryRadioButton.Name = "yAxisSecondaryRadioButton";
+      this.yAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
+      this.yAxisSecondaryRadioButton.TabIndex = 5;
+      this.yAxisSecondaryRadioButton.TabStop = true;
+      this.yAxisSecondaryRadioButton.Text = "&Secondary";
+      this.yAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
+      // 
+      // xAxisPrimaryRadioButton
+      // 
+      this.xAxisPrimaryRadioButton.AutoSize = true;
+      this.xAxisPrimaryRadioButton.Location = new System.Drawing.Point(0, 0);
+      this.xAxisPrimaryRadioButton.Name = "xAxisPrimaryRadioButton";
+      this.xAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
+      this.xAxisPrimaryRadioButton.TabIndex = 1;
+      this.xAxisPrimaryRadioButton.TabStop = true;
+      this.xAxisPrimaryRadioButton.Text = "&Primary";
+      this.xAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
+      // 
+      // yAxisPrimaryRadioButton
+      // 
+      this.yAxisPrimaryRadioButton.AutoSize = true;
+      this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(0, 0);
+      this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
+      this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
+      this.yAxisPrimaryRadioButton.TabIndex = 4;
+      this.yAxisPrimaryRadioButton.TabStop = true;
+      this.yAxisPrimaryRadioButton.Text = "&Primary";
+      this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
       // 
       // label5
       // 
       this.label5.AutoSize = true;
-      this.label5.Location = new System.Drawing.Point(6, 46);
+      this.label5.Location = new System.Drawing.Point(6, 44);
       this.label5.Name = "label5";
       this.label5.Size = new System.Drawing.Size(39, 13);
-      this.label5.TabIndex = 6;
-      this.label5.Text = "Y-Axis:";
+      this.label5.TabIndex = 3;
+      this.label5.Text = "&Y-Axis:";
+      // 
+      // xAxisSecondaryRadioButton
+      // 
+      this.xAxisSecondaryRadioButton.AutoSize = true;
+      this.xAxisSecondaryRadioButton.Location = new System.Drawing.Point(65, 0);
+      this.xAxisSecondaryRadioButton.Name = "xAxisSecondaryRadioButton";
+      this.xAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
+      this.xAxisSecondaryRadioButton.TabIndex = 2;
+      this.xAxisSecondaryRadioButton.TabStop = true;
+      this.xAxisSecondaryRadioButton.Text = "&Secondary";
+      this.xAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
       // 
       // label6
       // 
       this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(6, 22);
+      this.label6.Location = new System.Drawing.Point(6, 21);
       this.label6.Name = "label6";
       this.label6.Size = new System.Drawing.Size(39, 13);
-      this.label6.TabIndex = 6;
-      this.label6.Text = "X-Axis:";
-      // 
-      // panel1
-      // 
-      this.panel1.Controls.Add(this.yAxisSecondaryRadioButton);
-      this.panel1.Controls.Add(this.yAxisPrimaryRadioButton);
-      this.panel1.Location = new System.Drawing.Point(63, 40);
-      this.panel1.Name = "panel1";
-      this.panel1.Size = new System.Drawing.Size(231, 25);
-      this.panel1.TabIndex = 5;
-      // 
-      // yAxisSecondaryRadioButton
-      // 
-      this.yAxisSecondaryRadioButton.AutoSize = true;
-      this.yAxisSecondaryRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.yAxisSecondaryRadioButton.Name = "yAxisSecondaryRadioButton";
-      this.yAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
-      this.yAxisSecondaryRadioButton.TabIndex = 1;
-      this.yAxisSecondaryRadioButton.TabStop = true;
-      this.yAxisSecondaryRadioButton.Text = "Secondary";
-      this.yAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
-      // 
-      // yAxisPrimaryRadioButton
-      // 
-      this.yAxisPrimaryRadioButton.AutoSize = true;
-      this.yAxisPrimaryRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.yAxisPrimaryRadioButton.Name = "yAxisPrimaryRadioButton";
-      this.yAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
-      this.yAxisPrimaryRadioButton.TabIndex = 0;
-      this.yAxisPrimaryRadioButton.TabStop = true;
-      this.yAxisPrimaryRadioButton.Text = "Primary";
-      this.yAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.yAxisRadioButton_CheckedChanged);
-      // 
-      // panel2
-      // 
-      this.panel2.Controls.Add(this.xAxisPrimaryRadioButton);
-      this.panel2.Controls.Add(this.xAxisSecondaryRadioButton);
-      this.panel2.Location = new System.Drawing.Point(63, 16);
-      this.panel2.Name = "panel2";
-      this.panel2.Size = new System.Drawing.Size(231, 25);
-      this.panel2.TabIndex = 7;
-      // 
-      // xAxisPrimaryRadioButton
-      // 
-      this.xAxisPrimaryRadioButton.AutoSize = true;
-      this.xAxisPrimaryRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.xAxisPrimaryRadioButton.Name = "xAxisPrimaryRadioButton";
-      this.xAxisPrimaryRadioButton.Size = new System.Drawing.Size(59, 17);
-      this.xAxisPrimaryRadioButton.TabIndex = 0;
-      this.xAxisPrimaryRadioButton.TabStop = true;
-      this.xAxisPrimaryRadioButton.Text = "Primary";
-      this.xAxisPrimaryRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisPrimaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
-      // 
-      // xAxisSecondaryRadioButton
-      // 
-      this.xAxisSecondaryRadioButton.AutoSize = true;
-      this.xAxisSecondaryRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.xAxisSecondaryRadioButton.Name = "xAxisSecondaryRadioButton";
-      this.xAxisSecondaryRadioButton.Size = new System.Drawing.Size(76, 17);
-      this.xAxisSecondaryRadioButton.TabIndex = 1;
-      this.xAxisSecondaryRadioButton.TabStop = true;
-      this.xAxisSecondaryRadioButton.Text = "Secondary";
-      this.xAxisSecondaryRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisSecondaryRadioButton.CheckedChanged += new System.EventHandler(this.xAxisRadioButton_CheckedChanged);
+      this.label6.TabIndex = 0;
+      this.label6.Text = "&X-Axis:";
       // 
       // label9
       // 
       this.label9.AutoSize = true;
-      this.label9.Location = new System.Drawing.Point(8, 22);
+      this.label9.Location = new System.Drawing.Point(6, 22);
       this.label9.Name = "label9";
-      this.label9.Size = new System.Drawing.Size(75, 13);
+      this.label9.Size = new System.Drawing.Size(38, 13);
       this.label9.TabIndex = 0;
-      this.label9.Text = "Display Name:";
+      this.label9.Text = "&Name:";
       // 
       // histoGramGroupBox
       // 
-      this.histoGramGroupBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
-      this.histoGramGroupBox.Controls.Add(this.panel3);
+      this.histoGramGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.histoGramGroupBox.Controls.Add(this.binsExactRadioButton);
+      this.histoGramGroupBox.Controls.Add(this.binsApproximatelyRadioButton);
       this.histoGramGroupBox.Controls.Add(this.binsNumericUpDown);
       this.histoGramGroupBox.Controls.Add(this.label3);
-      this.histoGramGroupBox.Location = new System.Drawing.Point(3, 292);
+      this.histoGramGroupBox.Location = new System.Drawing.Point(0, 280);
       this.histoGramGroupBox.Name = "histoGramGroupBox";
-      this.histoGramGroupBox.Size = new System.Drawing.Size(313, 49);
+      this.histoGramGroupBox.Size = new System.Drawing.Size(327, 47);
       this.histoGramGroupBox.TabIndex = 2;
       this.histoGramGroupBox.TabStop = false;
-      this.histoGramGroupBox.Text = "Histogram";
-      // 
-      // panel3
-      // 
-      this.panel3.Controls.Add(this.binsApproximatelyRadioButton);
-      this.panel3.Controls.Add(this.binsExactRadioButton);
-      this.panel3.Location = new System.Drawing.Point(146, 16);
-      this.panel3.Name = "panel3";
-      this.panel3.Size = new System.Drawing.Size(154, 25);
-      this.panel3.TabIndex = 2;
+      this.histoGramGroupBox.Text = "Histogram Properties";
+      // 
+      // binsExactRadioButton
+      // 
+      this.binsExactRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.binsExactRadioButton.AutoSize = true;
+      this.binsExactRadioButton.Location = new System.Drawing.Point(269, 19);
+      this.binsExactRadioButton.Name = "binsExactRadioButton";
+      this.binsExactRadioButton.Size = new System.Drawing.Size(52, 17);
+      this.binsExactRadioButton.TabIndex = 3;
+      this.binsExactRadioButton.TabStop = true;
+      this.binsExactRadioButton.Text = "&Exact";
+      this.binsExactRadioButton.UseVisualStyleBackColor = true;
+      this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
       // 
       // binsApproximatelyRadioButton
       // 
+      this.binsApproximatelyRadioButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.binsApproximatelyRadioButton.AutoSize = true;
-      this.binsApproximatelyRadioButton.Location = new System.Drawing.Point(4, 4);
+      this.binsApproximatelyRadioButton.Location = new System.Drawing.Point(173, 19);
       this.binsApproximatelyRadioButton.Name = "binsApproximatelyRadioButton";
       this.binsApproximatelyRadioButton.Size = new System.Drawing.Size(90, 17);
-      this.binsApproximatelyRadioButton.TabIndex = 0;
+      this.binsApproximatelyRadioButton.TabIndex = 2;
       this.binsApproximatelyRadioButton.TabStop = true;
-      this.binsApproximatelyRadioButton.Text = "Approximately";
+      this.binsApproximatelyRadioButton.Text = "&Approximately";
       this.binsApproximatelyRadioButton.UseVisualStyleBackColor = true;
       this.binsApproximatelyRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
       // 
-      // binsExactRadioButton
-      // 
-      this.binsExactRadioButton.AutoSize = true;
-      this.binsExactRadioButton.Location = new System.Drawing.Point(100, 4);
-      this.binsExactRadioButton.Name = "binsExactRadioButton";
-      this.binsExactRadioButton.Size = new System.Drawing.Size(52, 17);
-      this.binsExactRadioButton.TabIndex = 1;
-      this.binsExactRadioButton.TabStop = true;
-      this.binsExactRadioButton.Text = "Exact";
-      this.binsExactRadioButton.UseVisualStyleBackColor = true;
-      this.binsExactRadioButton.CheckedChanged += new System.EventHandler(this.binNumberRadioButton_CheckedChanged);
-      // 
       // lineChartGroupBox
       // 
-      this.lineChartGroupBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
+      this.lineChartGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.lineChartGroupBox.Controls.Add(this.lineWidthNumericUpDown);
       this.lineChartGroupBox.Controls.Add(this.label4);
@@ -352,14 +338,16 @@
       this.lineChartGroupBox.Controls.Add(this.lineStyleComboBox);
       this.lineChartGroupBox.Controls.Add(this.label8);
-      this.lineChartGroupBox.Location = new System.Drawing.Point(3, 190);
+      this.lineChartGroupBox.Location = new System.Drawing.Point(0, 180);
       this.lineChartGroupBox.Name = "lineChartGroupBox";
-      this.lineChartGroupBox.Size = new System.Drawing.Size(313, 96);
+      this.lineChartGroupBox.Size = new System.Drawing.Size(327, 94);
       this.lineChartGroupBox.TabIndex = 1;
       this.lineChartGroupBox.TabStop = false;
-      this.lineChartGroupBox.Text = "Line chart";
+      this.lineChartGroupBox.Text = "Line Properties";
       // 
       // lineWidthNumericUpDown
       // 
-      this.lineWidthNumericUpDown.Location = new System.Drawing.Point(96, 66);
+      this.lineWidthNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.lineWidthNumericUpDown.Location = new System.Drawing.Point(82, 66);
       this.lineWidthNumericUpDown.Minimum = new decimal(new int[] {
             1,
@@ -368,5 +356,5 @@
             0});
       this.lineWidthNumericUpDown.Name = "lineWidthNumericUpDown";
-      this.lineWidthNumericUpDown.Size = new System.Drawing.Size(65, 20);
+      this.lineWidthNumericUpDown.Size = new System.Drawing.Size(239, 20);
       this.lineWidthNumericUpDown.TabIndex = 5;
       this.lineWidthNumericUpDown.Value = new decimal(new int[] {
@@ -380,26 +368,28 @@
       // 
       this.label4.AutoSize = true;
-      this.label4.Location = new System.Drawing.Point(8, 68);
+      this.label4.Location = new System.Drawing.Point(6, 68);
       this.label4.Name = "label4";
-      this.label4.Size = new System.Drawing.Size(58, 13);
+      this.label4.Size = new System.Drawing.Size(38, 13);
       this.label4.TabIndex = 4;
-      this.label4.Text = "Line width:";
+      this.label4.Text = "&Width:";
       // 
       // label7
       // 
       this.label7.AutoSize = true;
-      this.label7.Location = new System.Drawing.Point(8, 46);
+      this.label7.Location = new System.Drawing.Point(6, 46);
       this.label7.Name = "label7";
-      this.label7.Size = new System.Drawing.Size(81, 13);
+      this.label7.Size = new System.Drawing.Size(70, 13);
       this.label7.TabIndex = 2;
-      this.label7.Text = "Start index at 0:";
+      this.label7.Text = "Start &Index 0:";
       // 
       // lineStyleComboBox
       // 
+      this.lineStyleComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.lineStyleComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.lineStyleComboBox.FormattingEnabled = true;
-      this.lineStyleComboBox.Location = new System.Drawing.Point(96, 19);
+      this.lineStyleComboBox.Location = new System.Drawing.Point(82, 19);
       this.lineStyleComboBox.Name = "lineStyleComboBox";
-      this.lineStyleComboBox.Size = new System.Drawing.Size(204, 21);
+      this.lineStyleComboBox.Size = new System.Drawing.Size(239, 21);
       this.lineStyleComboBox.TabIndex = 1;
       this.lineStyleComboBox.SelectedValueChanged += new System.EventHandler(this.lineStyleComboBox_SelectedValueChanged);
@@ -408,9 +398,31 @@
       // 
       this.label8.AutoSize = true;
-      this.label8.Location = new System.Drawing.Point(8, 22);
+      this.label8.Location = new System.Drawing.Point(6, 22);
       this.label8.Name = "label8";
-      this.label8.Size = new System.Drawing.Size(54, 13);
+      this.label8.Size = new System.Drawing.Size(33, 13);
       this.label8.TabIndex = 0;
-      this.label8.Text = "Line style:";
+      this.label8.Text = "&Style:";
+      // 
+      // panel1
+      // 
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.Controls.Add(this.xAxisPrimaryRadioButton);
+      this.panel1.Controls.Add(this.xAxisSecondaryRadioButton);
+      this.panel1.Location = new System.Drawing.Point(51, 19);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(258, 17);
+      this.panel1.TabIndex = 6;
+      // 
+      // panel2
+      // 
+      this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel2.Controls.Add(this.yAxisSecondaryRadioButton);
+      this.panel2.Controls.Add(this.yAxisPrimaryRadioButton);
+      this.panel2.Location = new System.Drawing.Point(51, 42);
+      this.panel2.Name = "panel2";
+      this.panel2.Size = new System.Drawing.Size(258, 17);
+      this.panel2.TabIndex = 7;
       // 
       // DataRowVisualPropertiesControl
@@ -422,5 +434,5 @@
       this.Controls.Add(this.commonGroupBox);
       this.Name = "DataRowVisualPropertiesControl";
-      this.Size = new System.Drawing.Size(319, 347);
+      this.Size = new System.Drawing.Size(327, 331);
       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).EndInit();
       this.commonGroupBox.ResumeLayout(false);
@@ -428,15 +440,13 @@
       this.axisGroupBox.ResumeLayout(false);
       this.axisGroupBox.PerformLayout();
+      this.histoGramGroupBox.ResumeLayout(false);
+      this.histoGramGroupBox.PerformLayout();
+      this.lineChartGroupBox.ResumeLayout(false);
+      this.lineChartGroupBox.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).EndInit();
       this.panel1.ResumeLayout(false);
       this.panel1.PerformLayout();
       this.panel2.ResumeLayout(false);
       this.panel2.PerformLayout();
-      this.histoGramGroupBox.ResumeLayout(false);
-      this.histoGramGroupBox.PerformLayout();
-      this.panel3.ResumeLayout(false);
-      this.panel3.PerformLayout();
-      this.lineChartGroupBox.ResumeLayout(false);
-      this.lineChartGroupBox.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.lineWidthNumericUpDown)).EndInit();
       this.ResumeLayout(false);
 
@@ -466,7 +476,4 @@
     private System.Windows.Forms.RadioButton binsExactRadioButton;
     private System.Windows.Forms.RadioButton binsApproximatelyRadioButton;
-    private System.Windows.Forms.Panel panel2;
-    private System.Windows.Forms.Panel panel1;
-    private System.Windows.Forms.Panel panel3;
     private System.Windows.Forms.ComboBox lineStyleComboBox;
     private System.Windows.Forms.Label label8;
@@ -475,4 +482,6 @@
     private System.Windows.Forms.TextBox displayNameTextBox;
     private System.Windows.Forms.Label label9;
+    private System.Windows.Forms.Panel panel2;
+    private System.Windows.Forms.Panel panel1;
   }
 }
Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.cs	(revision 7244)
@@ -20,9 +20,8 @@
 #endregion
 
-using System.Linq;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Analysis.Views {
@@ -39,5 +38,5 @@
       if (current == null) return;
       using (DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(current)) {
-        if (dialog.ShowDialog() != DialogResult.OK) return;
+        if (dialog.ShowDialog(this) != DialogResult.OK) return;
         HashSet<string> modifiedDisplayNames = new HashSet<string>(dialog.RowsWithModifiedDisplayNames);
         foreach (DataTable dt in Content) {
@@ -54,5 +53,4 @@
       }
     }
-
   }
 }
Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs	(revision 7244)
@@ -31,7 +31,4 @@
 
 namespace HeuristicLab.Analysis.Views {
-  /// <summary>
-  /// The visual representation of a <see cref="Variable"/>.
-  /// </summary>
   [View("DataTable View")]
   [Content(typeof(DataTable), true)]
@@ -39,9 +36,5 @@
     protected List<Series> invisibleSeries;
     protected Dictionary<IObservableList<double>, DataRow> valuesRowsTable;
-    /// <summary>
-    /// Gets or sets the variable to represent visually.
-    /// </summary>
-    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
-    /// No own data storage present.</remarks>
+
     public new DataTable Content {
       get { return (DataTable)base.Content; }
@@ -49,7 +42,4 @@
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="VariableView"/> with caption "Variable".
-    /// </summary>
     public DataTableView() {
       InitializeComponent();
@@ -61,8 +51,4 @@
 
     #region Event Handler Registration
-    /// <summary>
-    /// Removes the eventhandlers from the underlying <see cref="Variable"/>.
-    /// </summary>
-    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
     protected override void DeregisterContentEvents() {
       foreach (DataRow row in Content.Rows)
@@ -75,9 +61,4 @@
       base.DeregisterContentEvents();
     }
-
-    /// <summary>
-    /// Adds eventhandlers to the underlying <see cref="Variable"/>.
-    /// </summary>
-    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
@@ -91,9 +72,4 @@
     }
 
-    /// <summary>
-    /// Automatically called for every existing data row and whenever a data row is added
-    /// to the data table. Do not call this method directly.
-    /// </summary>
-    /// <param name="row">The DataRow that was added.</param>
     protected virtual void RegisterDataRowEvents(DataRow row) {
       row.NameChanged += new EventHandler(Row_NameChanged);
@@ -106,10 +82,4 @@
       row.Values.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_CollectionReset);
     }
-
-    /// <summary>
-    /// Automatically called for every data row that is removed from the DataTable. Do
-    /// not directly call this method.
-    /// </summary>
-    /// <param name="row">The DataRow that was removed.</param>
     protected virtual void DeregisterDataRowEvents(DataRow row) {
       row.Values.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<double>>(Values_ItemsAdded);
@@ -148,13 +118,10 @@
     public void ShowConfiguration() {
       if (Content != null) {
-        DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content);
-        dialog.ShowDialog();
+        using (DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content)) {
+          dialog.ShowDialog(this);
+        }
       } else MessageBox.Show("Nothing to configure.");
     }
 
-    /// <summary>
-    /// Add the DataRow as a series to the chart.
-    /// </summary>
-    /// <param name="row">DataRow to add as series to the chart.</param>
     protected virtual void AddDataRow(DataRow row) {
       Series series = new Series(row.Name);
@@ -266,7 +233,4 @@
     }
 
-    /// <summary>
-    /// Set the Y Cursor interval to visible points of enabled series.
-    /// </summary>
     protected virtual void UpdateYCursorInterval() {
       double interestingValuesRange = (
@@ -287,8 +251,4 @@
 
 
-    /// <summary>
-    /// Remove the corresponding series for a certain DataRow.
-    /// </summary>
-    /// <param name="row">DataRow which series should be removed.</param>
     protected virtual void RemoveDataRow(DataRow row) {
       Series series = chart.Series[row.Name];
@@ -672,10 +632,4 @@
     }
 
-    /// <summary>
-    /// Determines whether a double value can be displayed (converted to Decimal and not an NaN).
-    /// </summary>
-    /// <param name="x">The number to check.</param>
-    /// <returns><code>true</code> if the value can be safely shwon in the chart,
-    /// <code>false</code> otherwise.</returns>
     protected static bool IsInvalidValue(double x) {
       return double.IsNaN(x) || x < (double)decimal.MinValue || x > (double)decimal.MaxValue;
Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs	(revision 7244)
@@ -51,31 +51,54 @@
       this.label4 = new System.Windows.Forms.Label();
       this.xAxisPrimaryGroupBox = new System.Windows.Forms.GroupBox();
+      this.panel2 = new System.Windows.Forms.Panel();
+      this.xAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisPrimaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.panel1 = new System.Windows.Forms.Panel();
+      this.xAxisPrimaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisPrimaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisPrimaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.xAxisPrimaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
       this.label12 = new System.Windows.Forms.Label();
       this.label9 = new System.Windows.Forms.Label();
       this.xAxisPrimaryTitleTextBox = new System.Windows.Forms.TextBox();
       this.label11 = new System.Windows.Forms.Label();
-      this.xAxisPrimaryMaximumPanel = new System.Windows.Forms.Panel();
-      this.xAxisPrimaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.xAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisPrimaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisPrimaryMinimumPanel = new System.Windows.Forms.Panel();
-      this.xAxisPrimaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.xAxisPrimaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisPrimaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
       this.xAxisSecondaryGroupBox = new System.Windows.Forms.GroupBox();
+      this.panel4 = new System.Windows.Forms.Panel();
+      this.xAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisSecondaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.panel3 = new System.Windows.Forms.Panel();
+      this.xAxisSecondaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisSecondaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.xAxisSecondaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.xAxisSecondaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
       this.label10 = new System.Windows.Forms.Label();
       this.xAxisSecondaryTitleTextBox = new System.Windows.Forms.TextBox();
       this.label5 = new System.Windows.Forms.Label();
       this.label6 = new System.Windows.Forms.Label();
-      this.xAxisSecondaryMaximumPanel = new System.Windows.Forms.Panel();
-      this.xAxisSecondaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.xAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisSecondaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisSecondaryMinimumPanel = new System.Windows.Forms.Panel();
-      this.xAxisSecondaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.xAxisSecondaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.xAxisSecondaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
       this.axisTabControl = new System.Windows.Forms.TabControl();
-      this.mainTabPage = new System.Windows.Forms.TabPage();
+      this.xAxisTabPage = new System.Windows.Forms.TabPage();
+      this.yAxisTabPage = new System.Windows.Forms.TabPage();
+      this.yAxisSecondaryGroupBox = new System.Windows.Forms.GroupBox();
+      this.panel8 = new System.Windows.Forms.Panel();
+      this.yAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisSecondaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.panel7 = new System.Windows.Forms.Panel();
+      this.yAxisSecondaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisSecondaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisSecondaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.yAxisSecondaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.label13 = new System.Windows.Forms.Label();
+      this.label14 = new System.Windows.Forms.Label();
+      this.yAxisPrimaryGroupBox = new System.Windows.Forms.GroupBox();
+      this.panel6 = new System.Windows.Forms.Panel();
+      this.yAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisPrimaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.panel5 = new System.Windows.Forms.Panel();
+      this.yAxisPrimaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisPrimaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
+      this.yAxisPrimaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.yAxisPrimaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
+      this.label7 = new System.Windows.Forms.Label();
+      this.label8 = new System.Windows.Forms.Label();
       this.titleTextBox = new System.Windows.Forms.TextBox();
       this.label15 = new System.Windows.Forms.Label();
@@ -86,47 +109,22 @@
       this.titleFontButton = new System.Windows.Forms.Button();
       this.label2 = new System.Windows.Forms.Label();
-      this.xAxisTabPage = new System.Windows.Forms.TabPage();
-      this.yAxisTabPage = new System.Windows.Forms.TabPage();
-      this.yAxisSecondaryGroupBox = new System.Windows.Forms.GroupBox();
-      this.label13 = new System.Windows.Forms.Label();
-      this.label14 = new System.Windows.Forms.Label();
-      this.yAxisSecondaryMaximumPanel = new System.Windows.Forms.Panel();
-      this.yAxisSecondaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.yAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisSecondaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisSecondaryMinimumPanel = new System.Windows.Forms.Panel();
-      this.yAxisSecondaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.yAxisSecondaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisSecondaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisPrimaryGroupBox = new System.Windows.Forms.GroupBox();
-      this.label7 = new System.Windows.Forms.Label();
-      this.label8 = new System.Windows.Forms.Label();
-      this.yAxisPrimaryMaximumPanel = new System.Windows.Forms.Panel();
-      this.yAxisPrimaryMaximumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.yAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisPrimaryMaximumAutoRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisPrimaryMinimumPanel = new System.Windows.Forms.Panel();
-      this.yAxisPrimaryMinimumFixedTextBox = new System.Windows.Forms.TextBox();
-      this.yAxisPrimaryMinimumFixedRadioButton = new System.Windows.Forms.RadioButton();
-      this.yAxisPrimaryMinimumAutoRadioButton = new System.Windows.Forms.RadioButton();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.titleFontDialog = new System.Windows.Forms.FontDialog();
       this.axisFontDialog = new System.Windows.Forms.FontDialog();
       this.xAxisPrimaryGroupBox.SuspendLayout();
-      this.xAxisPrimaryMaximumPanel.SuspendLayout();
-      this.xAxisPrimaryMinimumPanel.SuspendLayout();
+      this.panel2.SuspendLayout();
+      this.panel1.SuspendLayout();
       this.xAxisSecondaryGroupBox.SuspendLayout();
-      this.xAxisSecondaryMaximumPanel.SuspendLayout();
-      this.xAxisSecondaryMinimumPanel.SuspendLayout();
+      this.panel4.SuspendLayout();
+      this.panel3.SuspendLayout();
       this.axisTabControl.SuspendLayout();
-      this.mainTabPage.SuspendLayout();
       this.xAxisTabPage.SuspendLayout();
       this.yAxisTabPage.SuspendLayout();
       this.yAxisSecondaryGroupBox.SuspendLayout();
-      this.yAxisSecondaryMaximumPanel.SuspendLayout();
-      this.yAxisSecondaryMinimumPanel.SuspendLayout();
+      this.panel8.SuspendLayout();
+      this.panel7.SuspendLayout();
       this.yAxisPrimaryGroupBox.SuspendLayout();
-      this.yAxisPrimaryMaximumPanel.SuspendLayout();
-      this.yAxisPrimaryMinimumPanel.SuspendLayout();
+      this.panel6.SuspendLayout();
+      this.panel5.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -135,17 +133,17 @@
       // 
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(4, 26);
+      this.label1.Location = new System.Drawing.Point(6, 22);
       this.label1.Name = "label1";
       this.label1.Size = new System.Drawing.Size(30, 13);
       this.label1.TabIndex = 0;
-      this.label1.Text = "Title:";
+      this.label1.Text = "&Title:";
       // 
       // yAxisPrimaryTitleTextBox
       // 
-      this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
+      this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.yAxisPrimaryTitleTextBox.Name = "yAxisPrimaryTitleTextBox";
-      this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
+      this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
       this.yAxisPrimaryTitleTextBox.TabIndex = 1;
       this.yAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.yPrimaryTitleTextBox_Validated);
@@ -153,9 +151,9 @@
       // yAxisSecondaryTitleTextBox
       // 
-      this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
+      this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.yAxisSecondaryTitleTextBox.Name = "yAxisSecondaryTitleTextBox";
-      this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
+      this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
       this.yAxisSecondaryTitleTextBox.TabIndex = 1;
       this.yAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.ySecondaryTitleTextBox_Validated);
@@ -164,52 +162,140 @@
       // 
       this.label4.AutoSize = true;
-      this.label4.Location = new System.Drawing.Point(4, 26);
+      this.label4.Location = new System.Drawing.Point(6, 22);
       this.label4.Name = "label4";
       this.label4.Size = new System.Drawing.Size(30, 13);
       this.label4.TabIndex = 0;
-      this.label4.Text = "Title:";
+      this.label4.Text = "&Title:";
       // 
       // xAxisPrimaryGroupBox
       // 
-      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryGroupBox.Controls.Add(this.panel2);
+      this.xAxisPrimaryGroupBox.Controls.Add(this.panel1);
+      this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryMinimumFixedTextBox);
+      this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryMaximumFixedTextBox);
       this.xAxisPrimaryGroupBox.Controls.Add(this.label12);
       this.xAxisPrimaryGroupBox.Controls.Add(this.label9);
       this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryTitleTextBox);
       this.xAxisPrimaryGroupBox.Controls.Add(this.label11);
-      this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryMaximumPanel);
-      this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryMinimumPanel);
-      this.xAxisPrimaryGroupBox.Location = new System.Drawing.Point(6, 6);
+      this.xAxisPrimaryGroupBox.Location = new System.Drawing.Point(3, 3);
       this.xAxisPrimaryGroupBox.Name = "xAxisPrimaryGroupBox";
-      this.xAxisPrimaryGroupBox.Size = new System.Drawing.Size(316, 107);
+      this.xAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 99);
       this.xAxisPrimaryGroupBox.TabIndex = 0;
       this.xAxisPrimaryGroupBox.TabStop = false;
       this.xAxisPrimaryGroupBox.Text = "Primary Axis";
       // 
+      // panel2
+      // 
+      this.panel2.Controls.Add(this.xAxisPrimaryMaximumFixedRadioButton);
+      this.panel2.Controls.Add(this.xAxisPrimaryMaximumAutoRadioButton);
+      this.panel2.Location = new System.Drawing.Point(66, 71);
+      this.panel2.Name = "panel2";
+      this.panel2.Size = new System.Drawing.Size(106, 20);
+      this.panel2.TabIndex = 9;
+      // 
+      // xAxisPrimaryMaximumFixedRadioButton
+      // 
+      this.xAxisPrimaryMaximumFixedRadioButton.AutoSize = true;
+      this.xAxisPrimaryMaximumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.xAxisPrimaryMaximumFixedRadioButton.Name = "xAxisPrimaryMaximumFixedRadioButton";
+      this.xAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.xAxisPrimaryMaximumFixedRadioButton.TabIndex = 8;
+      this.xAxisPrimaryMaximumFixedRadioButton.TabStop = true;
+      this.xAxisPrimaryMaximumFixedRadioButton.Text = "&Fixed:";
+      this.xAxisPrimaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisPrimaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMaximumRadioButton_CheckedChanged);
+      // 
+      // xAxisPrimaryMaximumAutoRadioButton
+      // 
+      this.xAxisPrimaryMaximumAutoRadioButton.AutoSize = true;
+      this.xAxisPrimaryMaximumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.xAxisPrimaryMaximumAutoRadioButton.Name = "xAxisPrimaryMaximumAutoRadioButton";
+      this.xAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.xAxisPrimaryMaximumAutoRadioButton.TabIndex = 7;
+      this.xAxisPrimaryMaximumAutoRadioButton.TabStop = true;
+      this.xAxisPrimaryMaximumAutoRadioButton.Text = "&Auto";
+      this.xAxisPrimaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisPrimaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMaximumRadioButton_CheckedChanged);
+      // 
+      // panel1
+      // 
+      this.panel1.Controls.Add(this.xAxisPrimaryMinimumFixedRadioButton);
+      this.panel1.Controls.Add(this.xAxisPrimaryMinimumAutoRadioButton);
+      this.panel1.Location = new System.Drawing.Point(66, 45);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(106, 20);
+      this.panel1.TabIndex = 9;
+      // 
+      // xAxisPrimaryMinimumFixedRadioButton
+      // 
+      this.xAxisPrimaryMinimumFixedRadioButton.AutoSize = true;
+      this.xAxisPrimaryMinimumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.xAxisPrimaryMinimumFixedRadioButton.Name = "xAxisPrimaryMinimumFixedRadioButton";
+      this.xAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.xAxisPrimaryMinimumFixedRadioButton.TabIndex = 4;
+      this.xAxisPrimaryMinimumFixedRadioButton.TabStop = true;
+      this.xAxisPrimaryMinimumFixedRadioButton.Text = "&Fixed:";
+      this.xAxisPrimaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisPrimaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMinimumRadioButton_CheckedChanged);
+      // 
+      // xAxisPrimaryMinimumAutoRadioButton
+      // 
+      this.xAxisPrimaryMinimumAutoRadioButton.AutoSize = true;
+      this.xAxisPrimaryMinimumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.xAxisPrimaryMinimumAutoRadioButton.Name = "xAxisPrimaryMinimumAutoRadioButton";
+      this.xAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.xAxisPrimaryMinimumAutoRadioButton.TabIndex = 3;
+      this.xAxisPrimaryMinimumAutoRadioButton.TabStop = true;
+      this.xAxisPrimaryMinimumAutoRadioButton.Text = "&Auto";
+      this.xAxisPrimaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisPrimaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMinimumRadioButton_CheckedChanged);
+      // 
+      // xAxisPrimaryMinimumFixedTextBox
+      // 
+      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
+      this.xAxisPrimaryMinimumFixedTextBox.Name = "xAxisPrimaryMinimumFixedTextBox";
+      this.xAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.xAxisPrimaryMinimumFixedTextBox.TabIndex = 5;
+      this.xAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMinimumFixedTextBox_Validating);
+      // 
+      // xAxisPrimaryMaximumFixedTextBox
+      // 
+      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
+      this.xAxisPrimaryMaximumFixedTextBox.Name = "xAxisPrimaryMaximumFixedTextBox";
+      this.xAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.xAxisPrimaryMaximumFixedTextBox.TabIndex = 9;
+      this.xAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMaximumFixedTextBox_Validating);
+      // 
       // label12
       // 
       this.label12.AutoSize = true;
-      this.label12.Location = new System.Drawing.Point(4, 78);
+      this.label12.Location = new System.Drawing.Point(6, 74);
       this.label12.Name = "label12";
       this.label12.Size = new System.Drawing.Size(54, 13);
-      this.label12.TabIndex = 4;
-      this.label12.Text = "Maximum:";
+      this.label12.TabIndex = 6;
+      this.label12.Text = "&Maximum:";
       // 
       // label9
       // 
       this.label9.AutoSize = true;
-      this.label9.Location = new System.Drawing.Point(4, 26);
+      this.label9.Location = new System.Drawing.Point(6, 22);
       this.label9.Name = "label9";
       this.label9.Size = new System.Drawing.Size(30, 13);
       this.label9.TabIndex = 0;
-      this.label9.Text = "Title:";
+      this.label9.Text = "&Title:";
       // 
       // xAxisPrimaryTitleTextBox
       // 
-      this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
+      this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.xAxisPrimaryTitleTextBox.Name = "xAxisPrimaryTitleTextBox";
-      this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
+      this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
       this.xAxisPrimaryTitleTextBox.TabIndex = 1;
       this.xAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.xPrimaryTitleTextBox_Validated);
@@ -218,135 +304,132 @@
       // 
       this.label11.AutoSize = true;
-      this.label11.Location = new System.Drawing.Point(4, 53);
+      this.label11.Location = new System.Drawing.Point(6, 48);
       this.label11.Name = "label11";
       this.label11.Size = new System.Drawing.Size(51, 13);
       this.label11.TabIndex = 2;
-      this.label11.Text = "Minimum:";
-      // 
-      // xAxisPrimaryMaximumPanel
-      // 
-      this.xAxisPrimaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumFixedTextBox);
-      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumFixedRadioButton);
-      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumAutoRadioButton);
-      this.xAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
-      this.xAxisPrimaryMaximumPanel.Name = "xAxisPrimaryMaximumPanel";
-      this.xAxisPrimaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
-      this.xAxisPrimaryMaximumPanel.TabIndex = 5;
-      // 
-      // xAxisPrimaryMaximumFixedTextBox
-      // 
-      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.xAxisPrimaryMaximumFixedTextBox.Name = "xAxisPrimaryMaximumFixedTextBox";
-      this.xAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.xAxisPrimaryMaximumFixedTextBox.TabIndex = 2;
-      this.xAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMaximumFixedTextBox_Validating);
-      // 
-      // xAxisPrimaryMaximumFixedRadioButton
-      // 
-      this.xAxisPrimaryMaximumFixedRadioButton.AutoSize = true;
-      this.xAxisPrimaryMaximumFixedRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.xAxisPrimaryMaximumFixedRadioButton.Name = "xAxisPrimaryMaximumFixedRadioButton";
-      this.xAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.xAxisPrimaryMaximumFixedRadioButton.TabIndex = 1;
-      this.xAxisPrimaryMaximumFixedRadioButton.TabStop = true;
-      this.xAxisPrimaryMaximumFixedRadioButton.Text = "Fixed";
-      this.xAxisPrimaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisPrimaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMaximumRadioButton_CheckedChanged);
-      // 
-      // xAxisPrimaryMaximumAutoRadioButton
-      // 
-      this.xAxisPrimaryMaximumAutoRadioButton.AutoSize = true;
-      this.xAxisPrimaryMaximumAutoRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.xAxisPrimaryMaximumAutoRadioButton.Name = "xAxisPrimaryMaximumAutoRadioButton";
-      this.xAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisPrimaryMaximumAutoRadioButton.TabIndex = 0;
-      this.xAxisPrimaryMaximumAutoRadioButton.TabStop = true;
-      this.xAxisPrimaryMaximumAutoRadioButton.Text = "Auto";
-      this.xAxisPrimaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisPrimaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMaximumRadioButton_CheckedChanged);
-      // 
-      // xAxisPrimaryMinimumPanel
-      // 
-      this.xAxisPrimaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisPrimaryMinimumPanel.Controls.Add(this.xAxisPrimaryMinimumFixedTextBox);
-      this.xAxisPrimaryMinimumPanel.Controls.Add(this.xAxisPrimaryMinimumFixedRadioButton);
-      this.xAxisPrimaryMinimumPanel.Controls.Add(this.xAxisPrimaryMinimumAutoRadioButton);
-      this.xAxisPrimaryMinimumPanel.Location = new System.Drawing.Point(63, 47);
-      this.xAxisPrimaryMinimumPanel.Name = "xAxisPrimaryMinimumPanel";
-      this.xAxisPrimaryMinimumPanel.Size = new System.Drawing.Size(245, 25);
-      this.xAxisPrimaryMinimumPanel.TabIndex = 3;
-      // 
-      // xAxisPrimaryMinimumFixedTextBox
-      // 
-      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.xAxisPrimaryMinimumFixedTextBox.Name = "xAxisPrimaryMinimumFixedTextBox";
-      this.xAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.xAxisPrimaryMinimumFixedTextBox.TabIndex = 2;
-      this.xAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMinimumFixedTextBox_Validating);
-      // 
-      // xAxisPrimaryMinimumFixedRadioButton
-      // 
-      this.xAxisPrimaryMinimumFixedRadioButton.AutoSize = true;
-      this.xAxisPrimaryMinimumFixedRadioButton.Location = new System.Drawing.Point(70, 3);
-      this.xAxisPrimaryMinimumFixedRadioButton.Name = "xAxisPrimaryMinimumFixedRadioButton";
-      this.xAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.xAxisPrimaryMinimumFixedRadioButton.TabIndex = 1;
-      this.xAxisPrimaryMinimumFixedRadioButton.TabStop = true;
-      this.xAxisPrimaryMinimumFixedRadioButton.Text = "Fixed";
-      this.xAxisPrimaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisPrimaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMinimumRadioButton_CheckedChanged);
-      // 
-      // xAxisPrimaryMinimumAutoRadioButton
-      // 
-      this.xAxisPrimaryMinimumAutoRadioButton.AutoSize = true;
-      this.xAxisPrimaryMinimumAutoRadioButton.Location = new System.Drawing.Point(4, 3);
-      this.xAxisPrimaryMinimumAutoRadioButton.Name = "xAxisPrimaryMinimumAutoRadioButton";
-      this.xAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisPrimaryMinimumAutoRadioButton.TabIndex = 0;
-      this.xAxisPrimaryMinimumAutoRadioButton.TabStop = true;
-      this.xAxisPrimaryMinimumAutoRadioButton.Text = "Auto";
-      this.xAxisPrimaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisPrimaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisPrimaryMinimumRadioButton_CheckedChanged);
+      this.label11.Text = "&Minimum:";
       // 
       // xAxisSecondaryGroupBox
       // 
-      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryGroupBox.Controls.Add(this.panel4);
+      this.xAxisSecondaryGroupBox.Controls.Add(this.panel3);
+      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryMinimumFixedTextBox);
+      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryMaximumFixedTextBox);
       this.xAxisSecondaryGroupBox.Controls.Add(this.label10);
       this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryTitleTextBox);
       this.xAxisSecondaryGroupBox.Controls.Add(this.label5);
       this.xAxisSecondaryGroupBox.Controls.Add(this.label6);
-      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryMaximumPanel);
-      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryMinimumPanel);
-      this.xAxisSecondaryGroupBox.Location = new System.Drawing.Point(6, 119);
+      this.xAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 108);
       this.xAxisSecondaryGroupBox.Name = "xAxisSecondaryGroupBox";
-      this.xAxisSecondaryGroupBox.Size = new System.Drawing.Size(316, 106);
+      this.xAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 99);
       this.xAxisSecondaryGroupBox.TabIndex = 1;
       this.xAxisSecondaryGroupBox.TabStop = false;
       this.xAxisSecondaryGroupBox.Text = "Secondary Axis";
       // 
+      // panel4
+      // 
+      this.panel4.Controls.Add(this.xAxisSecondaryMaximumFixedRadioButton);
+      this.panel4.Controls.Add(this.xAxisSecondaryMaximumAutoRadioButton);
+      this.panel4.Location = new System.Drawing.Point(66, 71);
+      this.panel4.Name = "panel4";
+      this.panel4.Size = new System.Drawing.Size(106, 20);
+      this.panel4.TabIndex = 9;
+      // 
+      // xAxisSecondaryMaximumFixedRadioButton
+      // 
+      this.xAxisSecondaryMaximumFixedRadioButton.AutoSize = true;
+      this.xAxisSecondaryMaximumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.xAxisSecondaryMaximumFixedRadioButton.Name = "xAxisSecondaryMaximumFixedRadioButton";
+      this.xAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.xAxisSecondaryMaximumFixedRadioButton.TabIndex = 8;
+      this.xAxisSecondaryMaximumFixedRadioButton.TabStop = true;
+      this.xAxisSecondaryMaximumFixedRadioButton.Text = "&Fixed:";
+      this.xAxisSecondaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisSecondaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMaximumRadioButton_CheckedChanged);
+      // 
+      // xAxisSecondaryMaximumAutoRadioButton
+      // 
+      this.xAxisSecondaryMaximumAutoRadioButton.AutoSize = true;
+      this.xAxisSecondaryMaximumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.xAxisSecondaryMaximumAutoRadioButton.Name = "xAxisSecondaryMaximumAutoRadioButton";
+      this.xAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.xAxisSecondaryMaximumAutoRadioButton.TabIndex = 7;
+      this.xAxisSecondaryMaximumAutoRadioButton.TabStop = true;
+      this.xAxisSecondaryMaximumAutoRadioButton.Text = "&Auto";
+      this.xAxisSecondaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisSecondaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMaximumRadioButton_CheckedChanged);
+      // 
+      // panel3
+      // 
+      this.panel3.Controls.Add(this.xAxisSecondaryMinimumFixedRadioButton);
+      this.panel3.Controls.Add(this.xAxisSecondaryMinimumAutoRadioButton);
+      this.panel3.Location = new System.Drawing.Point(66, 45);
+      this.panel3.Name = "panel3";
+      this.panel3.Size = new System.Drawing.Size(106, 20);
+      this.panel3.TabIndex = 9;
+      // 
+      // xAxisSecondaryMinimumFixedRadioButton
+      // 
+      this.xAxisSecondaryMinimumFixedRadioButton.AutoSize = true;
+      this.xAxisSecondaryMinimumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.xAxisSecondaryMinimumFixedRadioButton.Name = "xAxisSecondaryMinimumFixedRadioButton";
+      this.xAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.xAxisSecondaryMinimumFixedRadioButton.TabIndex = 4;
+      this.xAxisSecondaryMinimumFixedRadioButton.TabStop = true;
+      this.xAxisSecondaryMinimumFixedRadioButton.Text = "&Fixed:";
+      this.xAxisSecondaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisSecondaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMinimumRadioButton_CheckedChanged);
+      // 
+      // xAxisSecondaryMinimumAutoRadioButton
+      // 
+      this.xAxisSecondaryMinimumAutoRadioButton.AutoSize = true;
+      this.xAxisSecondaryMinimumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.xAxisSecondaryMinimumAutoRadioButton.Name = "xAxisSecondaryMinimumAutoRadioButton";
+      this.xAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.xAxisSecondaryMinimumAutoRadioButton.TabIndex = 3;
+      this.xAxisSecondaryMinimumAutoRadioButton.TabStop = true;
+      this.xAxisSecondaryMinimumAutoRadioButton.Text = "&Auto";
+      this.xAxisSecondaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.xAxisSecondaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMinimumRadioButton_CheckedChanged);
+      // 
+      // xAxisSecondaryMinimumFixedTextBox
+      // 
+      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
+      this.xAxisSecondaryMinimumFixedTextBox.Name = "xAxisSecondaryMinimumFixedTextBox";
+      this.xAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.xAxisSecondaryMinimumFixedTextBox.TabIndex = 5;
+      this.xAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMinimumFixedTextBox_Validating);
+      // 
+      // xAxisSecondaryMaximumFixedTextBox
+      // 
+      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
+      this.xAxisSecondaryMaximumFixedTextBox.Name = "xAxisSecondaryMaximumFixedTextBox";
+      this.xAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.xAxisSecondaryMaximumFixedTextBox.TabIndex = 9;
+      this.xAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMaximumFixedTextBox_Validating);
+      // 
       // label10
       // 
       this.label10.AutoSize = true;
-      this.label10.Location = new System.Drawing.Point(4, 26);
+      this.label10.Location = new System.Drawing.Point(6, 22);
       this.label10.Name = "label10";
       this.label10.Size = new System.Drawing.Size(30, 13);
       this.label10.TabIndex = 0;
-      this.label10.Text = "Title:";
+      this.label10.Text = "&Title:";
       // 
       // xAxisSecondaryTitleTextBox
       // 
-      this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
+      this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.xAxisSecondaryTitleTextBox.Name = "xAxisSecondaryTitleTextBox";
-      this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
+      this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
       this.xAxisSecondaryTitleTextBox.TabIndex = 1;
       this.xAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.xSecondaryTitleTextBox_Validated);
@@ -355,216 +438,30 @@
       // 
       this.label5.AutoSize = true;
-      this.label5.Location = new System.Drawing.Point(4, 78);
+      this.label5.Location = new System.Drawing.Point(6, 74);
       this.label5.Name = "label5";
       this.label5.Size = new System.Drawing.Size(54, 13);
-      this.label5.TabIndex = 4;
-      this.label5.Text = "Maximum:";
+      this.label5.TabIndex = 6;
+      this.label5.Text = "&Maximum:";
       // 
       // label6
       // 
       this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(4, 53);
+      this.label6.Location = new System.Drawing.Point(6, 48);
       this.label6.Name = "label6";
       this.label6.Size = new System.Drawing.Size(51, 13);
       this.label6.TabIndex = 2;
-      this.label6.Text = "Minimum:";
-      // 
-      // xAxisSecondaryMaximumPanel
-      // 
-      this.xAxisSecondaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumFixedTextBox);
-      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumFixedRadioButton);
-      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumAutoRadioButton);
-      this.xAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
-      this.xAxisSecondaryMaximumPanel.Name = "xAxisSecondaryMaximumPanel";
-      this.xAxisSecondaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
-      this.xAxisSecondaryMaximumPanel.TabIndex = 5;
-      // 
-      // xAxisSecondaryMaximumFixedTextBox
-      // 
-      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.xAxisSecondaryMaximumFixedTextBox.Name = "xAxisSecondaryMaximumFixedTextBox";
-      this.xAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.xAxisSecondaryMaximumFixedTextBox.TabIndex = 2;
-      this.xAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMaximumFixedTextBox_Validating);
-      // 
-      // xAxisSecondaryMaximumFixedRadioButton
-      // 
-      this.xAxisSecondaryMaximumFixedRadioButton.AutoSize = true;
-      this.xAxisSecondaryMaximumFixedRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.xAxisSecondaryMaximumFixedRadioButton.Name = "xAxisSecondaryMaximumFixedRadioButton";
-      this.xAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.xAxisSecondaryMaximumFixedRadioButton.TabIndex = 1;
-      this.xAxisSecondaryMaximumFixedRadioButton.TabStop = true;
-      this.xAxisSecondaryMaximumFixedRadioButton.Text = "Fixed";
-      this.xAxisSecondaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisSecondaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMaximumRadioButton_CheckedChanged);
-      // 
-      // xAxisSecondaryMaximumAutoRadioButton
-      // 
-      this.xAxisSecondaryMaximumAutoRadioButton.AutoSize = true;
-      this.xAxisSecondaryMaximumAutoRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.xAxisSecondaryMaximumAutoRadioButton.Name = "xAxisSecondaryMaximumAutoRadioButton";
-      this.xAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisSecondaryMaximumAutoRadioButton.TabIndex = 0;
-      this.xAxisSecondaryMaximumAutoRadioButton.TabStop = true;
-      this.xAxisSecondaryMaximumAutoRadioButton.Text = "Auto";
-      this.xAxisSecondaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisSecondaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMaximumRadioButton_CheckedChanged);
-      // 
-      // xAxisSecondaryMinimumPanel
-      // 
-      this.xAxisSecondaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisSecondaryMinimumPanel.Controls.Add(this.xAxisSecondaryMinimumFixedTextBox);
-      this.xAxisSecondaryMinimumPanel.Controls.Add(this.xAxisSecondaryMinimumFixedRadioButton);
-      this.xAxisSecondaryMinimumPanel.Controls.Add(this.xAxisSecondaryMinimumAutoRadioButton);
-      this.xAxisSecondaryMinimumPanel.Location = new System.Drawing.Point(63, 47);
-      this.xAxisSecondaryMinimumPanel.Name = "xAxisSecondaryMinimumPanel";
-      this.xAxisSecondaryMinimumPanel.Size = new System.Drawing.Size(245, 25);
-      this.xAxisSecondaryMinimumPanel.TabIndex = 3;
-      // 
-      // xAxisSecondaryMinimumFixedTextBox
-      // 
-      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.xAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.xAxisSecondaryMinimumFixedTextBox.Name = "xAxisSecondaryMinimumFixedTextBox";
-      this.xAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.xAxisSecondaryMinimumFixedTextBox.TabIndex = 2;
-      this.xAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMinimumFixedTextBox_Validating);
-      // 
-      // xAxisSecondaryMinimumFixedRadioButton
-      // 
-      this.xAxisSecondaryMinimumFixedRadioButton.AutoSize = true;
-      this.xAxisSecondaryMinimumFixedRadioButton.Location = new System.Drawing.Point(70, 3);
-      this.xAxisSecondaryMinimumFixedRadioButton.Name = "xAxisSecondaryMinimumFixedRadioButton";
-      this.xAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.xAxisSecondaryMinimumFixedRadioButton.TabIndex = 1;
-      this.xAxisSecondaryMinimumFixedRadioButton.TabStop = true;
-      this.xAxisSecondaryMinimumFixedRadioButton.Text = "Fixed";
-      this.xAxisSecondaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisSecondaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMinimumRadioButton_CheckedChanged);
-      // 
-      // xAxisSecondaryMinimumAutoRadioButton
-      // 
-      this.xAxisSecondaryMinimumAutoRadioButton.AutoSize = true;
-      this.xAxisSecondaryMinimumAutoRadioButton.Location = new System.Drawing.Point(4, 3);
-      this.xAxisSecondaryMinimumAutoRadioButton.Name = "xAxisSecondaryMinimumAutoRadioButton";
-      this.xAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisSecondaryMinimumAutoRadioButton.TabIndex = 0;
-      this.xAxisSecondaryMinimumAutoRadioButton.TabStop = true;
-      this.xAxisSecondaryMinimumAutoRadioButton.Text = "Auto";
-      this.xAxisSecondaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.xAxisSecondaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.xAxisSecondaryMinimumRadioButton_CheckedChanged);
+      this.label6.Text = "&Minimum:";
       // 
       // axisTabControl
       // 
-      this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.axisTabControl.Controls.Add(this.mainTabPage);
+      this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.axisTabControl.Controls.Add(this.xAxisTabPage);
       this.axisTabControl.Controls.Add(this.yAxisTabPage);
-      this.axisTabControl.Location = new System.Drawing.Point(0, 0);
+      this.axisTabControl.Location = new System.Drawing.Point(0, 84);
       this.axisTabControl.Name = "axisTabControl";
       this.axisTabControl.SelectedIndex = 0;
-      this.axisTabControl.Size = new System.Drawing.Size(336, 257);
-      this.axisTabControl.TabIndex = 0;
-      // 
-      // mainTabPage
-      // 
-      this.mainTabPage.Controls.Add(this.titleTextBox);
-      this.mainTabPage.Controls.Add(this.label15);
-      this.mainTabPage.Controls.Add(this.axisFontLabel);
-      this.mainTabPage.Controls.Add(this.titleFontLabel);
-      this.mainTabPage.Controls.Add(this.axisFontButton);
-      this.mainTabPage.Controls.Add(this.label3);
-      this.mainTabPage.Controls.Add(this.titleFontButton);
-      this.mainTabPage.Controls.Add(this.label2);
-      this.mainTabPage.Location = new System.Drawing.Point(4, 22);
-      this.mainTabPage.Name = "mainTabPage";
-      this.mainTabPage.Size = new System.Drawing.Size(328, 231);
-      this.mainTabPage.TabIndex = 2;
-      this.mainTabPage.Text = "Main";
-      this.mainTabPage.UseVisualStyleBackColor = true;
-      // 
-      // titleTextBox
-      // 
-      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.titleTextBox.Location = new System.Drawing.Point(72, 5);
-      this.titleTextBox.Name = "titleTextBox";
-      this.titleTextBox.Size = new System.Drawing.Size(253, 20);
-      this.titleTextBox.TabIndex = 4;
-      this.titleTextBox.Validated += new System.EventHandler(this.titleTextBox_Validated);
-      // 
-      // label15
-      // 
-      this.label15.AutoSize = true;
-      this.label15.Location = new System.Drawing.Point(12, 8);
-      this.label15.Name = "label15";
-      this.label15.Size = new System.Drawing.Size(30, 13);
-      this.label15.TabIndex = 3;
-      this.label15.Text = "Title:";
-      // 
-      // axisFontLabel
-      // 
-      this.axisFontLabel.AutoSize = true;
-      this.axisFontLabel.Location = new System.Drawing.Point(104, 65);
-      this.axisFontLabel.Name = "axisFontLabel";
-      this.axisFontLabel.Size = new System.Drawing.Size(13, 13);
-      this.axisFontLabel.TabIndex = 2;
-      this.axisFontLabel.Text = "()";
-      // 
-      // titleFontLabel
-      // 
-      this.titleFontLabel.AutoSize = true;
-      this.titleFontLabel.Location = new System.Drawing.Point(104, 36);
-      this.titleFontLabel.Name = "titleFontLabel";
-      this.titleFontLabel.Size = new System.Drawing.Size(13, 13);
-      this.titleFontLabel.TabIndex = 2;
-      this.titleFontLabel.Text = "()";
-      // 
-      // axisFontButton
-      // 
-      this.axisFontButton.Location = new System.Drawing.Point(72, 60);
-      this.axisFontButton.Name = "axisFontButton";
-      this.axisFontButton.Size = new System.Drawing.Size(26, 23);
-      this.axisFontButton.TabIndex = 1;
-      this.axisFontButton.Text = "...";
-      this.axisFontButton.UseVisualStyleBackColor = true;
-      this.axisFontButton.Click += new System.EventHandler(this.axisFontButton_Click);
-      // 
-      // label3
-      // 
-      this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(12, 65);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(53, 13);
-      this.label3.TabIndex = 0;
-      this.label3.Text = "Axis Font:";
-      // 
-      // titleFontButton
-      // 
-      this.titleFontButton.Location = new System.Drawing.Point(72, 31);
-      this.titleFontButton.Name = "titleFontButton";
-      this.titleFontButton.Size = new System.Drawing.Size(26, 23);
-      this.titleFontButton.TabIndex = 1;
-      this.titleFontButton.Text = "...";
-      this.titleFontButton.UseVisualStyleBackColor = true;
-      this.titleFontButton.Click += new System.EventHandler(this.titleFontButton_Click);
-      // 
-      // label2
-      // 
-      this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(12, 36);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(54, 13);
-      this.label2.TabIndex = 0;
-      this.label2.Text = "Title Font:";
+      this.axisTabControl.Size = new System.Drawing.Size(455, 236);
+      this.axisTabControl.TabIndex = 8;
       // 
       // xAxisTabPage
@@ -575,5 +472,5 @@
       this.xAxisTabPage.Name = "xAxisTabPage";
       this.xAxisTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.xAxisTabPage.Size = new System.Drawing.Size(328, 231);
+      this.xAxisTabPage.Size = new System.Drawing.Size(447, 210);
       this.xAxisTabPage.TabIndex = 0;
       this.xAxisTabPage.Text = "X-Axis";
@@ -587,5 +484,5 @@
       this.yAxisTabPage.Name = "yAxisTabPage";
       this.yAxisTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.yAxisTabPage.Size = new System.Drawing.Size(328, 231);
+      this.yAxisTabPage.Size = new System.Drawing.Size(447, 210);
       this.yAxisTabPage.TabIndex = 1;
       this.yAxisTabPage.Text = "Y-Axis";
@@ -594,258 +491,331 @@
       // yAxisSecondaryGroupBox
       // 
-      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryGroupBox.Controls.Add(this.panel8);
+      this.yAxisSecondaryGroupBox.Controls.Add(this.panel7);
+      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryMinimumFixedTextBox);
+      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryMaximumFixedTextBox);
       this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryTitleTextBox);
       this.yAxisSecondaryGroupBox.Controls.Add(this.label4);
       this.yAxisSecondaryGroupBox.Controls.Add(this.label13);
       this.yAxisSecondaryGroupBox.Controls.Add(this.label14);
-      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryMaximumPanel);
-      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryMinimumPanel);
-      this.yAxisSecondaryGroupBox.Location = new System.Drawing.Point(6, 119);
+      this.yAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 108);
       this.yAxisSecondaryGroupBox.Name = "yAxisSecondaryGroupBox";
-      this.yAxisSecondaryGroupBox.Size = new System.Drawing.Size(316, 106);
+      this.yAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 99);
       this.yAxisSecondaryGroupBox.TabIndex = 1;
       this.yAxisSecondaryGroupBox.TabStop = false;
       this.yAxisSecondaryGroupBox.Text = "Secondary Axis";
       // 
+      // panel8
+      // 
+      this.panel8.Controls.Add(this.yAxisSecondaryMaximumFixedRadioButton);
+      this.panel8.Controls.Add(this.yAxisSecondaryMaximumAutoRadioButton);
+      this.panel8.Location = new System.Drawing.Point(66, 71);
+      this.panel8.Name = "panel8";
+      this.panel8.Size = new System.Drawing.Size(106, 20);
+      this.panel8.TabIndex = 10;
+      // 
+      // yAxisSecondaryMaximumFixedRadioButton
+      // 
+      this.yAxisSecondaryMaximumFixedRadioButton.AutoSize = true;
+      this.yAxisSecondaryMaximumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.yAxisSecondaryMaximumFixedRadioButton.Name = "yAxisSecondaryMaximumFixedRadioButton";
+      this.yAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.yAxisSecondaryMaximumFixedRadioButton.TabIndex = 8;
+      this.yAxisSecondaryMaximumFixedRadioButton.TabStop = true;
+      this.yAxisSecondaryMaximumFixedRadioButton.Text = "&Fixed:";
+      this.yAxisSecondaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisSecondaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMaximumRadioButton_CheckedChanged);
+      // 
+      // yAxisSecondaryMaximumAutoRadioButton
+      // 
+      this.yAxisSecondaryMaximumAutoRadioButton.AutoSize = true;
+      this.yAxisSecondaryMaximumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.yAxisSecondaryMaximumAutoRadioButton.Name = "yAxisSecondaryMaximumAutoRadioButton";
+      this.yAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.yAxisSecondaryMaximumAutoRadioButton.TabIndex = 7;
+      this.yAxisSecondaryMaximumAutoRadioButton.TabStop = true;
+      this.yAxisSecondaryMaximumAutoRadioButton.Text = "&Auto";
+      this.yAxisSecondaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisSecondaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMaximumRadioButton_CheckedChanged);
+      // 
+      // panel7
+      // 
+      this.panel7.Controls.Add(this.yAxisSecondaryMinimumFixedRadioButton);
+      this.panel7.Controls.Add(this.yAxisSecondaryMinimumAutoRadioButton);
+      this.panel7.Location = new System.Drawing.Point(66, 45);
+      this.panel7.Name = "panel7";
+      this.panel7.Size = new System.Drawing.Size(106, 20);
+      this.panel7.TabIndex = 10;
+      // 
+      // yAxisSecondaryMinimumFixedRadioButton
+      // 
+      this.yAxisSecondaryMinimumFixedRadioButton.AutoSize = true;
+      this.yAxisSecondaryMinimumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.yAxisSecondaryMinimumFixedRadioButton.Name = "yAxisSecondaryMinimumFixedRadioButton";
+      this.yAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.yAxisSecondaryMinimumFixedRadioButton.TabIndex = 4;
+      this.yAxisSecondaryMinimumFixedRadioButton.TabStop = true;
+      this.yAxisSecondaryMinimumFixedRadioButton.Text = "&Fixed:";
+      this.yAxisSecondaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisSecondaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMinimumRadioButton_CheckedChanged);
+      // 
+      // yAxisSecondaryMinimumAutoRadioButton
+      // 
+      this.yAxisSecondaryMinimumAutoRadioButton.AutoSize = true;
+      this.yAxisSecondaryMinimumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.yAxisSecondaryMinimumAutoRadioButton.Name = "yAxisSecondaryMinimumAutoRadioButton";
+      this.yAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.yAxisSecondaryMinimumAutoRadioButton.TabIndex = 3;
+      this.yAxisSecondaryMinimumAutoRadioButton.TabStop = true;
+      this.yAxisSecondaryMinimumAutoRadioButton.Text = "&Auto";
+      this.yAxisSecondaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisSecondaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMinimumRadioButton_CheckedChanged);
+      // 
+      // yAxisSecondaryMinimumFixedTextBox
+      // 
+      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
+      this.yAxisSecondaryMinimumFixedTextBox.Name = "yAxisSecondaryMinimumFixedTextBox";
+      this.yAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.yAxisSecondaryMinimumFixedTextBox.TabIndex = 5;
+      this.yAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMinimumFixedTextBox_Validating);
+      // 
+      // yAxisSecondaryMaximumFixedTextBox
+      // 
+      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
+      this.yAxisSecondaryMaximumFixedTextBox.Name = "yAxisSecondaryMaximumFixedTextBox";
+      this.yAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.yAxisSecondaryMaximumFixedTextBox.TabIndex = 9;
+      this.yAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMaximumFixedTextBox_Validating);
+      // 
       // label13
       // 
       this.label13.AutoSize = true;
-      this.label13.Location = new System.Drawing.Point(4, 78);
+      this.label13.Location = new System.Drawing.Point(6, 74);
       this.label13.Name = "label13";
       this.label13.Size = new System.Drawing.Size(54, 13);
-      this.label13.TabIndex = 4;
-      this.label13.Text = "Maximum:";
+      this.label13.TabIndex = 6;
+      this.label13.Text = "&Maximum:";
       // 
       // label14
       // 
       this.label14.AutoSize = true;
-      this.label14.Location = new System.Drawing.Point(4, 53);
+      this.label14.Location = new System.Drawing.Point(6, 48);
       this.label14.Name = "label14";
       this.label14.Size = new System.Drawing.Size(51, 13);
       this.label14.TabIndex = 2;
-      this.label14.Text = "Minimum:";
-      // 
-      // yAxisSecondaryMaximumPanel
-      // 
-      this.yAxisSecondaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumFixedTextBox);
-      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumFixedRadioButton);
-      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumAutoRadioButton);
-      this.yAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
-      this.yAxisSecondaryMaximumPanel.Name = "yAxisSecondaryMaximumPanel";
-      this.yAxisSecondaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
-      this.yAxisSecondaryMaximumPanel.TabIndex = 5;
-      // 
-      // yAxisSecondaryMaximumFixedTextBox
-      // 
-      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.yAxisSecondaryMaximumFixedTextBox.Name = "yAxisSecondaryMaximumFixedTextBox";
-      this.yAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.yAxisSecondaryMaximumFixedTextBox.TabIndex = 2;
-      this.yAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMaximumFixedTextBox_Validating);
-      // 
-      // yAxisSecondaryMaximumFixedRadioButton
-      // 
-      this.yAxisSecondaryMaximumFixedRadioButton.AutoSize = true;
-      this.yAxisSecondaryMaximumFixedRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.yAxisSecondaryMaximumFixedRadioButton.Name = "yAxisSecondaryMaximumFixedRadioButton";
-      this.yAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.yAxisSecondaryMaximumFixedRadioButton.TabIndex = 1;
-      this.yAxisSecondaryMaximumFixedRadioButton.TabStop = true;
-      this.yAxisSecondaryMaximumFixedRadioButton.Text = "Fixed";
-      this.yAxisSecondaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisSecondaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMaximumRadioButton_CheckedChanged);
-      // 
-      // yAxisSecondaryMaximumAutoRadioButton
-      // 
-      this.yAxisSecondaryMaximumAutoRadioButton.AutoSize = true;
-      this.yAxisSecondaryMaximumAutoRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.yAxisSecondaryMaximumAutoRadioButton.Name = "yAxisSecondaryMaximumAutoRadioButton";
-      this.yAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisSecondaryMaximumAutoRadioButton.TabIndex = 0;
-      this.yAxisSecondaryMaximumAutoRadioButton.TabStop = true;
-      this.yAxisSecondaryMaximumAutoRadioButton.Text = "Auto";
-      this.yAxisSecondaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisSecondaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMaximumRadioButton_CheckedChanged);
-      // 
-      // yAxisSecondaryMinimumPanel
-      // 
-      this.yAxisSecondaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisSecondaryMinimumPanel.Controls.Add(this.yAxisSecondaryMinimumFixedTextBox);
-      this.yAxisSecondaryMinimumPanel.Controls.Add(this.yAxisSecondaryMinimumFixedRadioButton);
-      this.yAxisSecondaryMinimumPanel.Controls.Add(this.yAxisSecondaryMinimumAutoRadioButton);
-      this.yAxisSecondaryMinimumPanel.Location = new System.Drawing.Point(63, 47);
-      this.yAxisSecondaryMinimumPanel.Name = "yAxisSecondaryMinimumPanel";
-      this.yAxisSecondaryMinimumPanel.Size = new System.Drawing.Size(245, 25);
-      this.yAxisSecondaryMinimumPanel.TabIndex = 3;
-      // 
-      // yAxisSecondaryMinimumFixedTextBox
-      // 
-      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.yAxisSecondaryMinimumFixedTextBox.Name = "yAxisSecondaryMinimumFixedTextBox";
-      this.yAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.yAxisSecondaryMinimumFixedTextBox.TabIndex = 2;
-      this.yAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMinimumFixedTextBox_Validating);
-      // 
-      // yAxisSecondaryMinimumFixedRadioButton
-      // 
-      this.yAxisSecondaryMinimumFixedRadioButton.AutoSize = true;
-      this.yAxisSecondaryMinimumFixedRadioButton.Location = new System.Drawing.Point(70, 3);
-      this.yAxisSecondaryMinimumFixedRadioButton.Name = "yAxisSecondaryMinimumFixedRadioButton";
-      this.yAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.yAxisSecondaryMinimumFixedRadioButton.TabIndex = 1;
-      this.yAxisSecondaryMinimumFixedRadioButton.TabStop = true;
-      this.yAxisSecondaryMinimumFixedRadioButton.Text = "Fixed";
-      this.yAxisSecondaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisSecondaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMinimumRadioButton_CheckedChanged);
-      // 
-      // yAxisSecondaryMinimumAutoRadioButton
-      // 
-      this.yAxisSecondaryMinimumAutoRadioButton.AutoSize = true;
-      this.yAxisSecondaryMinimumAutoRadioButton.Location = new System.Drawing.Point(4, 3);
-      this.yAxisSecondaryMinimumAutoRadioButton.Name = "yAxisSecondaryMinimumAutoRadioButton";
-      this.yAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisSecondaryMinimumAutoRadioButton.TabIndex = 0;
-      this.yAxisSecondaryMinimumAutoRadioButton.TabStop = true;
-      this.yAxisSecondaryMinimumAutoRadioButton.Text = "Auto";
-      this.yAxisSecondaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisSecondaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisSecondaryMinimumRadioButton_CheckedChanged);
+      this.label14.Text = "&Minimum:";
       // 
       // yAxisPrimaryGroupBox
       // 
-      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryGroupBox.Controls.Add(this.panel6);
+      this.yAxisPrimaryGroupBox.Controls.Add(this.panel5);
+      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryMinimumFixedTextBox);
+      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryMaximumFixedTextBox);
       this.yAxisPrimaryGroupBox.Controls.Add(this.label7);
       this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryTitleTextBox);
       this.yAxisPrimaryGroupBox.Controls.Add(this.label8);
       this.yAxisPrimaryGroupBox.Controls.Add(this.label1);
-      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryMaximumPanel);
-      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryMinimumPanel);
-      this.yAxisPrimaryGroupBox.Location = new System.Drawing.Point(6, 6);
+      this.yAxisPrimaryGroupBox.Location = new System.Drawing.Point(3, 3);
       this.yAxisPrimaryGroupBox.Name = "yAxisPrimaryGroupBox";
-      this.yAxisPrimaryGroupBox.Size = new System.Drawing.Size(316, 107);
+      this.yAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 99);
       this.yAxisPrimaryGroupBox.TabIndex = 0;
       this.yAxisPrimaryGroupBox.TabStop = false;
       this.yAxisPrimaryGroupBox.Text = "Primary Axis";
       // 
+      // panel6
+      // 
+      this.panel6.Controls.Add(this.yAxisPrimaryMaximumFixedRadioButton);
+      this.panel6.Controls.Add(this.yAxisPrimaryMaximumAutoRadioButton);
+      this.panel6.Location = new System.Drawing.Point(66, 71);
+      this.panel6.Name = "panel6";
+      this.panel6.Size = new System.Drawing.Size(106, 20);
+      this.panel6.TabIndex = 10;
+      // 
+      // yAxisPrimaryMaximumFixedRadioButton
+      // 
+      this.yAxisPrimaryMaximumFixedRadioButton.AutoSize = true;
+      this.yAxisPrimaryMaximumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.yAxisPrimaryMaximumFixedRadioButton.Name = "yAxisPrimaryMaximumFixedRadioButton";
+      this.yAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.yAxisPrimaryMaximumFixedRadioButton.TabIndex = 8;
+      this.yAxisPrimaryMaximumFixedRadioButton.TabStop = true;
+      this.yAxisPrimaryMaximumFixedRadioButton.Text = "&Fixed:";
+      this.yAxisPrimaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisPrimaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMaximumRadioButton_CheckedChanged);
+      // 
+      // yAxisPrimaryMaximumAutoRadioButton
+      // 
+      this.yAxisPrimaryMaximumAutoRadioButton.AutoSize = true;
+      this.yAxisPrimaryMaximumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.yAxisPrimaryMaximumAutoRadioButton.Name = "yAxisPrimaryMaximumAutoRadioButton";
+      this.yAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.yAxisPrimaryMaximumAutoRadioButton.TabIndex = 7;
+      this.yAxisPrimaryMaximumAutoRadioButton.TabStop = true;
+      this.yAxisPrimaryMaximumAutoRadioButton.Text = "&Auto";
+      this.yAxisPrimaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisPrimaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMaximumRadioButton_CheckedChanged);
+      // 
+      // panel5
+      // 
+      this.panel5.Controls.Add(this.yAxisPrimaryMinimumAutoRadioButton);
+      this.panel5.Controls.Add(this.yAxisPrimaryMinimumFixedRadioButton);
+      this.panel5.Location = new System.Drawing.Point(66, 45);
+      this.panel5.Name = "panel5";
+      this.panel5.Size = new System.Drawing.Size(106, 20);
+      this.panel5.TabIndex = 10;
+      // 
+      // yAxisPrimaryMinimumAutoRadioButton
+      // 
+      this.yAxisPrimaryMinimumAutoRadioButton.AutoSize = true;
+      this.yAxisPrimaryMinimumAutoRadioButton.Location = new System.Drawing.Point(0, 1);
+      this.yAxisPrimaryMinimumAutoRadioButton.Name = "yAxisPrimaryMinimumAutoRadioButton";
+      this.yAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
+      this.yAxisPrimaryMinimumAutoRadioButton.TabIndex = 3;
+      this.yAxisPrimaryMinimumAutoRadioButton.TabStop = true;
+      this.yAxisPrimaryMinimumAutoRadioButton.Text = "&Auto";
+      this.yAxisPrimaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisPrimaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMinimumRadioButton_CheckedChanged);
+      // 
+      // yAxisPrimaryMinimumFixedRadioButton
+      // 
+      this.yAxisPrimaryMinimumFixedRadioButton.AutoSize = true;
+      this.yAxisPrimaryMinimumFixedRadioButton.Location = new System.Drawing.Point(53, 1);
+      this.yAxisPrimaryMinimumFixedRadioButton.Name = "yAxisPrimaryMinimumFixedRadioButton";
+      this.yAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
+      this.yAxisPrimaryMinimumFixedRadioButton.TabIndex = 4;
+      this.yAxisPrimaryMinimumFixedRadioButton.TabStop = true;
+      this.yAxisPrimaryMinimumFixedRadioButton.Text = "&Fixed:";
+      this.yAxisPrimaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
+      this.yAxisPrimaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMinimumRadioButton_CheckedChanged);
+      // 
+      // yAxisPrimaryMinimumFixedTextBox
+      // 
+      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
+      this.yAxisPrimaryMinimumFixedTextBox.Name = "yAxisPrimaryMinimumFixedTextBox";
+      this.yAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.yAxisPrimaryMinimumFixedTextBox.TabIndex = 5;
+      this.yAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMinimumFixedTextBox_Validating);
+      // 
+      // yAxisPrimaryMaximumFixedTextBox
+      // 
+      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
+      this.yAxisPrimaryMaximumFixedTextBox.Name = "yAxisPrimaryMaximumFixedTextBox";
+      this.yAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
+      this.yAxisPrimaryMaximumFixedTextBox.TabIndex = 9;
+      this.yAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMaximumFixedTextBox_Validating);
+      // 
       // label7
       // 
       this.label7.AutoSize = true;
-      this.label7.Location = new System.Drawing.Point(4, 78);
+      this.label7.Location = new System.Drawing.Point(6, 74);
       this.label7.Name = "label7";
       this.label7.Size = new System.Drawing.Size(54, 13);
-      this.label7.TabIndex = 4;
-      this.label7.Text = "Maximum:";
+      this.label7.TabIndex = 6;
+      this.label7.Text = "&Maximum:";
       // 
       // label8
       // 
       this.label8.AutoSize = true;
-      this.label8.Location = new System.Drawing.Point(4, 53);
+      this.label8.Location = new System.Drawing.Point(6, 48);
       this.label8.Name = "label8";
       this.label8.Size = new System.Drawing.Size(51, 13);
       this.label8.TabIndex = 2;
-      this.label8.Text = "Minimum:";
-      // 
-      // yAxisPrimaryMaximumPanel
-      // 
-      this.yAxisPrimaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumFixedTextBox);
-      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumFixedRadioButton);
-      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumAutoRadioButton);
-      this.yAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
-      this.yAxisPrimaryMaximumPanel.Name = "yAxisPrimaryMaximumPanel";
-      this.yAxisPrimaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
-      this.yAxisPrimaryMaximumPanel.TabIndex = 5;
-      // 
-      // yAxisPrimaryMaximumFixedTextBox
-      // 
-      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.yAxisPrimaryMaximumFixedTextBox.Name = "yAxisPrimaryMaximumFixedTextBox";
-      this.yAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.yAxisPrimaryMaximumFixedTextBox.TabIndex = 2;
-      this.yAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMaximumFixedTextBox_Validating);
-      // 
-      // yAxisPrimaryMaximumFixedRadioButton
-      // 
-      this.yAxisPrimaryMaximumFixedRadioButton.AutoSize = true;
-      this.yAxisPrimaryMaximumFixedRadioButton.Location = new System.Drawing.Point(70, 4);
-      this.yAxisPrimaryMaximumFixedRadioButton.Name = "yAxisPrimaryMaximumFixedRadioButton";
-      this.yAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.yAxisPrimaryMaximumFixedRadioButton.TabIndex = 1;
-      this.yAxisPrimaryMaximumFixedRadioButton.TabStop = true;
-      this.yAxisPrimaryMaximumFixedRadioButton.Text = "Fixed";
-      this.yAxisPrimaryMaximumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisPrimaryMaximumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMaximumRadioButton_CheckedChanged);
-      // 
-      // yAxisPrimaryMaximumAutoRadioButton
-      // 
-      this.yAxisPrimaryMaximumAutoRadioButton.AutoSize = true;
-      this.yAxisPrimaryMaximumAutoRadioButton.Location = new System.Drawing.Point(4, 4);
-      this.yAxisPrimaryMaximumAutoRadioButton.Name = "yAxisPrimaryMaximumAutoRadioButton";
-      this.yAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisPrimaryMaximumAutoRadioButton.TabIndex = 0;
-      this.yAxisPrimaryMaximumAutoRadioButton.TabStop = true;
-      this.yAxisPrimaryMaximumAutoRadioButton.Text = "Auto";
-      this.yAxisPrimaryMaximumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisPrimaryMaximumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMaximumRadioButton_CheckedChanged);
-      // 
-      // yAxisPrimaryMinimumPanel
-      // 
-      this.yAxisPrimaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisPrimaryMinimumPanel.Controls.Add(this.yAxisPrimaryMinimumFixedTextBox);
-      this.yAxisPrimaryMinimumPanel.Controls.Add(this.yAxisPrimaryMinimumFixedRadioButton);
-      this.yAxisPrimaryMinimumPanel.Controls.Add(this.yAxisPrimaryMinimumAutoRadioButton);
-      this.yAxisPrimaryMinimumPanel.Location = new System.Drawing.Point(63, 47);
-      this.yAxisPrimaryMinimumPanel.Name = "yAxisPrimaryMinimumPanel";
-      this.yAxisPrimaryMinimumPanel.Size = new System.Drawing.Size(245, 25);
-      this.yAxisPrimaryMinimumPanel.TabIndex = 3;
-      // 
-      // yAxisPrimaryMinimumFixedTextBox
-      // 
-      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.yAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
-      this.yAxisPrimaryMinimumFixedTextBox.Name = "yAxisPrimaryMinimumFixedTextBox";
-      this.yAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
-      this.yAxisPrimaryMinimumFixedTextBox.TabIndex = 2;
-      this.yAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMinimumFixedTextBox_Validating);
-      // 
-      // yAxisPrimaryMinimumFixedRadioButton
-      // 
-      this.yAxisPrimaryMinimumFixedRadioButton.AutoSize = true;
-      this.yAxisPrimaryMinimumFixedRadioButton.Location = new System.Drawing.Point(70, 3);
-      this.yAxisPrimaryMinimumFixedRadioButton.Name = "yAxisPrimaryMinimumFixedRadioButton";
-      this.yAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(50, 17);
-      this.yAxisPrimaryMinimumFixedRadioButton.TabIndex = 1;
-      this.yAxisPrimaryMinimumFixedRadioButton.TabStop = true;
-      this.yAxisPrimaryMinimumFixedRadioButton.Text = "Fixed";
-      this.yAxisPrimaryMinimumFixedRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisPrimaryMinimumFixedRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMinimumRadioButton_CheckedChanged);
-      // 
-      // yAxisPrimaryMinimumAutoRadioButton
-      // 
-      this.yAxisPrimaryMinimumAutoRadioButton.AutoSize = true;
-      this.yAxisPrimaryMinimumAutoRadioButton.Location = new System.Drawing.Point(4, 3);
-      this.yAxisPrimaryMinimumAutoRadioButton.Name = "yAxisPrimaryMinimumAutoRadioButton";
-      this.yAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisPrimaryMinimumAutoRadioButton.TabIndex = 0;
-      this.yAxisPrimaryMinimumAutoRadioButton.TabStop = true;
-      this.yAxisPrimaryMinimumAutoRadioButton.Text = "Auto";
-      this.yAxisPrimaryMinimumAutoRadioButton.UseVisualStyleBackColor = true;
-      this.yAxisPrimaryMinimumAutoRadioButton.CheckedChanged += new System.EventHandler(this.yAxisPrimaryMinimumRadioButton_CheckedChanged);
+      this.label8.Text = "&Minimum:";
+      // 
+      // titleTextBox
+      // 
+      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.titleTextBox.Location = new System.Drawing.Point(66, 0);
+      this.titleTextBox.Name = "titleTextBox";
+      this.titleTextBox.Size = new System.Drawing.Size(389, 20);
+      this.titleTextBox.TabIndex = 1;
+      this.titleTextBox.Validated += new System.EventHandler(this.titleTextBox_Validated);
+      // 
+      // label15
+      // 
+      this.label15.AutoSize = true;
+      this.label15.Location = new System.Drawing.Point(3, 3);
+      this.label15.Name = "label15";
+      this.label15.Size = new System.Drawing.Size(30, 13);
+      this.label15.TabIndex = 0;
+      this.label15.Text = "&Title:";
+      // 
+      // axisFontLabel
+      // 
+      this.axisFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.axisFontLabel.AutoSize = true;
+      this.axisFontLabel.Location = new System.Drawing.Point(98, 60);
+      this.axisFontLabel.Name = "axisFontLabel";
+      this.axisFontLabel.Size = new System.Drawing.Size(43, 13);
+      this.axisFontLabel.TabIndex = 7;
+      this.axisFontLabel.Text = "( none )";
+      // 
+      // titleFontLabel
+      // 
+      this.titleFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.titleFontLabel.AutoSize = true;
+      this.titleFontLabel.Location = new System.Drawing.Point(98, 31);
+      this.titleFontLabel.Name = "titleFontLabel";
+      this.titleFontLabel.Size = new System.Drawing.Size(43, 13);
+      this.titleFontLabel.TabIndex = 4;
+      this.titleFontLabel.Text = "( none )";
+      // 
+      // axisFontButton
+      // 
+      this.axisFontButton.Location = new System.Drawing.Point(66, 55);
+      this.axisFontButton.Name = "axisFontButton";
+      this.axisFontButton.Size = new System.Drawing.Size(26, 23);
+      this.axisFontButton.TabIndex = 6;
+      this.axisFontButton.Text = "...";
+      this.axisFontButton.UseVisualStyleBackColor = true;
+      this.axisFontButton.Click += new System.EventHandler(this.axisFontButton_Click);
+      // 
+      // label3
+      // 
+      this.label3.AutoSize = true;
+      this.label3.Location = new System.Drawing.Point(3, 60);
+      this.label3.Name = "label3";
+      this.label3.Size = new System.Drawing.Size(57, 13);
+      this.label3.TabIndex = 5;
+      this.label3.Text = "&Axes Font:";
+      // 
+      // titleFontButton
+      // 
+      this.titleFontButton.Location = new System.Drawing.Point(66, 26);
+      this.titleFontButton.Name = "titleFontButton";
+      this.titleFontButton.Size = new System.Drawing.Size(26, 23);
+      this.titleFontButton.TabIndex = 3;
+      this.titleFontButton.Text = "...";
+      this.titleFontButton.UseVisualStyleBackColor = true;
+      this.titleFontButton.Click += new System.EventHandler(this.titleFontButton_Click);
+      // 
+      // label2
+      // 
+      this.label2.AutoSize = true;
+      this.label2.Location = new System.Drawing.Point(3, 31);
+      this.label2.Name = "label2";
+      this.label2.Size = new System.Drawing.Size(54, 13);
+      this.label2.TabIndex = 2;
+      this.label2.Text = "&Title Font:";
       // 
       // errorProvider
       // 
+      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
       this.errorProvider.ContainerControl = this;
       // 
@@ -859,38 +829,45 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.axisFontLabel);
+      this.Controls.Add(this.label15);
+      this.Controls.Add(this.axisFontButton);
+      this.Controls.Add(this.titleFontLabel);
+      this.Controls.Add(this.label3);
+      this.Controls.Add(this.titleTextBox);
       this.Controls.Add(this.axisTabControl);
+      this.Controls.Add(this.label2);
+      this.Controls.Add(this.titleFontButton);
       this.Name = "DataTableVisualPropertiesControl";
-      this.Size = new System.Drawing.Size(336, 257);
+      this.Size = new System.Drawing.Size(455, 322);
       this.xAxisPrimaryGroupBox.ResumeLayout(false);
       this.xAxisPrimaryGroupBox.PerformLayout();
-      this.xAxisPrimaryMaximumPanel.ResumeLayout(false);
-      this.xAxisPrimaryMaximumPanel.PerformLayout();
-      this.xAxisPrimaryMinimumPanel.ResumeLayout(false);
-      this.xAxisPrimaryMinimumPanel.PerformLayout();
+      this.panel2.ResumeLayout(false);
+      this.panel2.PerformLayout();
+      this.panel1.ResumeLayout(false);
+      this.panel1.PerformLayout();
       this.xAxisSecondaryGroupBox.ResumeLayout(false);
       this.xAxisSecondaryGroupBox.PerformLayout();
-      this.xAxisSecondaryMaximumPanel.ResumeLayout(false);
-      this.xAxisSecondaryMaximumPanel.PerformLayout();
-      this.xAxisSecondaryMinimumPanel.ResumeLayout(false);
-      this.xAxisSecondaryMinimumPanel.PerformLayout();
+      this.panel4.ResumeLayout(false);
+      this.panel4.PerformLayout();
+      this.panel3.ResumeLayout(false);
+      this.panel3.PerformLayout();
       this.axisTabControl.ResumeLayout(false);
-      this.mainTabPage.ResumeLayout(false);
-      this.mainTabPage.PerformLayout();
       this.xAxisTabPage.ResumeLayout(false);
       this.yAxisTabPage.ResumeLayout(false);
       this.yAxisSecondaryGroupBox.ResumeLayout(false);
       this.yAxisSecondaryGroupBox.PerformLayout();
-      this.yAxisSecondaryMaximumPanel.ResumeLayout(false);
-      this.yAxisSecondaryMaximumPanel.PerformLayout();
-      this.yAxisSecondaryMinimumPanel.ResumeLayout(false);
-      this.yAxisSecondaryMinimumPanel.PerformLayout();
+      this.panel8.ResumeLayout(false);
+      this.panel8.PerformLayout();
+      this.panel7.ResumeLayout(false);
+      this.panel7.PerformLayout();
       this.yAxisPrimaryGroupBox.ResumeLayout(false);
       this.yAxisPrimaryGroupBox.PerformLayout();
-      this.yAxisPrimaryMaximumPanel.ResumeLayout(false);
-      this.yAxisPrimaryMaximumPanel.PerformLayout();
-      this.yAxisPrimaryMinimumPanel.ResumeLayout(false);
-      this.yAxisPrimaryMinimumPanel.PerformLayout();
+      this.panel6.ResumeLayout(false);
+      this.panel6.PerformLayout();
+      this.panel5.ResumeLayout(false);
+      this.panel5.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
+      this.PerformLayout();
 
     }
@@ -907,9 +884,7 @@
     private System.Windows.Forms.TextBox xAxisPrimaryTitleTextBox;
     private System.Windows.Forms.Label label11;
-    private System.Windows.Forms.Panel xAxisPrimaryMaximumPanel;
     private System.Windows.Forms.TextBox xAxisPrimaryMaximumFixedTextBox;
     private System.Windows.Forms.RadioButton xAxisPrimaryMaximumFixedRadioButton;
     private System.Windows.Forms.RadioButton xAxisPrimaryMaximumAutoRadioButton;
-    private System.Windows.Forms.Panel xAxisPrimaryMinimumPanel;
     private System.Windows.Forms.TextBox xAxisPrimaryMinimumFixedTextBox;
     private System.Windows.Forms.RadioButton xAxisPrimaryMinimumFixedRadioButton;
@@ -920,9 +895,7 @@
     private System.Windows.Forms.Label label5;
     private System.Windows.Forms.Label label6;
-    private System.Windows.Forms.Panel xAxisSecondaryMaximumPanel;
     private System.Windows.Forms.TextBox xAxisSecondaryMaximumFixedTextBox;
     private System.Windows.Forms.RadioButton xAxisSecondaryMaximumFixedRadioButton;
     private System.Windows.Forms.RadioButton xAxisSecondaryMaximumAutoRadioButton;
-    private System.Windows.Forms.Panel xAxisSecondaryMinimumPanel;
     private System.Windows.Forms.TextBox xAxisSecondaryMinimumFixedTextBox;
     private System.Windows.Forms.RadioButton xAxisSecondaryMinimumFixedRadioButton;
@@ -934,9 +907,7 @@
     private System.Windows.Forms.Label label13;
     private System.Windows.Forms.Label label14;
-    private System.Windows.Forms.Panel yAxisSecondaryMaximumPanel;
     private System.Windows.Forms.TextBox yAxisSecondaryMaximumFixedTextBox;
     private System.Windows.Forms.RadioButton yAxisSecondaryMaximumFixedRadioButton;
     private System.Windows.Forms.RadioButton yAxisSecondaryMaximumAutoRadioButton;
-    private System.Windows.Forms.Panel yAxisSecondaryMinimumPanel;
     private System.Windows.Forms.TextBox yAxisSecondaryMinimumFixedTextBox;
     private System.Windows.Forms.RadioButton yAxisSecondaryMinimumFixedRadioButton;
@@ -945,14 +916,11 @@
     private System.Windows.Forms.Label label7;
     private System.Windows.Forms.Label label8;
-    private System.Windows.Forms.Panel yAxisPrimaryMaximumPanel;
     private System.Windows.Forms.TextBox yAxisPrimaryMaximumFixedTextBox;
     private System.Windows.Forms.RadioButton yAxisPrimaryMaximumFixedRadioButton;
     private System.Windows.Forms.RadioButton yAxisPrimaryMaximumAutoRadioButton;
-    private System.Windows.Forms.Panel yAxisPrimaryMinimumPanel;
     private System.Windows.Forms.TextBox yAxisPrimaryMinimumFixedTextBox;
     private System.Windows.Forms.RadioButton yAxisPrimaryMinimumFixedRadioButton;
     private System.Windows.Forms.RadioButton yAxisPrimaryMinimumAutoRadioButton;
     private System.Windows.Forms.ErrorProvider errorProvider;
-    private System.Windows.Forms.TabPage mainTabPage;
     private System.Windows.Forms.FontDialog titleFontDialog;
     private System.Windows.Forms.Button titleFontButton;
@@ -965,4 +933,12 @@
     private System.Windows.Forms.Label label15;
     private System.Windows.Forms.TextBox titleTextBox;
+    private System.Windows.Forms.Panel panel1;
+    private System.Windows.Forms.Panel panel2;
+    private System.Windows.Forms.Panel panel4;
+    private System.Windows.Forms.Panel panel3;
+    private System.Windows.Forms.Panel panel6;
+    private System.Windows.Forms.Panel panel5;
+    private System.Windows.Forms.Panel panel7;
+    private System.Windows.Forms.Panel panel8;
   }
 }
Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs	(revision 7244)
@@ -42,4 +42,20 @@
     public DataTableVisualPropertiesControl() {
       InitializeComponent();
+      errorProvider.SetIconAlignment(xAxisPrimaryMinimumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(xAxisPrimaryMaximumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(xAxisSecondaryMinimumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(xAxisSecondaryMaximumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(yAxisPrimaryMinimumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(yAxisPrimaryMaximumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(yAxisSecondaryMinimumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconAlignment(yAxisSecondaryMaximumFixedTextBox, ErrorIconAlignment.MiddleLeft);
+      errorProvider.SetIconPadding(xAxisPrimaryMinimumFixedTextBox, 2);
+      errorProvider.SetIconPadding(xAxisPrimaryMaximumFixedTextBox, 2);
+      errorProvider.SetIconPadding(xAxisSecondaryMinimumFixedTextBox, 2);
+      errorProvider.SetIconPadding(xAxisSecondaryMaximumFixedTextBox, 2);
+      errorProvider.SetIconPadding(yAxisPrimaryMinimumFixedTextBox, 2);
+      errorProvider.SetIconPadding(yAxisPrimaryMaximumFixedTextBox, 2);
+      errorProvider.SetIconPadding(yAxisSecondaryMinimumFixedTextBox, 2);
+      errorProvider.SetIconPadding(yAxisSecondaryMaximumFixedTextBox, 2);
     }
 
@@ -48,6 +64,6 @@
       try {
         if (Content == null) {
-          titleFontLabel.Text = "(  )";
-          axisFontLabel.Text = "(  )";
+          titleFontLabel.Text = "( none )";
+          axisFontLabel.Text = "( none )";
           titleTextBox.Text = string.Empty;
 
@@ -435,5 +451,5 @@
 
     private string FormatFont(Font f) {
-      if (f == null) return string.Empty;
+      if (f == null) return "default";
       else return f.Name + ", " + f.SizeInPoints.ToString() + "pt, " + f.Style.ToString();
     }
Index: /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs	(revision 7244)
@@ -69,9 +69,9 @@
       this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.okButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.okButton.Location = new System.Drawing.Point(297, 386);
+      this.okButton.Location = new System.Drawing.Point(325, 400);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
       this.okButton.TabIndex = 0;
-      this.okButton.Text = "OK";
+      this.okButton.Text = "&OK";
       this.okButton.UseVisualStyleBackColor = true;
       this.okButton.Click += new System.EventHandler(this.okButton_Click);
@@ -81,9 +81,9 @@
       this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-      this.cancelButton.Location = new System.Drawing.Point(378, 386);
+      this.cancelButton.Location = new System.Drawing.Point(406, 400);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
       this.cancelButton.TabIndex = 1;
-      this.cancelButton.Text = "Cancel";
+      this.cancelButton.Text = "&Cancel";
       this.cancelButton.UseVisualStyleBackColor = true;
       this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
@@ -91,13 +91,13 @@
       // tabControl
       // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.seriesTabPage);
       this.tabControl.Controls.Add(this.chartTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 0);
+      this.tabControl.Location = new System.Drawing.Point(12, 12);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(464, 379);
+      this.tabControl.Size = new System.Drawing.Size(469, 382);
       this.tabControl.TabIndex = 2;
       // 
@@ -108,5 +108,5 @@
       this.seriesTabPage.Name = "seriesTabPage";
       this.seriesTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.seriesTabPage.Size = new System.Drawing.Size(456, 353);
+      this.seriesTabPage.Size = new System.Drawing.Size(461, 356);
       this.seriesTabPage.TabIndex = 0;
       this.seriesTabPage.Text = "Series";
@@ -115,7 +115,9 @@
       // splitContainer
       // 
-      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-      this.splitContainer.Location = new System.Drawing.Point(3, 3);
+      this.splitContainer.Location = new System.Drawing.Point(0, 0);
       this.splitContainer.Name = "splitContainer";
       // 
@@ -131,5 +133,5 @@
       this.splitContainer.Panel2.Controls.Add(this.dataRowVisualPropertiesControl);
       this.splitContainer.Panel2MinSize = 50;
-      this.splitContainer.Size = new System.Drawing.Size(450, 347);
+      this.splitContainer.Size = new System.Drawing.Size(461, 356);
       this.splitContainer.SplitterDistance = 125;
       this.splitContainer.TabIndex = 0;
@@ -137,5 +139,5 @@
       // downButton
       // 
-      this.downButton.Location = new System.Drawing.Point(27, 3);
+      this.downButton.Location = new System.Drawing.Point(35, 3);
       this.downButton.Name = "downButton";
       this.downButton.Size = new System.Drawing.Size(26, 23);
@@ -147,8 +149,8 @@
       // upButton
       // 
-      this.upButton.Location = new System.Drawing.Point(-1, 3);
+      this.upButton.Location = new System.Drawing.Point(3, 3);
       this.upButton.Name = "upButton";
       this.upButton.Size = new System.Drawing.Size(26, 23);
-      this.upButton.TabIndex = 1;
+      this.upButton.TabIndex = 0;
       this.upButton.Text = "Up";
       this.upButton.UseVisualStyleBackColor = true;
@@ -157,24 +159,27 @@
       // seriesListView
       // 
-      this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.seriesListView.HideSelection = false;
-      this.seriesListView.Location = new System.Drawing.Point(0, 28);
+      this.seriesListView.Location = new System.Drawing.Point(3, 32);
       this.seriesListView.MultiSelect = false;
       this.seriesListView.Name = "seriesListView";
       this.seriesListView.ShowGroups = false;
-      this.seriesListView.Size = new System.Drawing.Size(125, 319);
-      this.seriesListView.TabIndex = 0;
+      this.seriesListView.Size = new System.Drawing.Size(119, 321);
+      this.seriesListView.TabIndex = 2;
       this.seriesListView.UseCompatibleStateImageBehavior = false;
-      this.seriesListView.View = System.Windows.Forms.View.SmallIcon;
+      this.seriesListView.View = System.Windows.Forms.View.List;
       this.seriesListView.SelectedIndexChanged += new System.EventHandler(this.seriesListView_SelectedIndexChanged);
       // 
       // dataRowVisualPropertiesControl
       // 
+      this.dataRowVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataRowVisualPropertiesControl.Content = null;
-      this.dataRowVisualPropertiesControl.Location = new System.Drawing.Point(3, 3);
+      this.dataRowVisualPropertiesControl.Location = new System.Drawing.Point(3, 26);
       this.dataRowVisualPropertiesControl.Name = "dataRowVisualPropertiesControl";
-      this.dataRowVisualPropertiesControl.Size = new System.Drawing.Size(318, 342);
+      this.dataRowVisualPropertiesControl.Size = new System.Drawing.Size(326, 327);
       this.dataRowVisualPropertiesControl.TabIndex = 0;
       // 
@@ -185,5 +190,5 @@
       this.chartTabPage.Name = "chartTabPage";
       this.chartTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.chartTabPage.Size = new System.Drawing.Size(456, 353);
+      this.chartTabPage.Size = new System.Drawing.Size(461, 356);
       this.chartTabPage.TabIndex = 1;
       this.chartTabPage.Text = "Chart";
@@ -192,9 +197,11 @@
       // dataTableVisualPropertiesControl
       // 
+      this.dataTableVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataTableVisualPropertiesControl.Content = null;
-      this.dataTableVisualPropertiesControl.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.dataTableVisualPropertiesControl.Location = new System.Drawing.Point(3, 3);
+      this.dataTableVisualPropertiesControl.Location = new System.Drawing.Point(3, 6);
       this.dataTableVisualPropertiesControl.Name = "dataTableVisualPropertiesControl";
-      this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(186, 68);
+      this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(455, 347);
       this.dataTableVisualPropertiesControl.TabIndex = 0;
       // 
@@ -205,9 +212,8 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(465, 421);
+      this.ClientSize = new System.Drawing.Size(493, 435);
       this.Controls.Add(this.tabControl);
       this.Controls.Add(this.cancelButton);
       this.Controls.Add(this.okButton);
-      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
       this.MaximizeBox = false;
       this.MinimizeBox = false;
@@ -215,5 +221,7 @@
       this.ShowIcon = false;
       this.ShowInTaskbar = false;
+      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.Text = "Customize Visual Properties";
+      this.TopMost = true;
       this.tabControl.ResumeLayout(false);
       this.seriesTabPage.ResumeLayout(false);
Index: /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs	(revision 7244)
@@ -46,5 +46,4 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewHost));
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -73,6 +72,8 @@
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
       this.viewsLabel.TabIndex = 0;
-      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
-              "rent view.\r\nDrag icon to copy or link content to another view.");
+      this.toolTip.SetToolTip(this.viewsLabel,
+        "Double-click to open a new window of the current view." + System.Environment.NewLine +
+        "Right-click to change current view." + System.Environment.NewLine +
+        "Drag icon to copy or link content to another view.");
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       this.viewsLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.viewsLabel_MouseDown);
@@ -95,7 +96,8 @@
       this.configurationLabel.Name = "configurationLabel";
       this.configurationLabel.Size = new System.Drawing.Size(16, 16);
-      this.configurationLabel.TabIndex = 0;
+      this.configurationLabel.TabIndex = 1;
+      this.toolTip.SetToolTip(this.configurationLabel, "Double-click to open view configuration.");
       this.configurationLabel.Visible = false;
-      this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_MouseDoubleClick);
+      this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_DoubleClick);
       // 
       // ViewHost
@@ -111,6 +113,6 @@
 
     }
+    #endregion
 
-    #endregion
     private System.Windows.Forms.Label viewsLabel;
     private System.Windows.Forms.Label messageLabel;
Index: /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs
===================================================================
--- /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs	(revision 7243)
+++ /trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs	(revision 7244)
@@ -293,5 +293,5 @@
     }
 
-    private void configurationLabel_MouseDoubleClick(object sender, MouseEventArgs e) {
+    private void configurationLabel_DoubleClick(object sender, MouseEventArgs e) {
       ((IConfigureableView)ActiveView).ShowConfiguration();
     }
