new UI
no less or scss is needed
Merge branch 'dev' into 'master'

new UI