Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 914)
+++ /trunk/presets/presets.xml	(revision 915)
@@ -688,4 +688,32 @@
 
 	<group name="Waypoints" icon="presets/waypoints.png">
+		<item name="Motorway Junction" icon="presets/motorway_junction.png">
+			<label text="Edit Motorway Junction" />
+			<label text=" " />
+			<key key="highway" value="motorway_junction" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="ref" text="Number" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Highway Exit" icon="presets/motorway_exit.png">
+			<label text="Edit an Exit" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="ref" text="Exit Number" default="" delete_if_empty="true" />
+			<text key="name" text="Exit Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Services" icon="presets/services.png">
+			<label text="Edit Service Station" />
+			<label text=" " />
+			<key key="highway" value="service" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="operator" text="Operator" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Toll Booth" icon="presets/toll_station.png">
 			<label text="Edit Toll Booth" />
@@ -699,31 +727,27 @@
 		</item>
 
-		<item name="Services" icon="presets/services.png">
-			<label text="Edit Service Station" />
-			<label text=" " />
-			<key key="highway" value="service" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<text key="operator" text="Operator" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Highway Exit" icon="presets/motorway_exit.png">
-			<label text="Edit an Exit" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="ref" text="Exit Number" default="" delete_if_empty="true" />
-			<text key="name" text="Exit Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Motorway Junction" icon="presets/motorway_junction.png">
-			<label text="Edit Motorway Junction" />
-			<label text=" " />
-			<key key="highway" value="motorway_junction" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<text key="ref" text="Number" default="" delete_if_empty="true" />
-		</item>
+		<separator/>
+
+		<item name="Traffic Signal" icon="presets/traffic-light.png">
+			<key key="highway" value="traffic_signals" />
+		</item>
+
+		<item name="Stop" icon="presets/Stop.png">
+			<key key="highway" value="stop" />
+		</item>
+
+		<item name="Zebra crossing" icon="presets/zebracrossing.png">
+			<key key="highway" value="crossing" />
+		</item>
+
+		<item name="Mini Roundabout" icon="presets/roundabout_left.png">
+			<key key="highway" value="mini_roundabout" />
+		</item>
+
+		<item name="Turning Circle" icon="presets/turning_circle.png">
+			<key key="highway" value="turning_circle" />
+		</item>
+
+		<separator/>
 
 		<item name="Ford" icon="presets/ford.png">
@@ -735,24 +759,4 @@
 			<label text=" " />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Zebra crossing" icon="presets/zebracrossing.png">
-			<key key="highway" value="crossing" />
-		</item>
-
-		<item name="Mini Roundabout" icon="presets/roundabout_left.png">
-			<key key="highway" value="mini_roundabout" />
-		</item>
-
-		<item name="Traffic Signal" icon="presets/traffic-light.png">
-			<key key="highway" value="traffic_signals" />
-		</item>
-
-		<item name="Turning Circle" icon="presets/turning_circle.png">
-			<key key="highway" value="turning_circle" />
-		</item>
-
-		<item name="Stop" icon="presets/Stop.png">
-			<key key="highway" value="stop" />
 		</item>
 
@@ -828,4 +832,6 @@
 		</item>
 
+		<separator/>
+
 		<item name="Disused Rail" icon="presets/railway.png">
 			<label text="Edit a Disused Railway" />
@@ -841,10 +847,10 @@
 
 	<group name="Railway Point" icon="presets/railwaypoint.png">
+		<item name="Level Crossing" icon="presets/level_crossing.png">
+			<key key="railway" value="level_crossing" />
+		</item>
+
 		<item name="Crossing" icon="presets/crossing.png">
 			<key key="railway" value="crossing" />
-		</item>
-
-		<item name="Level Crossing" icon="presets/level_crossing.png">
-			<key key="railway" value="level_crossing" />
 		</item>
 
@@ -865,4 +871,49 @@
 		</item>
 
+		<item name="Canal" icon="presets/waterway.png">
+			<label text="Edit a Canal" />
+			<label text=" " />
+			<key key="waterway" value="canal" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Drain" icon="presets/waterway.png">
+			<label text="Edit a Drain" />
+			<label text=" " />
+			<key key="waterway" value="drain" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Stream" icon="presets/waterway.png">
+			<label text="Edit a Stream" />
+			<label text=" " />
+			<key key="waterway" value="stream" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Ferry Route" icon="presets/ferry.png">
+			<label text="Edit a Ferry" />
+			<label text=" " />
+			<key key="route" value="ferry" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Boatyard" icon="styles/standard/nautical/boatyard.png">
+			<label text="Edit a Boatyard" />
+			<label text=" " />
+			<key key="waterway" value="boatyard" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
 		<item name="Dock" icon="presets/waterway.png">
 			<label text="Edit a Dock" />
@@ -872,40 +923,4 @@
 		</item>
 
-		<item name="Canal" icon="presets/waterway.png">
-			<label text="Edit a Canal" />
-			<label text=" " />
-			<key key="waterway" value="canal" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Drain" icon="presets/waterway.png">
-			<label text="Edit a Drain" />
-			<label text=" " />
-			<key key="waterway" value="drain" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Stream" icon="presets/waterway.png">
-			<label text="Edit a Stream" />
-			<label text=" " />
-			<key key="waterway" value="stream" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Ferry Route" icon="presets/ferry.png">
-			<label text="Edit a Ferry" />
-			<label text=" " />
-			<key key="route" value="ferry" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
 		<separator/>
 
@@ -914,11 +929,4 @@
 			<label text=" " />
 			<key key="waterway" value="dam" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Boatyard" icon="styles/standard/nautical/boatyard.png">
-			<label text="Edit a Boatyard" />
-			<label text=" " />
-			<key key="waterway" value="boatyard" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>