fix x button bug
merge heqiao to develop