Update scss to sass
Update styles
Merge branch 'feature/use_sass' into develop