Improve navigation
Add state to User model
Add state history for user states