Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 5702)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 5703)
@@ -73,5 +73,4 @@
         directionHint.setToolTipText(tr("Draw direction hints for way segments."));
         directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction", false));
-        panel.add(directionHint, GBC.eop().insets(20,0,0,0));
 
         // only on the head of a way
@@ -79,30 +78,24 @@
         headArrow.setSelected(Main.pref.getBoolean("draw.segment.head_only", false));
         headArrow.setEnabled(directionHint.isSelected());
-        panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
 
         // draw oneway arrows
         onewayArrow.setToolTipText(tr("Draw arrows in the direction of oneways and other directed features."));
         onewayArrow.setSelected(Main.pref.getBoolean("draw.oneway", true));
-        panel.add(onewayArrow, GBC.eop().insets(20,0,0,0));
 
         // segment order number
         segmentOrderNumber.setToolTipText(tr("Draw the order numbers of all segments within their way."));
         segmentOrderNumber.setSelected(Main.pref.getBoolean("draw.segment.order_number", false));
-        panel.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
 
         // downloaded area
         sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
         sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area", true));
-        panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
 
         // virtual nodes
         virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification."));
         virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
-        panel.add(virtualNodes, GBC.eop().insets(20,0,0,0));
 
         // background layers in inactive color
         inactive.setToolTipText(tr("Draw the inactive data layers in a different color."));
         inactive.setSelected(Main.pref.getBoolean("draw.data.inactive_color", true));
-        panel.add(inactive, GBC.eop().insets(20,0,0,0));
 
         // antialiasing
@@ -120,5 +113,4 @@
         drawHelperLine.setToolTipText(tr("Draw rubber-band helper line"));
         drawHelperLine.setSelected(Main.pref.getBoolean("draw.helper-line", true));
-        panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
 
         // outlineOnly
@@ -127,10 +119,28 @@
 
         JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
+
+        panel.add(new JLabel(tr("Segment drawing options")),
+                GBC.eop().insets(5,10,0,0));
+        panel.add(directionHint, GBC.eop().insets(20,0,0,0));
+        panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
+        panel.add(onewayArrow, GBC.eop().insets(20,0,0,0));
+        panel.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
+        
+        panel.add(new JLabel(tr("Select and draw mode options")),
+                GBC.eop().insets(5,10,0,0));
+        panel.add(virtualNodes, GBC.eop().insets(20,0,0,0));
+        panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
+        
         panel.add(performanceLabel, GBC.eop().insets(5,10,0,0));
-        panel.add(useAntialiasing, GBC.eop().insets(20,5,0,0));
+        panel.add(useAntialiasing, GBC.eop().insets(20,0,0,0));
         panel.add(useWireframeAntialiasing, GBC.eop().insets(20, 0, 0, 0));
         panel.add(useHighlighting, GBC.eop().insets(20,0,0,0));
-        panel.add(outlineOnly, GBC.eol().insets(20,0,0,5));
-
+        panel.add(outlineOnly, GBC.eol().insets(20,0,0,0));
+        
+        panel.add(new JLabel(tr("Other options")),
+                GBC.eop().insets(5,10,0,0));
+        panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
+        panel.add(inactive, GBC.eop().insets(20,0,0,0));
+        
         ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
         ExpertToggleAction.addVisibilitySwitcher(useAntialiasing);