Refactored views to use template inheritance