change the cell layout and other fixes.