Added some more fancy things

BUTTONS
Cleaning up boilerplate