Use grid

Use a grid whenever possible.