diff --git a/board_single/main/button.cpp b/board_single/main/button.cpp
index e4a6a38..3d83fbf 100644
--- a/board_single/main/button.cpp
+++ b/board_single/main/button.cpp
@@ -9,6 +9,7 @@ extern "C"
 
 #include "button.hpp"
 #include "encoder.hpp"
+#include "display.hpp"
 
 // tag for logging
 static const char *TAG = "button";
@@ -164,7 +165,7 @@ void buttonCommands::startHandleLoop()
 {
     //-- variables --
     bool isPressed = false;
-    static rotary_encoder_event_t ev; // store event data
+    static rotary_encoder_event_t event; // store event data
     // int count = 0; (from class)
 
     while (1)
@@ -180,10 +181,10 @@ void buttonCommands::startHandleLoop()
         }
 
         //-- get events from encoder --
-        if (xQueueReceive(encoderQueue, &ev, INPUT_TIMEOUT / portTICK_PERIOD_MS))
+        if (xQueueReceive(encoderQueue, &event, INPUT_TIMEOUT / portTICK_PERIOD_MS))
         {
             control->resetTimeout();          // user input -> reset switch to IDLE timeout
-            switch (ev.type)
+            switch (event.type)
             {
                 break;
             case RE_ET_BTN_PRESSED:
@@ -196,9 +197,20 @@ void buttonCommands::startHandleLoop()
                 ESP_LOGD(TAG, "Button released");
                 isPressed = false; // rest stored state
                 break;
+            case RE_ET_CHANGED: // scroll through status pages when simply rotating encoder
+                if (event.diff > 0)
+                {
+                    display_rotateStatusPage(true, true); //select NEXT status screen, stau at last element (dont rotate to first)
+                    buzzer->beep(1, 65, 0);
+                }
+                else
+                {
+                    display_rotateStatusPage(false, true); //select PREVIOUS status screen, stay at first element (dont rotate to last)
+                    buzzer->beep(1, 65, 0);
+                }
+                break;
             case RE_ET_BTN_LONG_PRESSED:
             case RE_ET_BTN_CLICKED:
-            case RE_ET_CHANGED:
             default:
                 break;
             }
diff --git a/board_single/main/display.cpp b/board_single/main/display.cpp
index 7c3e875..7b00656 100644
--- a/board_single/main/display.cpp
+++ b/board_single/main/display.cpp
@@ -441,6 +441,13 @@ void showStartupMsg(){
 //============================
 void display_selectStatusPage(displayStatusPage_t newStatusPage)
 {
+	// get number of available screens
+	const displayStatusPage_t max = STATUS_SCREEN_SCREENSAVER;
+	const uint8_t maxItems = (uint8_t)max;
+	// limit to available pages
+	if (newStatusPage > maxItems) newStatusPage = (displayStatusPage_t)(maxItems);
+	else if (newStatusPage < 0) newStatusPage = (displayStatusPage_t)0;
+
 	//-- run commands when switching FROM certain mode --
 	switch (selectedStatusPage)
 	{
@@ -470,6 +477,41 @@ void display_selectStatusPage(displayStatusPage_t newStatusPage)
 	}
 }
 
+//============================
+//===== rotateStatusPage =====
+//============================
+// select next/previous status screen and rotate to start/end (uses all available in struct)
+void display_rotateStatusPage(bool reverseDirection, bool noRotate)
+{
+	// get number of available screens
+	const displayStatusPage_t max = STATUS_SCREEN_SCREENSAVER;
+	const uint8_t maxItems = (uint8_t)max - 1; // screensaver is not relevant
+
+	if (reverseDirection == false) // rotate next
+	{
+		if (selectedStatusPage >= maxItems) // already at last item
+		{
+			if (noRotate)
+				return;										  // stay at last item when rotating disabled
+			display_selectStatusPage((displayStatusPage_t)0); // rotate to first item
+		}
+		else
+			// select next screen
+			display_selectStatusPage((displayStatusPage_t)((int)selectedStatusPage + 1));
+	}
+	else // rotate back
+	{
+		if (selectedStatusPage <= 0) // already at first item
+		{
+			if (noRotate)
+				return;												   // stay at first item when rotating disabled
+			display_selectStatusPage((displayStatusPage_t)(maxItems)); // rotate to last item
+		}
+		else
+			// select previous screen
+			display_selectStatusPage((displayStatusPage_t)((int)selectedStatusPage - 1));
+	}
+}
 
 
 //============================
diff --git a/board_single/main/display.hpp b/board_single/main/display.hpp
index a4fb8c6..f24a16f 100644
--- a/board_single/main/display.hpp
+++ b/board_single/main/display.hpp
@@ -54,7 +54,7 @@ typedef struct display_task_parameters_t {
 
 
 // enum for selecting the currently shown status page (display content when not in MENU mode)
-typedef enum displayStatusPage_t {STATUS_SCREEN_OVERVIEW=0, STATUS_SCREEN_SPEED, STATUS_SCREEN_JOYSTICK, STATUS_SCREEN_MOTORS, STATUS_SCREEN_SCREENSAVER} displayStatusPage_t;
+typedef enum displayStatusPage_t {STATUS_SCREEN_OVERVIEW=0, STATUS_SCREEN_SPEED, STATUS_SCREEN_JOYSTICK, STATUS_SCREEN_MOTORS, STATUS_SCREEN_SCREENSAVER, __NUMBER_OF_AVAILABLE_SCREENS} displayStatusPage_t; //note: SCREENSAVER has to be last one since it is ignored by rotate and used to determine count
 
 // get precise battery voltage (using lookup table)
 float getBatteryVoltage();
@@ -64,6 +64,8 @@ float getBatteryPercent();
 
 // function to select one of the defined status screens which are shown on display when not in MENU mode
 void display_selectStatusPage(displayStatusPage_t newStatusPage);
+// select next/previous status screen to be shown, when noRotate is set is stays at first/last screen
+void display_rotateStatusPage(bool reverseDirection = false, bool noRotate = false);
 
 //task that inititialized the display, displays welcome message 
 //and releatedly updates the display with certain content