diff --git a/Samples/WindowsFormsEditor/Form1.Designer.cs b/Samples/WindowsFormsEditor/Form1.Designer.cs
index 8d1b8626..a17bef4e 100644
--- a/Samples/WindowsFormsEditor/Form1.Designer.cs
+++ b/Samples/WindowsFormsEditor/Form1.Designer.cs
@@ -28,53 +28,56 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.panel1 = new System.Windows.Forms.Panel();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.panel1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// panel1
-			// 
-			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.panel1.Controls.Add(this.button1);
-			this.panel1.Location = new System.Drawing.Point(132, 67);
-			this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(409, 298);
-			this.panel1.TabIndex = 0;
-			// 
-			// button1
-			// 
-			this.button1.Location = new System.Drawing.Point(320, 3);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(86, 23);
-			this.button1.TabIndex = 0;
-			this.button1.Text = "button1";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(37, 23);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(35, 13);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "label1";
-			// 
-			// Form1
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(555, 380);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.panel1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.MaximizeBox = false;
-			this.Name = "Form1";
-			this.Text = "Form1";
-			this.panel1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.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.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.button1);
+            this.panel1.Location = new System.Drawing.Point(132, 67);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(409, 298);
+            this.panel1.TabIndex = 0;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(320, 3);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(86, 23);
+            this.button1.TabIndex = 0;
+            this.button1.Text = "button1";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(37, 23);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(35, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "label1";
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(555, 380);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.panel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.Name = "Form1";
+            this.Text = "Form1";
+            this.panel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
diff --git a/Samples/WpfEditor/MainWindow.xaml b/Samples/WpfEditor/MainWindow.xaml
index 5a27fd79..33902055 100644
--- a/Samples/WpfEditor/MainWindow.xaml
+++ b/Samples/WpfEditor/MainWindow.xaml
@@ -4,9 +4,9 @@
         xmlns:winForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
         Title="MainWindow" Height="350" Width="525" xmlns:my="clr-namespace:WpfEditor">
     <Grid>
-        <Label Content="Label" Height="27" HorizontalAlignment="Left" Margin="15,22,0,0" Name="label1" VerticalAlignment="Top" Width="71" />
-        <WindowsFormsHost Margin="116,68,12,12">
+        <WindowsFormsHost Margin="10">
             <winForms:Panel x:Name="GamePanel" />
         </WindowsFormsHost>
+        <Label Content="Label" Height="27" HorizontalAlignment="Left" Margin="15,22,0,0" Name="label1" VerticalAlignment="Top" Width="71" />
     </Grid>
 </Window>
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 1aa122e1..210955c8 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -319,7 +319,9 @@
     <fileset id="sample_files" basedir="../Samples/">
       <include name="**/*.csproj" unless="${not xnasdk.installed}" />
       <include name="**/SimpleNoContent.csproj" />
-
+      <include name="**/WindowsFormsEditor.csproj" />
+      <include name="**/WpfEditor.csproj" />
+      
       <exclude name="**/*Kinect*.csproj" />
 
       <exclude name="**/*PSVita*.csproj" />