Refactored views by splitting out individual templates.