More login
Clean up and edits
Merge branch 'Modeling-users'
Fixed Logging out issues