some minor css updates
Fixing merge conflict.