extract form to partial + fix expan/collapse