Improve the menu speed and fix more problems