Further improvements to ui