fix more UI bugs