Refactor UserSession
Update the navbar