Refactor Sessions and new User views.