Merge pull request #17950 from Anurag810/company_ui/ux_fix

fix: Make some section collapsible in company form