Menus are nicer now but broken