Re-written menus, resolves #30