@@ -3,7 +3,6 @@ using UnityEngine.UIElements;
 using UnityEngine.InputSystem;

 public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
-    [SerializeField]
    UIDocument menuDoc;

    [SerializeField]
@@ -12,27 +11,43 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
    [SerializeField]
    ShipControls shipControls;

+    MenuUi menuUi;
+
    SpaceRaceInput input;
    bool visible = false;

-    void Start() {
+    void Awake() {
+        menuDoc = GetComponent<UIDocument>();
+
        if (input == null) {
            input = new SpaceRaceInput();
            input.menu.SetCallbacks(this);
        }
        input.menu.Enable();
+
+        menuUi = GetComponent<MenuUi>();
+        if (!menuUi) {
+            Debug.LogError("No MenuUI");
+            return;
+        }
+
+
        Hide();
    }

+    void OnDestroy() {
+        input.menu.RemoveCallbacks(this);
+    }
+
    void Show() {
        visible = true;
        UnityEngine.Cursor.lockState = CursorLockMode.None;
        menuDoc.enabled = true;
+        menuUi.AddTracks();

        // take control off the ship
        timingDoc.enabled = false;
        shipControls.enabled = false;
-
    }

    void Hide() {