GridView Fixes