Layout now deals with cell additions