Big refactoring in menus... but not finished!