Updated the markup for the grids to be consistent with what's in the tes...

...t page. Added the filtering logic to the data source.