fixed some display issue