rm whitespace
fix layout quirks, simplify