Fixed a lot of display bugs