Fixed a couple display bugs