Lots and lots of formatting CSS changes by Marielle