Changed views to generic views