Fixed 'buttons' partial.
Merge branch 'dev'