Added code for cell grid