Fix tabs
Move user info construction to model
Add method to determine effective displayName