new UI login
Merge branch 'dev'