Refactor for new gridLayout -> gridData format change. Nightly commit