fix some problem, modify some display