added controller main menu buttons
Merge origin/master