Main Menu stuff
Merge branch 'Austin'