Almost finished menus refactoring