Improve few display things