Fixed up the menus a bit