Fix views, add new User model