Fixed some of the display problems
Fixed some of the display problems