Grid view fix