Tweak shortcuts and menu location