Fixed the menu and some other stuff