UI-3187 fix some UI bug