fixed the views to work with the new model