Fix display problems