new structure, almost finished menus