Reorganize menus (mostly fixes issue 8)
Merge remote-tracking branch 'upstream/master'
fixed bad layout
now with actual changes.
Merge pull request #18 from sweettea/master

Fix issue 8 (reorganize menus)