Updated more of the views to use the new model code