Updated styles
Fixing merge conflicts in styles