Fix connection form field order and labeling