Changed views and controller