Further CSS tweaks and tidying up