tidying and css fixes