Grid view improvements