fix more problems with Portrait mode