Grid view fixes