bigger grid, more flexible controls, some refactors