diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
index 3b561e04f..013e1ada2 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
@@ -8,6 +8,7 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.gui.components.StyledLabel;
@@ -18,122 +19,122 @@ import net.sf.openrocket.gui.widgets.SelectColorButton;
 public class UnitsPreferencesPanel extends PreferencesPanel {
 
 	public UnitsPreferencesPanel(JDialog parent) {
-		super(parent, new MigLayout("", "[][]40lp[][]"));
+		super(parent, new MigLayout("", "[]40lp[]"));
 		JComboBox<?> combo;
+		JPanel leftPanel = new JPanel(new MigLayout("ins 0"));
+		JPanel rightPanel = new JPanel(new MigLayout("ins 0"));
 		
 		//// Select your preferred units:
 		this.add(new JLabel(trans.get("pref.dlg.lbl.Selectprefunits")), "span, wrap paragraph");
-		
+
+
+		// -------------- LEFT PANEL
 		
 		//// Rocket dimensions:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Rocketdimensions")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rocketdimensions")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_LENGTH));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Line density:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Linedensity")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Motor dimensions:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Motordimensions")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Motordimensions")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_MOTOR_DIMENSIONS));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Surface density:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Surfacedensity")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Distance:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Distance")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Distance")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DISTANCE));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Bulk density::
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Bulkdensity")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Velocity:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Velocity")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Velocity")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_VELOCITY));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Surface roughness:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Surfaceroughness")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Acceleration:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Acceleration")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Acceleration")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ACCELERATION));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Area:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Area")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_AREA));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Mass:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Mass")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Mass")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_MASS));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Angle:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Angle")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Force:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Force")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Force")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_FORCE));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Roll rate:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Rollrate")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ROLL));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Total impulse:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Totalimpulse")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Totalimpulse")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_IMPULSE));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Temperature:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Temperature")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE));
-		this.add(combo, "sizegroup boxes, wrap");
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Moment of inertia:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA));
-		this.add(combo, "sizegroup boxes");
-		
-		//// Pressure:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Pressure")));
-		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE));
-		this.add(combo, "sizegroup boxes, wrap");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
 		
 		//// Stability:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Stability")));
+		leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Stability")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_STABILITY));
-		this.add(combo, "sizegroup boxes");
-		
+		leftPanel.add(combo, "sizegroup boxes, wrap");
+
+
+		// -------------- RIGHT PANEL
+
+		//// Line density:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Linedensity")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Surface density:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfacedensity")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Bulk density::
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Bulkdensity")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Surface roughness:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfaceroughness")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Area:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Area")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_AREA));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Angle:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Angle")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Roll rate:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rollrate")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_ROLL));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Temperature:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Temperature")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		//// Pressure:
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Pressure")));
+		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE));
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
 		//// Windspeed:
-		this.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed")));
+		rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed")));
 		combo = new JComboBox<Object>(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED));
-		this.add(combo, "sizegroup boxes, wrap para");
-		
-		
+		rightPanel.add(combo, "sizegroup boxes, wrap");
+
+		this.add(leftPanel);
+		this.add(rightPanel, "wrap para");
 		
 		
 		//// Default metric button
@@ -165,7 +166,7 @@ public class UnitsPreferencesPanel extends PreferencesPanel {
 				trans.get("pref.dlg.lbl.effect1"), -2, Style.ITALIC),
 				"spanx, wrap");
 		
-		}
+	}
 
 	public UnitsPreferencesPanel(LayoutManager layout) {
 		super(layout);