UI polishing work in progress.
Fixed logout.
Merge branch 'ParseBranch' into feature/user-ui-flow
Merge branch 'feature/user-ui-flow' into ParseBranch