tweak some UI issue