Adds some functional buttons
Merge branch 'buttons'