Fixed buttons up, and removed trailing whitespace