[IMP] Partner Form View Reorganization