Tweak CSS a lot, other minor changes