+ fixes to UI logic