FORUM-325 | [Answer] Fix some UI error