Added partials and includes to template files