Changed views and added constraints