refactor of grid + addition of some dev tools