Visual, formatting and CSS cleanups.
Merged mcowgers fixes