Changed movement listeners to prevent conflicts with HUD listeners