fix more design bugs