Update styles
Merge branch 'feature/look-and-feel'