More menus refactoring