Styles updates
Merged changes