Merge pull request #511 from Maaack/change-default-main-menu