Some improvements to layout and fonts and colours