UPGRADE FROM 2.1 to 2.2 ** Work In Progress - Please do not use this code in production ** Form Refactoring the general layout to be more compact Remove the collapsing option to migrate to tabbed form layout