diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
index d1bdb5e63..4dcead2c9 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
@@ -21,8 +21,7 @@ public class BulkheadConfig extends RingComponentConfig {
 		
 		JPanel tab;
 		
-		tab = generalTab(trans.get("BulkheadCfg.tab.Diameter"), null, null,
-				trans.get("BulkheadCfg.tab.Thickness"));
+		tab = generalTab(trans.get("BulkheadCfg.tab.Thickness"), trans.get("BulkheadCfg.tab.Diameter"), null, null);
 		//// General and General properties
 		tabbedPane.insertTab(trans.get("BulkheadCfg.tab.General"), null, tab,
 				trans.get("BulkheadCfg.tab.Generalproperties"), 0);
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
index 5ac0bcc75..c1c626761 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
@@ -22,9 +22,8 @@ public class CenteringRingConfig extends RingComponentConfig {
 		JPanel tab;
 		
 		//// Outer diameter: and Inner diameter: and Thickness:
-		tab = generalTab(trans.get("CenteringRingCfg.tab.Outerdiam"),
-				trans.get("CenteringRingCfg.tab.Innerdiam"), null,
-				trans.get("CenteringRingCfg.tab.Thickness"));
+		tab = generalTab(trans.get("CenteringRingCfg.tab.Thickness"), trans.get("CenteringRingCfg.tab.Outerdiam"),
+				trans.get("CenteringRingCfg.tab.Innerdiam"), null);
 		//// General and General properties
 		tabbedPane.insertTab(trans.get("CenteringRingCfg.tab.General"), null, tab,
 				trans.get("CenteringRingCfg.tab.Generalproperties"), 0);
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
index 9638663fa..242c333b6 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
@@ -29,7 +29,7 @@ public class RingComponentConfig extends RocketComponentConfig {
 	}
 	
 
-	protected JPanel generalTab(String outer, String inner, String thickness, String length) {
+	protected JPanel generalTab(String length, String outer, String inner, String thickness) {
 		JPanel primary = new JPanel(new MigLayout());
 
 		JPanel panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
@@ -39,6 +39,24 @@ public class RingComponentConfig extends RocketComponentConfig {
 
 		//// Attributes ----
 
+		//// Length
+		if (length != null) {
+			panel.add(new JLabel(length));
+
+			m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
+
+			spin = new JSpinner(m.getSpinnerModel());
+			spin.setEditor(new SpinnerEditor(spin));
+			if (component instanceof ThicknessRingComponent) {
+				focusElement = spin;
+			}
+			panel.add(spin, "growx");
+			order.add(((SpinnerEditor) spin.getEditor()).getTextField());
+
+			panel.add(new UnitSelector(m), "growx");
+			panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
+		}
+
 		//// Outer diameter
 		if (outer != null) {
 			panel.add(new JLabel(outer));
@@ -110,26 +128,6 @@ public class RingComponentConfig extends RocketComponentConfig {
 			panel.add(new UnitSelector(m), "growx");
 			panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap");
 		}
-		
-		
-		////  Inner tube length
-		if (length != null) {
-			panel.add(new JLabel(length));
-			
-			//// Length
-			m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
-			
-			spin = new JSpinner(m.getSpinnerModel());
-			spin.setEditor(new SpinnerEditor(spin));
-			if (component instanceof ThicknessRingComponent) {
-				focusElement = spin;
-			}
-			panel.add(spin, "growx");
-			order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-			
-			panel.add(new UnitSelector(m), "growx");
-			panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
-		}
 
 		primary.add(panel, "grow, gapright 40lp");
 
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
index d2261dfd6..340ca58a4 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
@@ -23,8 +23,8 @@ public class SleeveConfig extends RingComponentConfig {
 		//// Inner diameter:
 		//// Wall thickness:
 		//// Length:
-		tab = generalTab(trans.get("SleeveCfg.tab.Outerdiam"), trans.get("SleeveCfg.tab.Innerdiam"),
-				trans.get("SleeveCfg.tab.Wallthickness"), trans.get("SleeveCfg.tab.Length"));
+		tab = generalTab(trans.get("SleeveCfg.tab.Length"), trans.get("SleeveCfg.tab.Outerdiam"),
+				trans.get("SleeveCfg.tab.Innerdiam"), trans.get("SleeveCfg.tab.Wallthickness"));
 		//// General and General properties
 		tabbedPane.insertTab(trans.get("SleeveCfg.tab.General"), null, tab,
 				trans.get("SleeveCfg.tab.Generalproperties"), 0);
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
index 66ce8703e..3718ec092 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
@@ -19,14 +19,14 @@ public class ThicknessRingComponentConfig extends RingComponentConfig {
 		super(d, c, parent);
 		
 		JPanel tab;
-		
+
+		//// Length:
 		//// Outer diameter:
 		//// Inner diameter:
 		//// Wall thickness:
-		//// Length:
-		tab = generalTab(trans.get("ThicknessRingCompCfg.tab.Outerdiam"),
+		tab = generalTab(trans.get("ThicknessRingCompCfg.tab.Length"), trans.get("ThicknessRingCompCfg.tab.Outerdiam"),
 				trans.get("ThicknessRingCompCfg.tab.Innerdiam"),
-				trans.get("ThicknessRingCompCfg.tab.Wallthickness"), trans.get("ThicknessRingCompCfg.tab.Length"));
+				trans.get("ThicknessRingCompCfg.tab.Wallthickness"));
 		//// General and General properties
 		tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, tab,
 				trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0);