pretty buttons
Merge branch 'styles'