Better layout

There are no substantive text changes here, it's all layout and reorganisation.