diff --git a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
index fe0117da4..77620c711 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
@@ -125,14 +125,6 @@ public class EllipticalFinSetConfig extends FinSetConfig {
 		// Right side panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
 
-		//// Root fillets
-		panel.add(filletMaterialPanel(), "span, grow, wrap");
-
-		//// Material
-		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-		panel.add(materialPanel, "span, grow, wrap");
-
-
 		{// ------ Placement ------
 			//// Position relative to:
 			JPanel placementPanel = new PlacementPanel(component, order);
@@ -154,6 +146,15 @@ public class EllipticalFinSetConfig extends FinSetConfig {
 				placementPanel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
 			}
 		}
+
+		{//// Material
+			MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+			panel.add(materialPanel, "span, grow, wrap");
+		}
+
+		{//// Root fillets
+			panel.add(filletMaterialPanel(), "span, grow, wrap");
+		}
 		
 		mainPanel.add(panel, "aligny 0");
 		
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
index 96632632a..cab13cdf4 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
@@ -174,15 +174,6 @@ public class FreeformFinSetConfig extends FinSetConfig {
 		// Right side panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
 
-		{ //// Root fillets
-			panel.add(filletMaterialPanel(), "span, grow, wrap");
-		}
-
-		{ //// Material
-			MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-			panel.add(materialPanel, "span, grow, wrap");
-		}
-
 		{//// -------- Placement ------
 			//// Position relative to:
 			JPanel placementPanel = new PlacementPanel(component, order);
@@ -204,6 +195,15 @@ public class FreeformFinSetConfig extends FinSetConfig {
 				placementPanel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
 			}
 		}
+
+		{ //// Material
+			MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+			panel.add(materialPanel, "span, grow, wrap");
+		}
+
+		{ //// Root fillets
+			panel.add(filletMaterialPanel(), "span, grow, wrap");
+		}
 		
 		mainPanel.add(panel, "aligny 0");
 
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
index 9947f6867..464dc4969 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
@@ -151,13 +151,13 @@ public class InnerTubeConfig extends RocketComponentConfig {
 		//// Right side of panel ----
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]"));
 
+		//// ---------------------------- Placement ----------------------------
+		panel.add(new PlacementPanel(component, order), "span, grow");
+
 		//// Material
 		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
 		panel.add(materialPanel, "span, grow, wrap");
 
-		//// ---------------------------- Placement ----------------------------
-		panel.add(new PlacementPanel(component, order), "span, grow");
-
 		mainPanel.add(panel, "aligny 0");
 
 		tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, mainPanel,
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
index 807c17b84..baf190731 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
@@ -101,10 +101,6 @@ public class LaunchLugConfig extends RocketComponentConfig {
 		// Right panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
 
-		//// Material
-		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-		panel.add(materialPanel, "span, grow, wrap");
-
 		{//// Placement
 			//// Position relative to:
 			JPanel placementPanel = new PlacementPanel(component, order);
@@ -124,6 +120,10 @@ public class LaunchLugConfig extends RocketComponentConfig {
 			placementPanel.add(new BasicSlider(m.getSliderModel()), "w 100lp, wrap");
 		}
 
+		//// Material
+		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+		panel.add(materialPanel, "span, grow, wrap");
+
 		primary.add(panel, "grow");
 		
 		//// General and General properties
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
index 00cee7bf0..3a1167227 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
@@ -143,10 +143,6 @@ public class RailButtonConfig extends RocketComponentConfig {
 		// Right side panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
 
-		//// Material
-		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-		panel.add(materialPanel,"span, grow, wrap");
-
 		{// -------- Placement ------
 			//// Position relative to:
 			JPanel placementPanel = new PlacementPanel(component, order);
@@ -164,6 +160,10 @@ public class RailButtonConfig extends RocketComponentConfig {
 			}
 		}
 
+		//// Material
+		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+		panel.add(materialPanel,"span, grow, wrap");
+
 		primary.add(panel, "grow");
 
 		return primary;
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
index 92938ce12..b5aad4e6a 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
@@ -139,13 +139,13 @@ public class RingComponentConfig extends RocketComponentConfig {
 		JPanel rightSide = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
 		primary.add(rightSide, "cell 4 0, aligny 0, spany");
 
+		//// Position
+		rightSide.add(new PlacementPanel(component, order), "span, grow");
+
 		//// Material
 		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
 		rightSide.add(materialPanel, "span, grow, wrap");
 
-		//// Position
-		rightSide.add(new PlacementPanel(component, order), "span, grow");
-
 		return primary;
 	}
 	
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
index d00921583..d68024947 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
@@ -176,13 +176,6 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
 		// Right side panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
 
-		// Root fillets
-		panel.add(filletMaterialPanel(), "span, grow, wrap");
-		
-		//// Material
-		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-		panel.add(materialPanel, "span, grow, wrap");
-
 		{//// -------- Placement -------
 			// Position relative to:
 			JPanel placementPanel = new PlacementPanel(component, order);
@@ -206,6 +199,15 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
 			}
 		}
 
+		{//// Material
+			MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+			panel.add(materialPanel, "span, grow, wrap");
+		}
+
+		{// Root fillets
+			panel.add(filletMaterialPanel(), "span, grow, wrap");
+		}
+
 		mainPanel.add(panel, "aligny 0");
 
 		//// General and General properties
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
index 210d97c84..01a3a181c 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
@@ -109,10 +109,6 @@ public class TubeFinSetConfig extends RocketComponentConfig {
 
 		// Right side panel
 		panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));
-		
-		//// Material
-		MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-		panel.add(materialPanel, "span, grow, wrap");
 
 		{ //// Placement
 			//// Position relative to:
@@ -136,6 +132,11 @@ public class TubeFinSetConfig extends RocketComponentConfig {
 			placementPanel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
 		}
 
+		{//// Material
+			MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
+			panel.add(materialPanel, "span, grow, wrap");
+		}
+
 		primary.add(panel, "grow");