First styling (frontend)
Merge branch 'dev'