CSS updates
Fixing conflict in git