General CSS Fixes
Merge branch 'Elliot'