diff --git a/VoidLink/Input/ControllerUtil.swift b/VoidLink/Input/ControllerUtil.swift
index ade31f7c..662a3adb 100644
--- a/VoidLink/Input/ControllerUtil.swift
+++ b/VoidLink/Input/ControllerUtil.swift
@@ -78,6 +78,7 @@ import Foundation
         
         // 单一 gamepad.valueChangedHandler
         gamepad.valueChangedHandler = { gamepad, element in
+            /*
             navigationActionTriggeredPrivate = (gamepad.dpad.up.isPressed
                                                 || gamepad.dpad.down.isPressed
                                                 || gamepad.dpad.left.isPressed
@@ -101,6 +102,7 @@ import Foundation
                     }
                 }
             }
+            */
             handler(buttonDict, gamepad, element)
             if #available(iOS 13.0, *) {
                 if controller.playerIndex == .index1 {
diff --git a/VoidLink/Input/KeyboardSupport.m b/VoidLink/Input/KeyboardSupport.m
index 621d729a..c1a08380 100644
--- a/VoidLink/Input/KeyboardSupport.m
+++ b/VoidLink/Input/KeyboardSupport.m
@@ -37,13 +37,12 @@
         }
         
         bool physicalGamepadConnected = ControllerUtil.activeGCControllers.count>0;
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, physicalGamepadConnected ? 0.005*NSEC_PER_SEC : 0), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            if(!physicalGamepadConnected
-               || !ControllerUtil.navigationActionTriggered)
+        // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, physicalGamepadConnected ? 0.005*NSEC_PER_SEC : 0), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            if(!physicalGamepadConnected)
                 LiSendKeyboardEvent(0x8000 | keyCode,
                                     down ? KEY_ACTION_DOWN : KEY_ACTION_UP,
                                     0);
-        });
+        // });
         
         return YES;
     }
diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index 6e46027a..408367a9 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -2957,7 +2957,7 @@ import ObjectiveC.runtime
     }
     
     // MARK: - Auto Dock
-    private static let autoDockExposedEdgeLength: CGFloat = 80
+    private static let autoDockExposedEdgeLength: CGFloat = GenericUtils.isIPhone() ? 90 : 105
     private static let autoDockExposedThickness: CGFloat = 17
     private static let autoDockVerticalInset: CGFloat = 12
     @objc var autoDockIdleDuration: TimeInterval = 5
@@ -2990,6 +2990,7 @@ import ObjectiveC.runtime
     private var autoDockStoredCenter: CGPoint?
     private var autoDockDockedCenter: CGPoint?
     private var autoDockDockedToBottomEdge: Bool = false
+    private var autoDockDistance: CGFloat = 3
     private var autoDockIsDocked: Bool = false
     private var autoDockEnabled: Bool = false
     private var autoDockSettledAlphaTimer: Timer?
@@ -3172,6 +3173,8 @@ import ObjectiveC.runtime
         autoDockStoredCenter = center
         let rightDistance = hostView.bounds.width - frame.maxX
         let bottomDistance = hostView.bounds.height - frame.maxY
+        autoDockDistance = min(rightDistance, bottomDistance)
+        print("autoDockDistance \(autoDockDistance) ...")
         autoDockDockedToBottomEdge = bottomDistance < rightDistance
         
         let targetFrame = autoDockTargetFrame(in: hostView.bounds)
@@ -3188,7 +3191,7 @@ import ObjectiveC.runtime
             self.frame = targetFrame
             self.transform = CGAffineTransform(scaleX: 0.985, y: 0.985)
         } completion: { _ in
-            UIView.animate(withDuration: 0.14, delay: 0, options: [.allowUserInteraction, .curveEaseOut]) {
+            UIView.animate(withDuration: 0.1, delay: 0, options: [.allowUserInteraction, .curveEaseOut]) {
                 self.autoDockApplyTemporarySize()
                 self.transform = .identity
                 self.label.alpha = 0
@@ -3198,7 +3201,7 @@ import ObjectiveC.runtime
                 self.autoDockStopSettledAlphaTimer()
                 self.autoDockSettledAlphaTimer = Timer.scheduledTimer(withTimeInterval: OnScreenWidgetView.autoDockSettledAlphaDelay, repeats: false) { [weak self] _ in
                     guard let self, self.autoDockIsDocked else { return }
-                    UIView.animate(withDuration: 0.2, delay: 0, options: [.allowUserInteraction, .curveEaseOut]) {
+                    UIView.animate(withDuration: 0.17, delay: 0, options: [.allowUserInteraction, .curveEaseOut]) {
                         self.isUserInteractionEnabled = true
                         self.alpha = self.autoDockSettledAlpha
                     }
@@ -3228,7 +3231,7 @@ import ObjectiveC.runtime
         
         if animated {
             UIView.animate(
-                withDuration: 0.38,
+                withDuration: autoDockDistance/(175/0.38),
                 delay: 0,
                 usingSpringWithDamping: OnScreenWidgetView.autoDockReturnDamping,
                 initialSpringVelocity: 0.22,
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m
index a775564a..a53b9933 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.m
+++ b/VoidLink/ViewControllers/StreamFrameViewController.m
@@ -954,6 +954,7 @@
 }
 
 - (void) returnToMainFrame {
+    [_streamView saveStreamViewWidgetChanges];
     [_streamView clearOnScreenWidgets];
     if(micHandler) [micHandler clean];
     PencilHandler.shared = nil;