More cleanup and CSS tweaks.