Separate out menus.

Update menu for non-mac.

Fixes #112.