reorganize the unit count layouts