fix more layoututu