Update styles
Merge branch 'styles'