Fixes to UI