Various changes including swapping cells around

Lots of changes from Nature sub-editor.