Refactored views to have a base template