Update some grid handling