Changed php classes to display all fields in template