Updates to play with new mainmenu
Merge branch 'master' of https://github.com/busheldirect/initial