Fixes for field reordering bug, custom form template bug, and field label tag bug.