Fixes for CSS
Merge branch 'rr-csscleanup'