NewGridView bug fixes

A few bug fixes in the NewGridView branch.