Another menu fix + change layout (since I misunderstood what we wanted
the first time I made it)