moved the fields within the loop, removed redundant template part call