cleanup in template for rearranging fields
cleanup on node template