Started work on main menu fixes #1