Fixed a couple more display bugs