Fix display text bugs :(