[UI] Fix Bugs