Fix some display problem