More fixes on display