Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1564)
+++ trunk/presets/presets.xml	(revision 1565)
@@ -1729,4 +1729,11 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+            <label text="Edit Battlefield" />
+            <key key="historic" value="battlefield" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway">
             <label text="Edit Monument" />
@@ -1738,10 +1745,4 @@
             <label text="Edit Memorial" />
             <key key="historic" value="memorial" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-            <label text="Edit Battlefield" />
-            <key key="historic" value="battlefield" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
@@ -2627,4 +2628,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="City" icon="presets/places.png" type="node,closedway">
             <label text="Edit City" />
@@ -2659,4 +2661,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
@@ -2767,4 +2770,28 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
+        <separator/>
+        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
+            <label text="Edit Scree" />
+            <key key="natural" value="scree" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
+            <label text="Edit Scrub" />
+            <key key="natural" value="scrub" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+            <label text="Edit Fell" />
+            <key key="natural" value="fell" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+            <label text="Edit Heath" />
+            <key key="natural" value="heath" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
         <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
@@ -2799,4 +2826,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
             <label text="Edit Garden" />
@@ -2884,5 +2912,17 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <separator/>
+        <item name="Military" icon="presets/military.png" type="node,closedway,relation">
+            <label text="Edit Military Landuse" />
+            <space />
+            <key key="landuse" value="military" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
+            <label text="Edit Construction Landuse" />
+            <space />
+            <key key="landuse" value="construction" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Brownfield Landuse" />
@@ -2897,10 +2937,4 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
-            <label text="Edit Construction Landuse" />
-            <space />
-            <key key="landuse" value="construction" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
             <label text="Edit Landfill Landuse" />
@@ -2913,33 +2947,4 @@
             <space />
             <key key="landuse" value="quarry" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Military" icon="presets/military.png" type="node,closedway,relation">
-            <label text="Edit Military Landuse" />
-            <space />
-            <key key="landuse" value="military" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
-        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
-            <label text="Edit Scree" />
-            <key key="natural" value="scree" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
-            <label text="Edit Scrub" />
-            <key key="natural" value="scrub" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-            <label text="Edit Fell" />
-            <key key="natural" value="fell" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-            <label text="Edit Heath" />
-            <key key="natural" value="heath" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>