Re-ordering fields in modal - make time/date frist. refs #5