started styling
Merge branch 'styles' into dev