Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 1218)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 1219)
@@ -89,10 +89,9 @@
     public final UndoAction undo = new UndoAction();
     public final RedoAction redo = new RedoAction();
-    public final AddNodeAction addnode = new AddNodeAction();
     public final JosmAction copy = new CopyAction();
     public final JosmAction paste = new PasteAction();
-    public final JosmAction delete = new DeleteAction();
     public final JosmAction pasteTags = new PasteTagsAction(copy);
     public final JosmAction duplicate = new DuplicateAction();
+    public final JosmAction delete = new DeleteAction();
     public final JosmAction selectAll = new SelectAllAction();
     public final JosmAction unselectAll = new UnselectAllAction();
@@ -111,8 +110,10 @@
     public final JosmAction alignInLine = new AlignInLineAction();
     public final JosmAction ortho = new OrthogonalizeAction();
+    public final AddNodeAction addnode = new AddNodeAction();
     public final JosmAction createCircle = new CreateCircleAction();
     public final JosmAction mergeNodes = new MergeNodesAction();
     public final JosmAction joinNodeWay = new JoinNodeWayAction();
     public final JosmAction unglueNodes = new UnGlueAction();
+    public final HistoryInfoAction historyinfo = new HistoryInfoAction();
 
     /* Audio menu */
@@ -128,5 +129,4 @@
     public final HelpAction help = new HelpAction();
     public final JosmAction about = new AboutAction();
-    public final HistoryInfoAction historyinfo = new HistoryInfoAction();
 
     public final JMenu fileMenu = new JMenu(tr("File"));
@@ -180,4 +180,5 @@
         add(fileMenu, download);
         add(fileMenu, upload);
+        fileMenu.addSeparator();
         add(fileMenu, exit);
         add(fileMenu, KeyEvent.VK_F, "file");
@@ -186,10 +187,9 @@
         add(editMenu, redo);
         editMenu.addSeparator();
-        add(editMenu, addnode);
         add(editMenu, copy);
-        add(editMenu, delete);
         add(editMenu, paste);
         add(editMenu, pasteTags);
         add(editMenu, duplicate);
+        add(editMenu, delete);
         editMenu.addSeparator();
         add(editMenu, selectAll);
@@ -201,14 +201,6 @@
         add(editMenu, KeyEvent.VK_E, "edit");
 
-        for (String mode : AutoScaleAction.modes) {
-            JosmAction autoScaleAction = new AutoScaleAction(mode);
-            add(viewMenu, autoScaleAction);
-        }
-        viewMenu.addSeparator();
-        add(viewMenu, new ZoomOutAction());
-        add(viewMenu, new ZoomInAction());
-        viewMenu.addSeparator();
         // TODO move code to an "action" like the others?
-        final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(tr("Wireframe view"));
+        final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(tr("Wireframe View"));
         wireframe.setSelected(Main.pref.getBoolean("draw.wireframe", false));
         wireframe.setAccelerator(Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),
@@ -223,4 +215,12 @@
         });
         viewMenu.add(wireframe);
+        viewMenu.addSeparator();
+        add(viewMenu, new ZoomInAction());
+        add(viewMenu, new ZoomOutAction());
+        viewMenu.addSeparator();
+        for (String mode : AutoScaleAction.modes) {
+            JosmAction autoScaleAction = new AutoScaleAction(mode);
+            add(viewMenu, autoScaleAction);
+        }
         add(viewMenu, KeyEvent.VK_V, "view");
 
@@ -234,4 +234,5 @@
         add(toolsMenu, ortho);
         toolsMenu.addSeparator();
+        add(toolsMenu, addnode);
         add(toolsMenu, createCircle);
         toolsMenu.addSeparator();
@@ -239,5 +240,9 @@
         add(toolsMenu, joinNodeWay);
         add(toolsMenu, unglueNodes);
+        toolsMenu.addSeparator();
+        add(toolsMenu, historyinfo);
         add(toolsMenu, KeyEvent.VK_T, "tools");
+
+        add(presetsMenu, KeyEvent.VK_P, "presets");
 
         if (!Main.pref.getBoolean("audio.menuinvisible")) {
@@ -252,7 +257,6 @@
         }
 
-        add(presetsMenu, KeyEvent.VK_P, "presets");
-
-        JMenuItem check = new JMenuItem("DEBUG: Check Dataset");
+		/* TODO: Anyone really using this feature? */
+        /*JMenuItem check = new JMenuItem("DEBUG: Check Dataset");
         check.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -260,10 +264,9 @@
             }
         });
-        helpMenu.add(check);
+        helpMenu.add(check);*/
         current = helpMenu.add(help); // why is help not a JosmAction?
         current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
                 Shortcut.GROUP_DIRECT).getKeyStroke());
         add(helpMenu, about);
-        add(helpMenu, historyinfo);
         add(helpMenu, KeyEvent.VK_H, "help");
     }