added buttons
Merge branch 'dev_AO' into dev