381 continued

This carries on from work done for #381, removing all 'small' sidebars, a couple of bug fixes, and removing all fieldset margins.