Tweak HTML and fix up some CSS.