started on ui and login
Merge branch 'ui'