Added styles
Fixed merge conflict