more fixes to ui
more fixes to ui
more fixes to ui