Repositioned menu and other fixes