Various fixes to the CSS, and other changes