generic views

changed code to reflect generic views