Worked some on the CSS.
Merge branch 'daltonbranch' into c1moore_branch
Fix conflicts in CSS files.