Changes to the menu and various bug fixes