More main menu work
Merge branch 'master' into asko
Fixed merge
Merge branch 'asko'
Merge branch 'master' into asko