Merge branch 'dev'
added new styling