Started the rework on menus