820 gridline overlap

Having #825 target develop

Close #820