Experiments with menus
Almost finished menus refactoring