diff --git a/src/helpers/nrf52/SerialBLEInterface.cpp b/src/helpers/nrf52/SerialBLEInterface.cpp
index 8049f5c0..170a7331 100644
--- a/src/helpers/nrf52/SerialBLEInterface.cpp
+++ b/src/helpers/nrf52/SerialBLEInterface.cpp
@@ -116,10 +116,14 @@ void SerialBLEInterface::disable() {
   _isEnabled = false;
   BLE_DEBUG_PRINTLN("SerialBLEInterface::disable");
 
+#ifdef RAK_BOARD
+  Bluefruit.disconnect(Bluefruit.connHandle());
+#else
   uint16_t conn_id;
   if (Bluefruit.getConnectedHandles(&conn_id, 1) > 0) {
     Bluefruit.disconnect(conn_id);
   }
+#endif
 
   Bluefruit.Advertising.restartOnDisconnect(false);
   Bluefruit.Advertising.stop();
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 8fb4d1bb..f0dea837 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -64,6 +64,7 @@ build_src_filter = ${rak4631.build_src_filter}
 extends = rak4631
 build_flags =
   ${rak4631.build_flags}
+  -I examples/companion_radio/ui-new
   -D PIN_USER_BTN=9
   -D PIN_USER_BTN_ANA=31
   -D DISPLAY_CLASS=SSD1306Display
@@ -73,7 +74,9 @@ build_flags =
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/companion_radio>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -82,6 +85,7 @@ lib_deps =
 extends = rak4631
 build_flags =
   ${rak4631.build_flags}
+  -I examples/companion_radio/ui-new
   -D PIN_USER_BTN=9
   -D PIN_USER_BTN_ANA=31
   -D DISPLAY_CLASS=SSD1306Display
@@ -95,7 +99,9 @@ build_flags =
 build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
diff --git a/variants/rak4631/target.cpp b/variants/rak4631/target.cpp
index 4e9d3cce..71d4e88c 100644
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@@ -6,6 +6,7 @@ RAK4631Board board;
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h
index c4c88183..5e93b7fc 100644
--- a/variants/rak4631/target.h
+++ b/variants/rak4631/target.h
@@ -11,6 +11,8 @@
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/SSD1306Display.h>
   extern DISPLAY_CLASS display;
+  #include <helpers/ui/MomentaryButton.h>
+  extern MomentaryButton user_btn;
 #endif
 
 extern RAK4631Board board;