removed duplication in templates. Separated partials and templates