Fixed a few display bugs