Started progress on display
Refactor the grid with cells