diff --git a/Source/Android/PluginInput/Controller_1.1.h b/Source/Android/PluginInput/Controller_1.1.h
index bd8279332..7e7dae4e5 100644
--- a/Source/Android/PluginInput/Controller_1.1.h
+++ b/Source/Android/PluginInput/Controller_1.1.h
@@ -68,9 +68,9 @@ typedef union
         unsigned Reserved1 : 1;
         unsigned Reserved2 : 1;
 
-        signed   Y_AXIS : 8;
-
         signed   X_AXIS : 8;
+
+        signed   Y_AXIS : 8;
     };
 } BUTTONS;
 #pragma warning(pop)
diff --git a/Source/Project64-core/Plugins/ControllerPlugin.cpp b/Source/Project64-core/Plugins/ControllerPlugin.cpp
index d775fef71..a69fc8cb7 100644
--- a/Source/Project64-core/Plugins/ControllerPlugin.cpp
+++ b/Source/Project64-core/Plugins/ControllerPlugin.cpp
@@ -149,7 +149,7 @@ void CControl_Plugin::UpdateKeys(void)
     if (!m_AllocatedControllers) { return; }
     for (int32_t cont = 0; cont < sizeof(m_Controllers) / sizeof(m_Controllers[0]); cont++)
     {
-        if (!m_Controllers[cont]->m_Present) { continue; }
+        if (!m_Controllers[cont]->Present()) { continue; }
         if (!m_Controllers[cont]->m_RawData)
         {
             GetKeys(cont, &m_Controllers[cont]->m_Buttons);
diff --git a/Source/Project64-core/Plugins/ControllerPlugin.h b/Source/Project64-core/Plugins/ControllerPlugin.h
index d752a4058..7468def03 100644
--- a/Source/Project64-core/Plugins/ControllerPlugin.h
+++ b/Source/Project64-core/Plugins/ControllerPlugin.h
@@ -37,9 +37,9 @@ typedef union
         unsigned Reserved1 : 1;
         unsigned Reserved2 : 1;
 
-        signed   Y_AXIS : 8;
-
         signed   X_AXIS : 8;
+
+        signed   Y_AXIS : 8;
     };
 } BUTTONS;
 #pragma warning(pop)
@@ -76,7 +76,7 @@ class CCONTROL
 {
 public:
     CCONTROL(int32_t &Present, int32_t &RawData, int32_t &PlugType);
-    inline bool  Present(void) const { return m_Present != 0; }
+    inline bool Present(void) const { return m_Present != 0; }
     inline uint32_t Buttons(void) const { return m_Buttons.Value; }
     inline PluginType Plugin(void) const { return static_cast<PluginType>(m_PlugType); }
 private:
@@ -84,8 +84,8 @@ private:
 
     int32_t & m_Present;
     int32_t & m_RawData;
-    int32_t      & m_PlugType;
-    BUTTONS    m_Buttons;
+    int32_t & m_PlugType;
+    BUTTONS m_Buttons;
 
     CCONTROL(void);                         // Disable default constructor
     CCONTROL(const CCONTROL&);              // Disable copy constructor
diff --git a/Source/Project64-input/ControllerSpec1.1.h b/Source/Project64-input/ControllerSpec1.1.h
index 11cd0efcc..6299b8c8b 100644
--- a/Source/Project64-input/ControllerSpec1.1.h
+++ b/Source/Project64-input/ControllerSpec1.1.h
@@ -72,9 +72,9 @@ typedef union
         unsigned Reserved1 : 1;
         unsigned Reserved2 : 1;
 
-        signed   Y_AXIS : 8;
-
         signed   X_AXIS : 8;
+
+        signed   Y_AXIS : 8;
     };
 } BUTTONS;
 
diff --git a/Source/nragev20/ControllerSpecs/Controller #1.1.h b/Source/nragev20/ControllerSpecs/Controller #1.1.h
index 7fbc27219..e6e5be5d3 100644
--- a/Source/nragev20/ControllerSpecs/Controller #1.1.h	
+++ b/Source/nragev20/ControllerSpecs/Controller #1.1.h	
@@ -82,9 +82,9 @@ extern "C" {
             unsigned Reserved1 : 1;
             unsigned Reserved2 : 1;
 
-            signed   Y_AXIS : 8;
-
             signed   X_AXIS : 8;
+
+            signed   Y_AXIS : 8;
         };
     } BUTTONS;