*8774* Grid redesign

Consider removing the reference here too for consistency