added buttons
Merge branch 'dev'