Fix up HTML and CSS