fixes to UI