[IMP] Partner form reordering