Continue reworking grid layout.