changes made due to feedback from Adam, Rune and Simon on how to make the grid as flexible as possible