Got rid of ng-grid
Small tweak
And more tweaking