Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1543)
+++ /trunk/presets/presets.xml	(revision 1544)
@@ -1642,4 +1642,36 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
+        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+            <label text="Edit Museum" />
+            <key key="tourism" value="museum" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+            <label text="Edit Zoo" />
+            <key key="tourism" value="zoo" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+            <label text="Edit Viewpoint" />
+            <key key="tourism" value="viewpoint" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
+        </item>
+        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
+            <label text="Edit Theme Park" />
+            <key key="tourism" value="theme_park" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+            <label text="Edit Artwork" />
+            <key key="tourism" value="artwork" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
@@ -1650,36 +1682,18 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
-        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-            <label text="Edit Museum" />
-            <key key="tourism" value="museum" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-            <label text="Edit Zoo" />
-            <key key="tourism" value="zoo" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-            <label text="Edit Viewpoint" />
-            <key key="tourism" value="viewpoint" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
-        </item>
-        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
-            <label text="Edit Theme Park" />
-            <key key="tourism" value="theme_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-            <label text="Edit Artwork" />
-            <key key="tourism" value="artwork" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
+        <item name="Map" icon="presets/map.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <key key="tourism" value="information" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="information" text="Map Type" values="map,citymap,hikingmap,bicyclemap" default="map" delete_if_empty="true" />
+            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+        </item>
+        <item name="Information Board" icon="presets/board.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <key key="tourism" value="information" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="information" text="Board Type" values="board,history,nature,wildlife" default="board" delete_if_empty="true" />
+            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+        </item>
         <item name="Guidepost (Hiking)" icon="presets/guidepost.png" type="node">
             <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
@@ -1687,18 +1701,4 @@
             <key key="information" value="guidepost" />
         </item>
-        <item name="Map" icon="presets/map.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-            <key key="tourism" value="information" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="information" text="Map Type" values="map,citymap,hikingmap,bicyclemap" default="map" delete_if_empty="true" />
-            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
-        </item>
-        <item name="Information Board" icon="presets/board.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-            <key key="tourism" value="information" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="information" text="Board Type" values="board,history,nature,wildlife" default="board" delete_if_empty="true" />
-            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
-        </item>
         <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -1707,4 +1707,5 @@
             <text key="description" text="Closer Description" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
             <label text="Edit Shelter" />
@@ -2950,4 +2951,5 @@
         </item>
     </group> <!-- Landuse -->
+    <separator/>
 <!-- FIXME: element role not yet supported! -->
     <group name="Relations" icon="presets/empty.png">