More changes to models and views