Reworked the cells and the cell control