Improved use of grids in choOrgHeadline.