Fix the display stuff