Display Bug Squashing

Fixed some pretty bad display errors that i previously thought i'd
fixed, hopefully it was just a gremlin and doesn't come back.