Fix lots of display bugs