diff --git a/CubeGotchi.ino b/CubeGotchi.ino
index 8fcb4bf..8314f41 100644
--- a/CubeGotchi.ino
+++ b/CubeGotchi.ino
@@ -31,7 +31,7 @@
 //#define U8G2_LAYOUT_MIRROR
 /**************************************************************************/
 
-#ifdef U8G2_LAYOUT_NORMAL
+#ifdef U8G2_LAYOUT_NORMAL1002714
 U8G2_SSD1306_128X64_NONAME_2_HW_I2C display(U8G2_R0);
 #endif
 
@@ -43,9 +43,9 @@ U8G2_SSD1306_128X64_NONAME_2_HW_I2C display(U8G2_R2);
 U8G2_SSD1306_128X64_NONAME_2_HW_I2C display(U8G2_MIRROR);
 #endif
 
-#define PIN_BTN_L 15 // D6
+#define PIN_BTN_L 12 // D6
 #define PIN_BTN_M 13 // D7
-#define PIN_BTN_R 12 // D8
+#define PIN_BTN_R 15 // D8
 //define PIN_BTN_SAVE 3
 #define PIN_BUZZER 14 // D5
 
@@ -373,4 +373,4 @@ void loop() {
     saveStateToEEPROM(&cpuState);
   }
 #endif  
-}
\ No newline at end of file
+}