Reworked the menu loops a bit