CSS tidying and fixing