GitHub #186: Work on [togglegrid] patch