CSS tweaks and tidying