Revamp, real site, whitespace cleanup