Fixed some display issue