First batch of updates - grid view setup