ng-grid + fixes