updated styles
Merge branch 'feature/styles' into develop