[UI] Minor Fixes