Clean up menus

Rearranged menus, added some shortcuts and changed a few plot colours.