Formatting

This is a WIP for formatting. It's no where near done, I just don't want to get too far and not be able to merge. 
CSS and HTML changes only.
Jason