A few display improvements