UI changes
Merge branch 'UI'
some db stuff for login
Merge branch 'UI' into db
local
mereged