A bunch of CSS changes.  I hope I don't mess up Marc's stuff.