fix more UI issues