Huge overhaul of menus, some new actions added