some minor refactoring around menus. Nothing major.