css tweaks
Merge branch 'CSS-tweaks' into cascade-integration