Fixed some display bug