diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index a25bb727c..2cb9075bd 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1047,7 +1047,7 @@ namespace MWInput
 
     bool InputManager::actionIsActive (int id)
     {
-        return (mInputBinder->getChannel (id)->getValue ()!=0.0);
+        return (mInputBinder->getChannel (id)->getValue ()==1.0);
     }
 
     void InputManager::loadKeyDefaults (bool force)
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index b7417a51d..4635cbfa4 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -49,8 +49,12 @@ set(MATERIAL_FILES
     mygui.shaderset
 )
 
+set(ETC_FILES
+    gamecontrollerdb.txt
+)
+
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR}/water "${OpenMW_BINARY_DIR}/resources/water/" "${WATER_FILES}")
 
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR}/materials "${OpenMW_BINARY_DIR}/resources/materials/" "${MATERIAL_FILES}")
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/gamecontrollerdb.txt ${OpenMW_BINARY_DIR}/resources/)
+copy_all_files(${CMAKE_CURRENT_SOURCE_DIR} "${OpenMW_BINARY_DIR}/resources/" "${ETC_FILES}")
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index fd84be3e9..11751b7ec 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout" version="3.2.0">
-    <Widget type="Window" skin="MW_Window" position="0 0 400 426" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_Window" position="0 0 400 476" layer="Windows" name="_Main">
         <Property key="MinSize" value="430 446"/>
-        <Widget type="TabControl" skin="TabControl" position="8 8 368 340" align="Stretch" name="SettingsTab">
+        <Widget type="TabControl" skin="TabControl" position="8 8 368 390" align="Stretch" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
-            <Widget type="TabItem" skin="" position="4 32 360 308">
+            <Widget type="TabItem" skin="" position="4 32 360 358">
                 <Property key="Caption" value="  #{sPrefs}  "/>
                 <Widget type="Widget" skin="" position="4 4 352 54" align="Left Top HStretch">
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
@@ -172,15 +172,21 @@
             </Widget>
             <Widget type="TabItem" skin="" position="4 32 360 308">
                 <Property key="Caption" value="  #{sControls}  "/>
-                <Widget type="Widget" skin="MW_Box" position="4 4 352 154" align="Stretch">
+                <Widget type="AutoSizedButton" skin="MW_Button" position="4 4 137 24" align="Left Top" name="KeyboardButton">
+                    <Property key="Caption" value="Mouse/Keyboard"/>
+                </Widget>
+                <Widget type="AutoSizedButton" skin="MW_Button" position="141 4 137 24" align="Lept Top" name="ControllerButton">
+                    <Property key="Caption" value="Controller"/>
+                </Widget>
+                <Widget type="Widget" skin="MW_Box" position="4 34 352 154" align="Stretch">
                     <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 344 146" align="Stretch" name="ControlsBox">
                         <Property key="CanvasAlign" value="Left Top"/>
                     </Widget>
                 </Widget>
-                <Widget type="AutoSizedButton" skin="MW_Button" position="4 162 137 24" align="Left Bottom" name="ResetControlsButton">
+                <Widget type="AutoSizedButton" skin="MW_Button" position="4 194 137 24" align="Left Bottom" name="ResetControlsButton">
                     <Property key="Caption" value="#{sControlsMenu1}"/>
                 </Widget>
-                <Widget type="HBox" skin="" position="4 192 300 24" align="Left Bottom">
+                <Widget type="HBox" skin="" position="4 224 300 24" align="Left Bottom">
                     <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom" name="InvertYButton">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert y axis"/>
@@ -190,10 +196,10 @@
                         <Property key="Caption" value="#{sMouseFlip}"/>
                     </Widget>
                 </Widget>
-                <Widget type="TextBox" skin="NormalText" position="4 228 336 18" align="Left Bottom">
+                <Widget type="TextBox" skin="NormalText" position="4 254 336 18" align="Left Bottom">
                     <Property key="Caption" value="Camera sensitivity"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 252 336 18" align="HStretch Bottom" name="CameraSensitivitySlider">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 278 336 18" align="HStretch Bottom" name="CameraSensitivitySlider">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -203,11 +209,11 @@
                     <UserString key="SettingMin" value="0.2"/>
                     <UserString key="SettingMax" value="5.0"/>
                 </Widget>
-                <Widget type="TextBox" skin="SandText" position="4 276 336 18" align="Left Bottom">
+                <Widget type="TextBox" skin="SandText" position="4 302 336 18" align="Left Bottom">
                     <Property key="Caption" value="#{sLow}"/>
                     <Property key="TextAlign" value="Left"/>
                 </Widget>
-                <Widget type="TextBox" skin="SandText" position="4 276 336 18" align="Right Bottom">
+                <Widget type="TextBox" skin="SandText" position="4 326 336 18" align="Right Bottom">
                     <Property key="Caption" value="#{sHigh}"/>
                     <Property key="TextAlign" value="Right"/>
                 </Widget>
@@ -460,7 +466,7 @@
                 </Widget>
             </Widget>
         </Widget>
-        <Widget type="AutoSizedButton" skin="MW_Button" position="321 355 56 24" align="Right Bottom" name="OkButton">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="321 405 56 24" align="Right Bottom" name="OkButton">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sOK}"/>
         </Widget>