some fixes to ui