Menus & more refactor