Some user-auth ui
Some fixes for auth UI
Some logic