Patch Grid (break into smaller files; small bugfix)