Template field display and re-ordering working!