Fixes to grid view