Big tidy up of list styles