Fix some display issue