Intermediate commit: get new layout nearly transitioned.