Revert "UI-3187 fix some UI bug"

This reverts commit 9527b3d19a867e884b4f72121719de6e985df461.