Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs
===================================================================
diff -u -r77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5 -rf1e88640d1a17f847a065f0b8b6b1dccec16da72
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs	(.../ChartControl.Designer.cs)	(revision 77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs	(.../ChartControl.Designer.cs)	(revision f1e88640d1a17f847a065f0b8b6b1dccec16da72)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Core.Components.OxyPlot.Forms.Properties;
 
 namespace Core.Components.OxyPlot.Forms
 {
@@ -44,13 +43,15 @@
             this.zoomToRectangleToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.zoomToVisibleLayersToolStripButton = new System.Windows.Forms.ToolStripButton();
+            this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
             this.toolStrip.SuspendLayout();
+            this.tableLayoutPanel.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolStrip
             // 
             this.toolStrip.CanOverflow = false;
-            this.toolStrip.Dock = System.Windows.Forms.DockStyle.Right;
+            this.toolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
             this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -59,17 +60,17 @@
             this.toolStripSeparator1,
             this.zoomToVisibleLayersToolStripButton});
             this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
-            this.toolStrip.Location = new System.Drawing.Point(659, 0);
+            this.toolStrip.Location = new System.Drawing.Point(438, 0);
             this.toolStrip.Name = "toolStrip";
-            this.toolStrip.Size = new System.Drawing.Size(40, 596);
+            this.toolStrip.Size = new System.Drawing.Size(28, 387);
             this.toolStrip.TabIndex = 0;
             // 
             // panToolStripButton
             // 
             this.panToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.panToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.panToolStripButton.Name = "panToolStripButton";
-            this.panToolStripButton.Size = new System.Drawing.Size(31, 29);
+            this.panToolStripButton.Size = new System.Drawing.Size(22, 19);
             this.panToolStripButton.Text = "";
             this.panToolStripButton.ToolTipText = global::Core.Components.OxyPlot.Forms.Properties.Resources.ChartControl_Pan;
             this.panToolStripButton.Click += new System.EventHandler(this.PanToolStripButtonClick);
@@ -79,38 +80,54 @@
             this.zoomToRectangleToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.zoomToRectangleToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.zoomToRectangleToolStripButton.Name = "zoomToRectangleToolStripButton";
-            this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(31, 29);
+            this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(22, 19);
             this.zoomToRectangleToolStripButton.Text = "";
             this.zoomToRectangleToolStripButton.ToolTipText = global::Core.Components.OxyPlot.Forms.Properties.Resources.ChartControl_ZoomToRectangle;
             this.zoomToRectangleToolStripButton.Click += new System.EventHandler(this.ZoomToRectangleToolStripButtonClick);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(35, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(26, 6);
             // 
             // zoomToVisibleLayersToolStripButton
             // 
             this.zoomToVisibleLayersToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             this.zoomToVisibleLayersToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.zoomToVisibleLayersToolStripButton.Name = "zoomToVisibleLayersToolStripButton";
-            this.zoomToVisibleLayersToolStripButton.Size = new System.Drawing.Size(31, 29);
+            this.zoomToVisibleLayersToolStripButton.Size = new System.Drawing.Size(22, 19);
             this.zoomToVisibleLayersToolStripButton.Text = "";
             this.zoomToVisibleLayersToolStripButton.ToolTipText = global::Core.Components.OxyPlot.Forms.Properties.Resources.ChartControl_ZoomToVisibleLayers;
             this.zoomToVisibleLayersToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleLayersToolStripButtonClick);
             // 
+            // tableLayoutPanel
+            // 
+            this.tableLayoutPanel.ColumnCount = 2;
+            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel.Controls.Add(this.toolStrip, 1, 0);
+            this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel.Name = "tableLayoutPanel";
+            this.tableLayoutPanel.RowCount = 1;
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel.Size = new System.Drawing.Size(466, 387);
+            this.tableLayoutPanel.TabIndex = 1;
+            // 
             // ChartControl
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.toolStrip);
-            this.MinimumSize = new System.Drawing.Size(100, 100);
+            this.Controls.Add(this.tableLayoutPanel);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.MinimumSize = new System.Drawing.Size(67, 65);
             this.Name = "ChartControl";
-            this.Size = new System.Drawing.Size(699, 596);
+            this.Size = new System.Drawing.Size(466, 387);
             this.toolStrip.ResumeLayout(false);
             this.toolStrip.PerformLayout();
+            this.tableLayoutPanel.ResumeLayout(false);
+            this.tableLayoutPanel.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -121,5 +138,6 @@
         private System.Windows.Forms.ToolStripButton zoomToRectangleToolStripButton;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripButton zoomToVisibleLayersToolStripButton;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs
===================================================================
diff -u -r0ec7877f4c42c64818907489676381f0a34fec50 -rf1e88640d1a17f847a065f0b8b6b1dccec16da72
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs	(.../ChartControl.cs)	(revision 0ec7877f4c42c64818907489676381f0a34fec50)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs	(.../ChartControl.cs)	(revision f1e88640d1a17f847a065f0b8b6b1dccec16da72)
@@ -184,10 +184,11 @@
                 {
                     IsLegendVisible = false
                 },
-                Controller = plotController
+                Controller = plotController,
+                Dock = DockStyle.Fill
             };
 
-            Controls.Add(plotView);
+            tableLayoutPanel.Controls.Add(plotView, 0, 0);
         }
 
         /// <summary>