Another menu and a cosmetic fix