make grid more matching with design, references #22