[UI] Some bug fixes.