Minor cosmetic edits

Changed the spacing on some classes and removed unnecessary pieces from
button.h.