Updates to v4.0

Quite a number of updates relating to layout and formatting to account for differences between v3.1 and v4.0