Refactored views to match new models.