Closed #3, now we can move the grid !
Cleanup code