Modified grid drawing to work with the new design