Fixed some formating issues.
Merge branch 'master' into css_fixes