Refactored templates and basic views