Finished re-working to put all of the main menu into its own method