diff --git a/PartPreviewWindow/View3D/BaseObject3DEditor.cs b/PartPreviewWindow/View3D/BaseObject3DEditor.cs
index 2ca0d0238..cfbf16fcd 100644
--- a/PartPreviewWindow/View3D/BaseObject3DEditor.cs
+++ b/PartPreviewWindow/View3D/BaseObject3DEditor.cs
@@ -108,7 +108,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			mainContainer.AddChild(behavior3DTypeButtons);
 
 			// put in the button for making the behavior solid
-			var solidBehaviorButton = new PopupButton(theme.textImageButtonFactory.Generate("Solid".Localize()))
+			Button createdButton;
+			var solidBehaviorButton = new PopupButton(createdButton = theme.textImageButtonFactory.Generate("Solid".Localize()))
 			{
 				Name = "Solid Colors",
 				AlignToRightEdge = true,
@@ -119,7 +120,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 					BackgroundColor = RGBA_Bytes.White
 				}
 			};
-			solidBehaviorButton.Click += (s, e) =>
+			createdButton.Click += (s, e) =>
 			{
 				item.OutputType = PrintOutputTypes.Solid;
 			};
diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index dc94a3106..1c04d3ab1 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -360,7 +360,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 						var materialsButton = new PopupButton(smallMarginButtonFactory.Generate("Materials".Localize()))
 						{
 							PopDirection = Direction.Up,
-							PopupContent = this.AddMaterialControls()
+							PopupContent = this.AddMaterialControls(),
+							AlignToRightEdge = true
 						};
 						doEdittingButtonsContainer.AddChild(materialsButton);
 					}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 8527327fc..e52941469 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 8527327fcdd703f5eb2836b54ebff8559e625e07
+Subproject commit e529414690964af6821a7f74f5b102df280ed580