Couple tweaks, and fixed the orderBy for the grid rows