diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 846174e3f..03b979543 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -46,7 +46,7 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
 		this.length = Math.max(length, 0);
 		motors = new MotorConfigurationSet(this);
 		super.displayOrder_side = 0;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 0;		// Order for displaying the component in the 2D back view
+		super.displayOrder_back = 1;		// Order for displaying the component in the 2D back view
 	}
 	
 	public BodyTube(double length, double radius, boolean filled) {
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
index 2e67cee3e..bf3212631 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
@@ -13,8 +13,8 @@ public class Bulkhead extends RadiusRingComponent {
 	public Bulkhead() {
 		setOuterRadiusAutomatic(true);
 		setLength(0.002);
-		super.displayOrder_side = 10;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 10;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 8;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 13;		// Order for displaying the component in the 2D back view
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java b/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
index 15e67ba9a..40df576a1 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
@@ -13,8 +13,8 @@ public class CenteringRing extends RadiusRingComponent {
 		setOuterRadiusAutomatic(true);
 		setInnerRadiusAutomatic(true);
 		setLength(0.002);
-		super.displayOrder_side = 9;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 9;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 7;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 14;		// Order for displaying the component in the 2D back view
 	}
 	
 	private static final Translator trans = Application.getTranslator();
diff --git a/core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java b/core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java
index a33b9109f..0f4a2aee1 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java
@@ -16,8 +16,8 @@ public class EngineBlock extends ThicknessRingComponent implements AxialPosition
 		setOuterRadiusAutomatic(true);
 		setThickness(0.005);
 		setLength(0.005);
-		super.displayOrder_side = 11;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 11;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 9;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 15;		// Order for displaying the component in the 2D back view
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
index 5dfa8b9b8..7c1166cd2 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
@@ -49,8 +49,8 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
 		
 		motors = new MotorConfigurationSet(this);
 
-		super.displayOrder_side = 7;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 7;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 5;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 12;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java b/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java
index 24e82e884..e461f51bb 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java
@@ -37,8 +37,8 @@ public class LaunchLug extends ExternalComponent implements AnglePositionable, B
 		radius = 0.01 / 2;
 		thickness = 0.001;
 		length = 0.03;
-		super.displayOrder_side = 6;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 6;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 15;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 10;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
index a2c5ba194..37c221fb8 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
@@ -41,15 +41,15 @@ public class MassComponent extends MassObject {
 	
 	public MassComponent() {
 		super();
-		super.displayOrder_side = 14;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 14;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 13;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 8;		// Order for displaying the component in the 2D back view
 	}
 	
 	public MassComponent(double length, double radius, double mass) {
 		super(length, radius);
 		this.mass = mass;
-		super.displayOrder_side = 14;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 14;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 13;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 8;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
index 864f443fa..a7316fdb3 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -44,7 +44,7 @@ public class NoseCone extends Transition implements InsideColorComponent {
 		super.setAftRadius(radius);
 
 		super.displayOrder_side = 1;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 1;		// Order for displaying the component in the 2D back view
+		super.displayOrder_back = 0;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java
index a0975417f..d73cbc4e0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java
@@ -23,8 +23,8 @@ public class Parachute extends RecoveryDevice {
 		this.diameter = 0.3;
 		this.lineMaterial = Application.getPreferences().getDefaultComponentMaterial(Parachute.class, Material.Type.LINE);
 		this.lineLength = 0.3;
-		super.displayOrder_side = 12;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 12;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 11;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 7;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
index 32dc7a2eb..76ecb22d8 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
@@ -69,16 +69,16 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
 		this.setStandoff( 0.002);
 		this.setInstanceSeparation( this.outerDiameter_m * 6);
 		this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin"));
-		super.displayOrder_side = 5;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 5;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 14;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 9;		// Order for displaying the component in the 2D back view
 	}
 	
 	public RailButton( final double od, final double ht ) {
 		this();
 		this.setOuterDiameter( od);
 		this.setTotalHeight( ht);
-		super.displayOrder_side = 5;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 5;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 14;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 9;		// Order for displaying the component in the 2D back view
 	}
 	
 	public RailButton( final double od, final double id, final double ht, final double flangeThickness, final double _standoff ) {
@@ -90,8 +90,8 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
 		this.setStandoff( _standoff);
 		this.setInstanceSeparation( od*2);
 		this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin"));
-		super.displayOrder_side = 5;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 5;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 14;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 9;		// Order for displaying the component in the 2D back view
 	}
 	
 	private static final RailButton make1010Button(){
diff --git a/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java b/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java
index 395965f2d..43e79e894 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java
@@ -15,8 +15,8 @@ public class ShockCord extends MassObject {
 	public ShockCord() {
 		material = Application.getPreferences().getDefaultComponentMaterial(ShockCord.class, Material.Type.LINE);
 		cordLength = 0.4;
-		super.displayOrder_side = 13;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 13;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 12;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 5;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java
index 55404a050..4534b17d1 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java
@@ -21,8 +21,8 @@ public class Streamer extends RecoveryDevice {
 	public Streamer() {
 		this.stripLength = 0.5;
 		this.stripWidth = 0.05;
-		super.displayOrder_side = 12;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 12;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 10;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 6;		// Order for displaying the component in the 2D back view
 	}
 	
 	
diff --git a/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java b/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java
index d09e77875..e3057ae21 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java
@@ -13,8 +13,8 @@ public class TubeCoupler extends ThicknessRingComponent implements RadialParent
 		setOuterRadiusAutomatic(true);
 		setThickness(0.002);
 		setLength(0.06);
-		super.displayOrder_side = 8;		// Order for displaying the component in the 2D side view
-		super.displayOrder_back = 8;		// Order for displaying the component in the 2D back view
+		super.displayOrder_side = 6;		// Order for displaying the component in the 2D side view
+		super.displayOrder_back = 11;		// Order for displaying the component in the 2D back view
 	}
 	
 	@Override