some improvemts to ui