some tidying up still of CSS