Restructure menu and added faster mouse tracking