Made menu a submenu item of Tools

Having a top level menu for this is a bit much. I also did a bit of
alignment cleanup and whatnot while I was in there.
Merge pull request #5 from robneu/menu-sanity

Make menu a submenu item of Tools