Improvements to grid view