Tweak and refactor some CSS