Improve highlight display; tidy up CSS