Further CSS Cleanup