added buttons
Merge branch 'dev_AO' into dev
added buttons in main menu
Merge branch 'dev' into dev_LA
some kind of fix