Updated templates to include partial