Fixed some minor bugs with the menu