modified views to adapt to new model