Separate out menus.

Update menu for non-mac.

Fixes #112.
Merge pull request #128 from joneshf/ready/112

Separate out menus.