Fixes and added row count to the bottom of the data grid