removed ANE controller and removed comment in menu for mouse
merge conflicts in menu
removed merge conflicts in menu state