More CSS changes
Fixing merge conflict