Order changes, css tweaks, colour tweaks