reordered cells
UI tweaks