diff --git a/rp2040/src/layout.rs b/rp2040/src/layout.rs
index ffd23db..1ff4a4c 100644
--- a/rp2040/src/layout.rs
+++ b/rp2040/src/layout.rs
@@ -57,7 +57,7 @@ pub enum ButtonType {
 
 // Button index map:
 // --------------------------------------------------------------
-// |  0  |  1  |                                    |  2  |  3  | (4)
+// |  3  |  4  |                                    |  0  |  1  | (2)
 // --------------------------------------------------------------
 // |     |  5  |  6  |  7  |            | 12  | 11  | 10  |     |
 // |                                                            |
@@ -77,11 +77,11 @@ pub const MAP: [[ButtonType; NUMBER_OF_BUTTONS]; 4] = [
         // Function layer 0
         // HID Key                // Button Index
         // -----------------------------------------
+        ButtonType::FnR,              // 3
+        ButtonType::B5,               // 2
+        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::FnL,              // 0
         ButtonType::B1,               // 1
-        ButtonType::B5,               // 2
-        ButtonType::FnR,              // 3
-        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::B2,               // 5
         ButtonType::B3,               // 6
         ButtonType::ModeL,            // 7
@@ -107,11 +107,11 @@ pub const MAP: [[ButtonType; NUMBER_OF_BUTTONS]; 4] = [
         // Function layer 1 (left Fn button pressed)
         // HID Key                  // Button Index
         // -----------------------------------------
+        ButtonType::FnR,              // 3
+        ButtonType::B5,               // 2
+        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::FnL,              // 0
         ButtonType::B9,               // 1
-        ButtonType::B5,               // 2
-        ButtonType::FnR,              // 3
-        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::B10,              // 5
         ButtonType::B11,              // 6
         ButtonType::ModeL,            // 7
@@ -137,11 +137,11 @@ pub const MAP: [[ButtonType; NUMBER_OF_BUTTONS]; 4] = [
         // Function layer 2 (right Fn button pressed)
         // HID Key                  // Button Index
         // -----------------------------------------
+        ButtonType::FnR,              // 3
+        ButtonType::B13,              // 2
+        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::FnL,              // 0
         ButtonType::B1,               // 1
-        ButtonType::B13,              // 2
-        ButtonType::FnR,              // 3
-        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::B2,               // 5
         ButtonType::B3,               // 6
         ButtonType::ModeL,            // 7
@@ -167,11 +167,11 @@ pub const MAP: [[ButtonType; NUMBER_OF_BUTTONS]; 4] = [
         // Function layer 3 (left + right Fn button pressed)
         // HID Key                  // Button Index
         // -----------------------------------------
+        ButtonType::FnR,              // 3
+        ButtonType::B13,              // 2
+        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::FnL,              // 0
         ButtonType::B9,               // 1
-        ButtonType::B13,              // 2
-        ButtonType::FnR,              // 3
-        ButtonType::NoEventIndicated, // 4 Not connected to any button
         ButtonType::B10,              // 5
         ButtonType::B11,              // 6
         ButtonType::ModeL,            // 7