Fix display issue/