Change templates to match the new picture