Fixes to UI update based on feedback.