Updated buttons to use Pajamas complaint ButtonComponent.
Rearranged the buttons to look consistent.

Changelog: changed
EE: true