Main Menu Update

More code and some UI changes for the main menu