Fix whitespace
Tweak buttons