fix some UI issue