more fixes to UI