Fixed some bugs with the new main menu