Added white-space fix in 'buttons' partial.
Added 'imports' partial.
Merge branch 'dev'