various fixes to UI