Small fixes to ui