Fixes to ui