diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index ef42071..93e2994 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit ef420717399088af4b1f0e529a9ed45f7880186a
+Subproject commit 93e2994ba1c479aeafd453cae056f4254e4dfe24
diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore
index a75e17b..3b2cc5c 160000
--- a/Cores/SNESDeltaCore
+++ b/Cores/SNESDeltaCore
@@ -1 +1 @@
-Subproject commit a75e17b34ccb02cabf737a933000ef7da8f041f9
+Subproject commit 3b2cc5ce3d62c3a1cde3dac20b088504b4fa2380
diff --git a/Delta/Emulation/EmulationViewController.swift b/Delta/Emulation/EmulationViewController.swift
index cd04396..d233295 100644
--- a/Delta/Emulation/EmulationViewController.swift
+++ b/Delta/Emulation/EmulationViewController.swift
@@ -74,6 +74,7 @@ class EmulationViewController: UIViewController
         
         let controllerSkin = ControllerSkin.defaultControllerSkinForGameUTI(self.game.typeIdentifier)
         
+        self.controllerView.containerView = self.view
         self.controllerView.controllerSkin = controllerSkin
         self.controllerView.addReceiver(self)
         self.emulatorCore.setGameController(self.controllerView, atIndex: 0)
@@ -169,16 +170,6 @@ extension EmulationViewController: GameControllerReceiverType
             UIDevice.currentDevice().vibrate()
         }
         
-        if let input = input as? ControllerInput
-        {
-            switch input
-            {
-            case .Menu: self.controllerViewHeightConstraint.constant = 0
-            }
-            
-            return
-        }
-        
         guard let input = input as? ControllerInput else { return }
         
         print("Activated \(input)")