Lint fixes, improved look of grid.