major changes to views and mmodels