made some changes to model classes and added some new views