Refactored template w/ partials