Further CSS and HTML tweaks