Minor fixes to ui