Fix ugly layout and whitespace, no significant change