Tried fixing the display problems