Comment 1 for bug 736072

I'm proposing a branch where I've re-ordered some of the items into more logical groups as well as added separators into the menu. Hopefully this makes it's a little easier to see what is in the menu.