New layout for Cells, refactor