Finished Main Menu and bug fixes