diff --git a/README.md b/README.md
index bdab5c0..35eb58e 100644
--- a/README.md
+++ b/README.md
@@ -125,21 +125,22 @@ Sitemaps for the OhEzTouch can contain the following elements:
 - Slider
 - Switch
 - Text
+- Default
 
 Example sitemap (```oheztouch.sitemap```):
 ```
 sitemap oheztouch label="OhEzTouch Test"
 {
     Switch      item=OHEZTOUCH_Switch
-    Selection   item=OHEZTOUCH_Select mappings=["SEL1"="Selection 1", "SEL2"="Selection 2", "SEL3"="Selection 3", "SEL4"="Selection 4", "SEL5"="Selection 5", "SEL6"="Selection 6"]
-    Setpoint    item=OHEZTOUCH_Number label="Setpoint"  minValue=5 maxValue=180 step=5
-    Slider      item=OHEZTOUCH_Number label="Slider"    minValue=5 maxValue=180 step=5
-    Colorpicker item=OHEZTOUCH_Color
+    Selection   item=OHEZTOUCH_Switch mappings=[OFF="Off", ON="On"]
+    Selection   item=OHEZTOUCH_Select mappings=["SEL1"="Selection 1", "SEL2"="Selection 2", "SEL3"="Selection 3"]
+    Default     item=OHEZTOUCH_Player
+    Default     item=OHEZTOUCH_Rollershutter
+
     Text label="Submenu" icon="settings"
     {
-        Switch      item=OHEZTOUCH_Switch
-        Setpoint    item=OHEZTOUCH_Number label="Setpoint"  minValue=5 maxValue=180 step=5
-        Slider      item=OHEZTOUCH_Number label="Slider"    minValue=5 maxValue=180 step=5
+        Setpoint    item=OHEZTOUCH_Number label="Setpoint"  minValue=-10 maxValue=10 step=0.5
+        Slider      item=OHEZTOUCH_Number label="Slider"    minValue=-10 maxValue=10 step=1
         Text        item=OHEZTOUCH_Number label="Text"
         Colorpicker item=OHEZTOUCH_Color
     }
@@ -148,11 +149,14 @@ sitemap oheztouch label="OhEzTouch Test"
 ```
 Items for example sitemap:
 ```
-String OHEZTOUCH_Select     "Selection"         <fan>
-String OHEZTOUCH_String     "String"            <text>
-Switch OHEZTOUCH_Switch     "Switch"            <switch>
-Number OHEZTOUCH_Number     "Number [%d sec]"   <time>
-Color  OHEZTOUCH_Color      "Color [%s]"        <colorlight>
+String          OHEZTOUCH_Select        "Selection"         <fan>
+String          OHEZTOUCH_String        "String"            <text>
+Switch          OHEZTOUCH_Switch        "Switch"            <switch>
+Number          OHEZTOUCH_Number        "Number [%.1f °C]"  <temperature>
+Color           OHEZTOUCH_Color         "Color [%s]"        <colorlight>
+Player          OHEZTOUCH_Player        "Player"            <receiver>
+Rollershutter   OHEZTOUCH_Rollershutter "Rollershutter"     <blinds>
+
 ```
 
 ### Power up
@@ -170,7 +174,10 @@ In the upper right is the menu. Select "Configure new AP".
 
 ![browser_wlanconfig](doc/img/browser_wlanconfig.png)
 
-Fill in your WLAN credentials and click Apply. The ArduiTouch will try to connect. If everything went well, the IP received from your DHCP server will be shown on the display.
+Fill in your WLAN credentials and click Apply. The ArduiTouch will try to connect.
+
+#### Systeminfo
+The IP received from your DHCP server and other information can be obtained by touching the upper bar on the screen.
 
 #### OpenHAB Settings
 ![browser_openhabconfig](doc/img/browser_openhabconfig.png)
diff --git a/platformio.ini b/platformio.ini
index 66e7983..6f041f7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,10 +9,9 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-src_dir		= src
+src_dir = src
 include_dir = src
 
-
 [common]
 lib_deps =
 	lv_arduino @ 2.1.5
@@ -21,10 +20,10 @@ lib_deps =
 	AutoConnect @ 1.1.7
 	yiannisbourkelis/Uptime Library @ ^1.0.0
 	bodmer/TFT_eSPI @ 2.3.58
-
-build_flags=-Os
+build_flags =
+	-Os
 	!echo '-DVERSION_GIT_HASH=\"'$(git log |head -1 |cut -c8-)'\"'
-	-DCORE_DEBUG_LEVEL=0
+	-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO
 	-DUSER_SETUP_LOADED=1
 	-DLV_USE_DEBUG=0
 	-DLV_CONF_INCLUDE_SIMPLE=1
@@ -35,12 +34,41 @@ build_flags=-Os
 	-DLODEPNG_NO_COMPILE_ENCODER=1
 	-DLODEPNG_NO_COMPILE_ALLOCATORS=1
 	-DAC_DEBUG=0
+	-I ./src/
+
+[env]
+framework = arduino
+platform_packages = platformio/framework-arduinoespressif32
+build_flags = ${common.build_flags}
+lib_deps = ${common.lib_deps}
+
+[env:debug]
+platform = espressif32
+board = esp32dev
+board_build.partitions = min_spiffs.csv
+build_type = debug
+build_flags =
+	${common.build_flags}
+	-DTARGET_NAME=\"ArduiTouchJTAG\"
+	-DILI9341_DRIVER=1
+	-DTFT_MISO=19
+	-DTFT_MOSI=23
+	-DTFT_SCLK=18
+	-DTFT_CS=5
+	-DTFT_DC=4
+	-DTFT_RST=22
+	-DTFT_RD=2
+	-DTFT_WR=4
+	-DTFT_TOUCH_FLIP=1
+	-DTFT_BACKLIGHT_PIN=16
+	-DTOUCH_CS=26
+	-DSPI_FREQUENCY=40000000
+	-DDEBUG_LODEPNG_MALLOC=0
 	-DDEBUG_AC_MAIN=0
 	-DDEBUG_AC_SETTINGS=0
 	-DDEBUG_BACKLIGHT_CONTROL=0
 	-DDEBUG_BEEPER_CONTROL=0
 	-DDEBUG_CONFIG=0
-	-DDEBUG_LODEPNG_MALLOC=0
 	-DDEBUG_WLAN_STATES=0
 	-DDEBUG_DISPLAY_TOUCH=0
 	-DDEBUG_OPENHAB_CONNECTOR=0
@@ -50,20 +78,18 @@ build_flags=-Os
 	-DDEBUG_OPENHAB_UI=0
 	-DDEBUG_UI_INFOLABEL=0
 	-DDEBUG_UI_SECURITY_PIN=0
-	-I ./src/
-
-[env]
-framework 			= arduino
-platform_packages 	= platformio/framework-arduinoespressif32
-build_flags   		= ${common.build_flags}
-lib_deps      		= ${common.lib_deps}
+upload_port = /dev/ttyUSB0
+upload_speed = 921600
+monitor_port = /dev/ttyUSB0
+monitor_speed = 115200
+debug_tool = esp-prog
 
 [env:ArduiTouch]
-platform 			= espressif32
-board 				= esp32dev
+platform = espressif32
+board = esp32dev
 board_build.partitions = min_spiffs.csv
-
-build_flags = ${common.build_flags}
+build_flags =
+	${common.build_flags}
 	-DTARGET_NAME=\"ArduiTouch\"
 	-DILI9341_DRIVER=1
 	-DTFT_MISO=19
@@ -75,18 +101,17 @@ build_flags = ${common.build_flags}
 	-DTFT_TOUCH_FLIP=1
 	-DTOUCH_CS=14
 	-DSPI_FREQUENCY=40000000
-
-upload_port 	= /dev/ttyUSB0
-upload_speed 	= 921600
-monitor_port 	= /dev/ttyUSB0
-monitor_speed 	= 115200
+upload_port = /dev/ttyUSB0
+upload_speed = 921600
+monitor_port = /dev/ttyUSB0
+monitor_speed = 115200
 
 [env:ArduiTouch28]
-platform 			= espressif32
-board 				= esp32dev
+platform = espressif32
+board = esp32dev
 board_build.partitions = min_spiffs.csv
-
-build_flags = ${common.build_flags}
+build_flags =
+	${common.build_flags}
 	-DTARGET_NAME=\"ArduiTouch28\"
 	-DILI9341_DRIVER=1
 	-DTFT_MISO=19
@@ -95,11 +120,12 @@ build_flags = ${common.build_flags}
 	-DTFT_CS=5
 	-DTFT_DC=4
 	-DTFT_RST=22
+	-DTFT_RD=2
+	-DTFT_WR=4
 	-DTFT_TOUCH_FLIP=0
 	-DTOUCH_CS=14
 	-DSPI_FREQUENCY=40000000
-
-upload_port 	= /dev/ttyUSB0
-upload_speed 	= 921600
-monitor_port 	= /dev/ttyUSB0
-monitor_speed 	= 115200
+upload_port = /dev/ttyUSB0
+upload_speed = 921600
+monitor_port = /dev/ttyUSB0
+monitor_speed = 115200
diff --git a/src/config.hpp b/src/config.hpp
index 6a8a3e1..e3e9c5a 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -72,7 +72,7 @@ class Config
     {
         config_filename = filename;
 
-        Serial.printf("loadConfig file: %s\n", filename.c_str());
+        Serial.printf("loadConfig file: %s\r\n", filename.c_str());
 
         File configFile = SPIFFS.open(filename, "r");
         if (!configFile)
@@ -121,22 +121,22 @@ class Config
         strlcpy(item.openhab.sensors.bme280.items.pressure, doc["openhab"]["sensors"]["bme280"]["items"]["pressure"] | "", sizeof(item.openhab.sensors.bme280.items.pressure));
 #if DEBUG_CONFIG
         Serial.println("Config::loadConfig: Loaded Values");
-        Serial.printf("  item.general.hostname: %s\n", item.general.hostname);
-        Serial.printf("  item.ntp.hostname: %s\n", item.ntp.hostname);
-        Serial.printf("  item.ntp.gmt_offset: %d\n", item.ntp.gmt_offset);
-        Serial.printf("  item.ntp.daylightsaving: %d\n", item.ntp.daylightsaving);
-        Serial.printf("  item.backlight.activity_timeout: %s\n", item.backlight.activity_timeout);
-        Serial.printf("  item.backlight.normal_brightness: %s\n", item.backlight.normal_brightness);
-        Serial.printf("  item.backlight.dim_brightness: %s\n", item.backlight.dim_brightness);
-        Serial.printf("  item.beeper.enabled: %d\n", item.beeper.enabled);
-        Serial.printf("  item.openhab.hostname: %s\n", item.openhab.hostname);
-        Serial.printf("  item.openhab.port: %d\n", item.openhab.port);
-        Serial.printf("  item.openhab.sitemap: %s\n", item.openhab.sitemap);
-        Serial.printf("  item.openhab.sensors.bme280.use: %d\n", item.openhab.sensors.bme280.use);
-        Serial.printf("  item.openhab.sensors.bme280.interval: %d\n", item.openhab.sensors.bme280.interval);
-        Serial.printf("  item.openhab.sensors.bme280.items.temperature: %s\n", item.openhab.sensors.bme280.items.temperature);
-        Serial.printf("  item.openhab.sensors.bme280.items.humidity: %s\n", item.openhab.sensors.bme280.items.humidity);
-        Serial.printf("  item.openhab.sensors.bme280.items.pressure: %s\n", item.openhab.sensors.bme280.items.pressure);
+        Serial.printf("  item.general.hostname: %s\r\n", item.general.hostname);
+        Serial.printf("  item.ntp.hostname: %s\r\n", item.ntp.hostname);
+        Serial.printf("  item.ntp.gmt_offset: %d\r\n", item.ntp.gmt_offset);
+        Serial.printf("  item.ntp.daylightsaving: %d\r\n", item.ntp.daylightsaving);
+        Serial.printf("  item.backlight.activity_timeout: %s\r\n", item.backlight.activity_timeout);
+        Serial.printf("  item.backlight.normal_brightness: %s\r\n", item.backlight.normal_brightness);
+        Serial.printf("  item.backlight.dim_brightness: %s\r\n", item.backlight.dim_brightness);
+        Serial.printf("  item.beeper.enabled: %d\r\n", item.beeper.enabled);
+        Serial.printf("  item.openhab.hostname: %s\r\n", item.openhab.hostname);
+        Serial.printf("  item.openhab.port: %d\r\n", item.openhab.port);
+        Serial.printf("  item.openhab.sitemap: %s\r\n", item.openhab.sitemap);
+        Serial.printf("  item.openhab.sensors.bme280.use: %d\r\n", item.openhab.sensors.bme280.use);
+        Serial.printf("  item.openhab.sensors.bme280.interval: %d\r\n", item.openhab.sensors.bme280.interval);
+        Serial.printf("  item.openhab.sensors.bme280.items.temperature: %s\r\n", item.openhab.sensors.bme280.items.temperature);
+        Serial.printf("  item.openhab.sensors.bme280.items.humidity: %s\r\n", item.openhab.sensors.bme280.items.humidity);
+        Serial.printf("  item.openhab.sensors.bme280.items.pressure: %s\r\n", item.openhab.sensors.bme280.items.pressure);
 #endif
         return true;
     }
@@ -146,7 +146,7 @@ class Config
         if (config_filename.isEmpty())
             return false;
 
-        Serial.printf("saveConfig file: %s\n", config_filename.c_str());
+        Serial.printf("saveConfig file: %s\r\n", config_filename.c_str());
 
         File configFile = SPIFFS.open(config_filename, "w");
         if (!configFile)
diff --git a/src/driver/beeper_control.cpp b/src/driver/beeper_control.cpp
index 0bff3e4..6a7e9e7 100644
--- a/src/driver/beeper_control.cpp
+++ b/src/driver/beeper_control.cpp
@@ -27,7 +27,7 @@ static void beeper_task(void *parameter);
 void beeper_playNote(uint16_t note, uint8_t volume, uint16_t duration, uint16_t pause)
 {
 #if DEBUG_BEEPER_CONTROL
-    Serial.printf("beeper_playNote: freq=%u Hz, duration=%u ms\n", note, duration);
+    Serial.printf("beeper_playNote: freq=%u Hz, duration=%u ms\r\n", note, duration);
 #endif
     if (xRequestQueue != 0)
     {
diff --git a/src/lodepng/lodepng_malloc.cpp b/src/lodepng/lodepng_malloc.cpp
index 1f80be4..1551315 100644
--- a/src/lodepng/lodepng_malloc.cpp
+++ b/src/lodepng/lodepng_malloc.cpp
@@ -34,6 +34,8 @@ void add_ptr(void* ptr, size_t size)
         {
             mem_chunks[i].ptr = ptr;
             mem_chunks[i].size = size;
+            printf("add_ptr(0x%08x, %u)\r\n", (uint32_t)ptr, size);
+            break;
         }
 }
 
@@ -43,6 +45,7 @@ void del_ptr(void* ptr)
     {
         if (mem_chunks[i].ptr == ptr)
         {
+            printf("del_ptr(0x%08x) size=%u\r\n", (uint32_t)ptr, mem_chunks[i].size);
             mem_chunks[i].ptr = NULL;
             mem_chunks[i].size = 0;
             break;
@@ -88,8 +91,15 @@ void* lodepng_malloc(size_t size)
     void* ptr = malloc(size);
 
 #if DEBUG_LODEPNG_MALLOC
-    add_ptr(ptr, size);
-    printf("lodepng_malloc: Size: %u Sum: %u Chunks: %u\n", size, get_memsize(), get_chunk_count());
+    if (ptr != NULL)
+    {
+        add_ptr(ptr, size);
+        printf("lodepng_malloc: Size: %u Sum: %u Chunks: %u Free: %u MaxBlk: %u\r\n", size, get_memsize(), get_chunk_count(), ESP.getFreeHeap(), heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT));
+    }
+    else
+    {
+        printf("lodepng_malloc failed: Size: %u Sum: %u Chunks: %u Free: %u MaxBlk: %u\r\n", size, get_memsize(), get_chunk_count(), ESP.getFreeHeap(), heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT));
+    }
 #endif
 
   return ptr;
@@ -98,14 +108,25 @@ void* lodepng_malloc(size_t size)
 void* lodepng_realloc(void* ptr, size_t new_size)
 {
  #if DEBUG_LODEPNG_MALLOC
-    printf("lodepng_realloc: Old: %u New: %u Sum: %u\n", get_size(ptr), new_size, get_memsize());
-    del_ptr(ptr);
+    printf("lodepng_realloc: Old: %u New: %u Sum: %u\r\n", get_size(ptr), new_size, get_memsize() - get_size(ptr) + new_size);
+
+    if (ptr != NULL)
+    {
+        del_ptr(ptr);
+    }
 #endif
 
     void* new_ptr = realloc(ptr, new_size);
 
 #if DEBUG_LODEPNG_MALLOC
-    add_ptr(new_ptr, new_size);
+    if (new_ptr != NULL)
+    {
+        add_ptr(new_ptr, new_size);
+    }
+    else
+    {
+        printf("lodepng_realloc failed\r\n");
+    }
 #endif
 
     return new_ptr;
@@ -114,7 +135,7 @@ void* lodepng_realloc(void* ptr, size_t new_size)
 void lodepng_free(void* ptr)
 {
 #if DEBUG_LODEPNG_MALLOC
-    printf("lodepng_free: Size: %u Sum: %u\n", get_size(ptr), get_memsize());
+    printf("lodepng_free: Size: %u Sum: %u Chunks: %u Free: %u\r\n", get_size(ptr), get_memsize() - get_size(ptr), get_chunk_count(), ESP.getFreeHeap());
     del_ptr(ptr);
 #endif
 
diff --git a/src/main.cpp b/src/main.cpp
index 0840bfd..0590416 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -149,14 +149,14 @@ bool my_touchpad_read(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
         data->point.y = last_y;
 #if DEBUG_DISPLAY_TOUCH
         if (data->state = touched)
-            Serial.printf("DISPLAY_TOUCH x: %u y %u\n", touchX, touchY);
+            Serial.printf("DISPLAY_TOUCH x: %u y %u\r\n", touchX, touchY);
 #endif
     }
 #if DEBUG_DISPLAY_TOUCH
     else
     {
         if (data->state = touched)
-            Serial.printf("DISPLAY_TOUCH outside of expected parameters x: %u y %u\n", touchX, touchY);
+            Serial.printf("DISPLAY_TOUCH outside of expected parameters x: %u y %u\r\n", touchX, touchY);
     }
 #endif
 
@@ -226,7 +226,7 @@ void setup()
     // Initialize the graphics library's tick
     tick.attach_ms(LVGL_TICK_PERIOD, lv_tick_handler);
 
-    infolabel.create(infolabel.INFO, "Connecting to WiFi AP...", 0);
+    infolabel.create(infolabel.INFO, "WLAN", "Connecting...", 0);
     lv_task_handler();
 
     ac_main_setup(&config);
@@ -267,7 +267,7 @@ void loop()
             openhab_ui_set_wifi_state(true);
             openhab_ui_connect(config.item.openhab.hostname, config.item.openhab.port, config.item.openhab.sitemap);
             IPAddress ip = WiFi.localIP();
-            infolabel.create(infolabel.INFO, "WLAN CONNECTED!\n IP: " + String(ip[0]) + "." + String(ip[1]) + "." + String(ip[2]) + "." + String(ip[3]), 10);
+            infolabel.create(infolabel.INFO, "WLAN", "CONNECTED!", 3);
         }
         else if (wlan_status == WL_IDLE_STATUS)
         {
@@ -275,7 +275,7 @@ void loop()
 #if DEBUG_WLAN_STATES
             Serial.println("WiFi: WL_IDLE_STATUS");
 #endif
-            infolabel.create(infolabel.WARNING, "WLAN IDLE", 0);
+            infolabel.create(infolabel.WARNING, "WLAN", "IDLE", 0);
             lv_task_handler();
             delay(1000);
 
@@ -288,7 +288,7 @@ void loop()
             Serial.println("WiFi: WLAN NOT CONNECTED");
 #endif
             openhab_ui_set_wifi_state(false);
-            infolabel.create(infolabel.WARNING, "WLAN NOT CONNECTED", 0);
+            infolabel.create(infolabel.WARNING, "WLAN", "NOT CONNECTED", 0);
             offline_timestamp = millis();
         }
     }
@@ -309,7 +309,7 @@ void loop()
 #if DEBUG_WLAN_STATES
         Serial.println("WiFi: Offline Timeout. Reconnecting...");
 #endif
-        infolabel.create(infolabel.INFO, " Reconnecting to WiFi AP...", 0);
+        infolabel.create(infolabel.INFO, "WLAN", "Reconnecting to AP...", 0);
         lv_task_handler();
 
         ac_main_reconnect();
diff --git a/src/openhab_connector.cpp b/src/openhab_connector.cpp
index 05377b1..0d9cebb 100644
--- a/src/openhab_connector.cpp
+++ b/src/openhab_connector.cpp
@@ -9,16 +9,17 @@
 #define DEBUG_OPENHAB_CONNECTOR_PACKETDUMP 0
 #endif
 
-int Item::update(String link)
+#define WIDGET_COUNT_MAX 6
+
+int Item::update(const char* link)
 {
     int retval = 0;
 
-    String url = link;
-    url += "/state";
+    char url[STR_LINK_LEN];
+    snprintf(url, sizeof(url), "%s/state", link);
 
 #if DEBUG_OPENHAB_CONNECTOR
-    Serial.print("Item::update: Requesting URL: ");
-    Serial.println(url);
+    printf("Item::update: Requesting URL: %s\r\n", url);
 #endif
 
     HTTPClient http;
@@ -28,33 +29,30 @@ int Item::update(String link)
 
     if (httpCode == HTTP_CODE_OK)
     {
-        String state = http.getString();
+        char remote_state[STR_STATE_TEXT_LEN];
+        strncpy(remote_state, http.getString().c_str(), sizeof(remote_state));
 
-        if (type == ItemType::type_number)
+        // State
+        if (   Item::type == ItemType::type_number
+            || Item::type == ItemType::type_setpoint
+            || Item::type == ItemType::type_slider)
         {
-            float new_state = state.toFloat();
-            if (state_number != new_state)
-            {
-                retval = 1;
-                state_number = new_state;
-            }
+            // convert number to get rid of unit
+            snprintf(remote_state, sizeof(remote_state), "%f", strtof(remote_state, NULL));
         }
-        else if (type == ItemType::type_text)
+
+        if (strcmp (Item::state_text, remote_state) != 0)
         {
-            if (state_text != state)
-            {
-                retval = 1;
-                state_text = state;
-            }
+            retval = 1;
+            strncpy(Item::state_text, remote_state, sizeof(Item::state_text));
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  update statetext to \"%s\"\r\n", Item::state_text);
+#endif
         }
     }
     else
     {
-        Serial.print("Item::update: URL: ");
-        Serial.println(url);
-        Serial.print("Error on HTTP request. httpCode: ");
-        Serial.println(httpCode);
-
+        printf("Item::update: ERROR httpCode: %i URL: %s\r\n", httpCode, url);
         retval = -1;
     }
 
@@ -63,45 +61,27 @@ int Item::update(String link)
     return retval;
 }
 
-int Item::publish(String link)
+int Item::publish(const char* url)
 {
     int retval = 0;
 
-    String url = link;
-
 #if DEBUG_OPENHAB_CONNECTOR
-    Serial.print("Item::publish: Requesting URL: ");
-    Serial.println(url);
+    printf("Item::publish: Requesting URL: %s\r\n", url);
 #endif
 
     HTTPClient http;
     http.begin(url);
     http.addHeader("Content-Type", "text/plain");
 
-    String message = {};
-
-    if (type == ItemType::type_number)
-    {
-        message = String(state_number);
-    }
-    else if (type == ItemType::type_text)
-    {
-        message = String(state_text);
-    }
-
 #if DEBUG_OPENHAB_CONNECTOR
-    printf("Item::publish: POST Message: %s\r\n", message.c_str());
+    printf("Item::publish: POST Message: %s\r\n", state_text);
 #endif
 
-    int httpCode = http.POST(message);
+    int httpCode = http.POST(state_text);
 
     if (httpCode != HTTP_CODE_OK)
     {
-        Serial.print("Item::publish: URL: ");
-        Serial.println(url);
-        Serial.print("Error on HTTP request. httpCode: ");
-        Serial.println(httpCode);
-
+        printf("Item::publish ERROR httpCode: %i URL: %s\r\n", httpCode, url);
         retval = -1;
     }
 
@@ -110,15 +90,15 @@ int Item::publish(String link)
     return retval;
 }
 
-size_t Item::getIcon(String website, String name, String state, unsigned char *buffer, size_t buffer_size)
+size_t Item::getIcon(const char* website, const char* name, const char* state, unsigned char *buffer, size_t buffer_size)
 {
     size_t icon_size = 0;
+    char url[STR_LINK_LEN];
 
-    String url = website + "/icon/" + name + "?state=" + state + "&format=png";
+    snprintf(url, sizeof(url), "%s/icon/%s?state=%s&format=png", website, name, state);
 
 #if DEBUG_OPENHAB_CONNECTOR
-    Serial.print("Item::getIcon: Requesting URL: ");
-    Serial.println(url);
+    printf("Item::getIcon: Requesting URL: %s\r\n", url);
 #endif
 
     HTTPClient http;
@@ -139,7 +119,7 @@ size_t Item::getIcon(String website, String name, String state, unsigned char *b
         size_t dst_avail = buffer_size;
 
 #if DEBUG_OPENHAB_CONNECTOR
-        Serial.printf("Item::getIcon: Stream size %u\r\n", stream->available());
+        printf("Item::getIcon: Stream size %u\r\n", stream->available());
 #endif
         stream->setTimeout(2);
 
@@ -189,10 +169,7 @@ size_t Item::getIcon(String website, String name, String state, unsigned char *b
     }
     else // httpCode != HTTP_CODE_OK
     {
-        Serial.print("Item::getIcon: URL: ");
-        Serial.println(url);
-        Serial.print("Error on HTTP request. httpCode: ");
-        Serial.println(httpCode);
+        printf("Item::getIcon: ERROR httpCode: %i URL: %s\r\n", httpCode, url);
     }
 
     http.end(); //Free the resources
@@ -205,13 +182,13 @@ size_t Item::getIcon(String website, String name, String state, unsigned char *b
     return icon_size;
 }
 
-int Sitemap::openlink(String url)
+int Sitemap::openlink(const char* url)
 {
     int retval = 0;
+    DynamicJsonDocument doc(12000);
 
 #if DEBUG_OPENHAB_CONNECTOR
-    Serial.print("Sitemap::openlink: Requesting URL: ");
-    Serial.println(url);
+    printf("Item::openlink: Requesting URL: %s\r\n", url);
 #endif
 
     HTTPClient http;
@@ -235,34 +212,226 @@ int Sitemap::openlink(String url)
         DeserializationError error = deserializeJson(doc, payload, DeserializationOption::NestingLimit(15));
         if (error)
         {
-            Serial.print(F("Sitemap::openlink: deserializeJson() failed: "));
-            Serial.println(error.c_str());
+            printf("Sitemap::openlink: deserializeJson() failed: %s", error.c_str());
+            doc.clear();
             return false;
         }
 
         if (doc.containsKey("error"))
         {
-            Serial.print("Sitemap::openlink: json error message: ");
-            Serial.println(doc["error"]["message"].as<String>());
+            printf("Sitemap::openlink: json error message: %s", doc["error"]["message"].as<char*>());
+            doc.clear();
             return false;
         }
 
 #if DEBUG_OPENHAB_CONNECTOR
         Serial.print("Doc memory usage: ");
         Serial.println(doc.memoryUsage());
-        Serial.println(doc["title"].as<char *>());
 #endif
+
+        strncpy(title, doc["title"].as<char*>(), sizeof(title));
+
+#if DEBUG_OPENHAB_CONNECTOR
+        printf("Sitemap::openlink(\"%s\")\r\n", url);
+        printf("  title=\"%s\"", title);
+#endif
+
+        // Cleanup Items
+        for (size_t i = 0; i < WIDGET_COUNT_MAX; ++i)
+        {
+            item_array[i].cleanItem();
+        }
+
+        // Update Items
+        size_t array_index = 0;
+
+        // if current location is a child of the sitemap then set first item
+        if (doc["parent"]["link"])
+        {
+            item_array[array_index].setType(ItemType::type_parent_link);
+            item_array[array_index].setLink(doc["parent"]["link"]);
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  type=parent_link   link=\"%s\"", item_array[array_index].getLink());
+#endif
+
+            ++array_index;
+        }
+
+        JsonArray widget_array = doc["widgets"].as<JsonArray>();
+
+        for (size_t widget_index = 0; widget_index < widget_array.size(); widget_index++)
+        {
+            JsonVariant widget = widget_array.getElement(widget_index);
+            Item* item = &item_array[array_index];
+
+            // Label
+            if (widget["linkedPage"])
+                item->setLabel(widget["linkedPage"]["title"]);
+            else if (widget["item"])
+                item->setLabel(widget["item"]["label"]);
+            else
+                item->setLabel("NO LABEL");
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  label=\"%s\"", item->getLabel());
+#endif
+
+            // Icon
+            if (widget["icon"])
+            {
+                item->setIconName(widget["icon"]);
+#if DEBUG_OPENHAB_CONNECTOR
+                printf("  icon=\"%s\"", item->getIconName());
+#endif
+            }
+
+            // Type
+            if (widget["linkedPage"]["link"])
+                item->setType(ItemType::type_link);
+            else if (widget["type"] == "Text")
+            {
+                if (widget["item"]["type"] && widget["item"]["type"].as<String>() >= "Number")
+                    item->setType(ItemType::type_number);
+                else
+                    item->setType(ItemType::type_string);
+            }
+            else if (widget["type"] == "Switch")
+            {
+                if (widget["item"]["type"].as<String>() == "Switch")
+                    item->setType(ItemType::type_switch);
+                else if (widget["item"]["type"].as<String>() == "Rollershutter")
+                    item->setType(ItemType::type_rollershutter);
+                else if (widget["item"]["type"].as<String>() == "Player")
+                    item->setType(ItemType::type_player);
+            }
+            else if (widget["type"] == "Setpoint")
+                item->setType(ItemType::type_setpoint);
+            else if (widget["type"] == "Slider")
+                item->setType(ItemType::type_slider);
+            else if (widget["type"] == "Selection")
+                item->setType(ItemType::type_selection);
+            else if (widget["type"] == "Colorpicker")
+                item->setType(ItemType::type_colorpicker);
+
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  type=%u", item->getType());
+#endif
+
+            // MinVal
+            if (widget["minValue"])
+                item->setMinVal(widget["minValue"].as<float>());
+            else if (widget["item"]["stateDescription"]["minimum"])
+                item->setMinVal(widget["item"]["stateDescription"]["minimum"].as<float>());
+            else
+                item->setMinVal(0.0f);
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  minVal=%.2f", item->getMinVal());
+#endif
+
+            // MaxVal
+            if (widget["maxValue"])
+                item->setMaxVal(widget["maxValue"].as<float>());
+            else if (widget["item"]["stateDescription"]["maximum"])
+                item->setMaxVal(widget["item"]["stateDescription"]["maximum"].as<float>());
+            else
+                item->setMaxVal(100.0f);
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  maxVal=%.2f", item->getMaxVal());
+#endif
+
+            // Step
+            if (widget["step"])
+                item->setStep(widget["step"].as<float>());
+            else if (widget["item"]["stateDescription"]["step"])
+                item->setStep(widget["item"]["stateDescription"]["step"].as<float>());
+            else
+                item->setStep(1.0f);
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  step=%.2f", item->getStep());
+#endif
+
+            // Number format string
+            if (widget["item"]["stateDescription"]["pattern"])
+                item->setNumberPattern(widget["item"]["stateDescription"]["pattern"]);
+            else
+                item->setNumberPattern("%d");
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  numpat=\"%s\"", item->getNumberPattern());
+#endif
+
+            // State
+            if (widget["item"]["state"])
+            {
+                if (   item->getType() == ItemType::type_number
+                    || item->getType() == ItemType::type_setpoint
+                    || item->getType() == ItemType::type_slider)
+                {
+                    // convert number to get rid of unit
+                    item->setStateNumber(widget["item"]["state"].as<String>().toFloat());
+#if DEBUG_OPENHAB_CONNECTOR
+                    printf("  num-statetext=\"%s\"", item->getStateText());
+#endif
+                }
+                else
+                {
+                    item->setStateText(widget["item"]["state"]);
+#if DEBUG_OPENHAB_CONNECTOR
+                    printf("  statetext=\"%s\"", item->getStateText());
+#endif
+                }
+            }
+
+            // Link
+            if (item->getType() == ItemType::type_link)
+                item->setLink(widget["linkedPage"]["link"]);
+            else
+                item->setLink(widget["item"]["link"]);
+
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("  link=\"%s\"", item->getLink());
+#endif
+
+            // Mappings
+            if (widget["mappings"])
+            {
+                JsonArray map_array = widget["mappings"].as<JsonArray>();
+                for (size_t i = 0; i < map_array.size(); ++i)
+                {
+                    JsonVariant map_elem = map_array.getElement(i);
+                    item->setSelectionLabel(i, map_elem["label"]);
+                    item->setSelectionCommand(i, map_elem["command"]);
+                }
+                item->setSelectionCount(map_array.size());
+            }
+            else if (widget["item"]["commandDescription"]["commandOptions"])
+            {
+                JsonArray map_array = widget["item"]["commandDescription"]["commandOptions"].as<JsonArray>();
+                for (size_t i = 0; i < map_array.size(); ++i)
+                {
+                    JsonVariant map_elem = map_array.getElement(i);
+                    item->setSelectionLabel(i, map_elem["label"]);
+                    item->setSelectionCommand(i, map_elem["command"]);
+                }
+                item->setSelectionCount(map_array.size());
+            }
+
+#if DEBUG_OPENHAB_CONNECTOR
+            printf("\r\n");
+#endif
+
+            ++array_index;
+
+            if (array_index > WIDGET_COUNT_MAX)
+                break;
+        }
     }
     else // httpCode != HTTP_CODE_OK
     {
-        Serial.print("Sitemap::openlink: URL: ");
-        Serial.println(url);
-        Serial.print("Error on HTTP request. httpCode: ");
-        Serial.println(httpCode);
-
+        printf("Item::getIcon: ERROR httpCode: %i URL: %s\r\n", httpCode, url);
         retval = -1;
     }
 
+    doc.clear();
+
     http.end();
 
     return retval;
diff --git a/src/openhab_connector.hpp b/src/openhab_connector.hpp
index 3b33215..ef83b81 100644
--- a/src/openhab_connector.hpp
+++ b/src/openhab_connector.hpp
@@ -8,62 +8,90 @@
 #define ITEM_SELECTION_COMMAND_LEN_MAX 20
 #define ITEM_SELECTION_LABEL_LEN_MAX 20
 
-enum WidgetType
-{
-    item_text,
-    item_switch,
-    item_setpoint,
-    item_slider,
-    item_selection,
-    item_colorpicker,
-    linked_page,
-    parent_page,
-    unknown
-};
+#define STR_LABEL_LEN 32
+#define STR_ICON_NAME_LEN 32
+#define STR_STATE_TEXT_LEN 32
+#define STR_PATTERN_LEN 16
+#define STR_LINK_LEN 128
+#define STR_TITLE_LEN 32
+
 
 enum ItemType
 {
+    type_parent_link,
+    type_link,
     type_number,
-    type_text,
+    type_string,
+    type_setpoint,
+    type_slider,
     type_selection,
+    type_colorpicker,
+    type_switch,
+    type_rollershutter,
+    type_player,
     type_unknown
 };
 
 class Item
 {
 private:
+    char label[STR_LABEL_LEN];
+    char icon_name[STR_ICON_NAME_LEN];
     enum ItemType type = type_unknown;
-    String state_text = {};
-    float state_number = 0.0f;
-    int state_decimal = 0;
-    String pattern = {};
+    char state_text[STR_STATE_TEXT_LEN];
+    char pattern[STR_PATTERN_LEN];
     float min_val = 0.0f;
     float max_val = 0.0f;
     float step_val = 1.0f;
     char selection_command[ITEM_SELECTION_COUNT_MAX][ITEM_SELECTION_COMMAND_LEN_MAX] = {};
     char selection_label[ITEM_SELECTION_COUNT_MAX][ITEM_SELECTION_LABEL_LEN_MAX] = {};
     size_t mapping_count = 0;
+    char link[STR_LINK_LEN];
 
 public:
-    int update(String link);
-    int publish(String link);
+    int update(const char* link);
+    int publish(const char* link);
+
+    void cleanItem()
+    {
+        label[0] = 0;
+        icon_name[0] = 0;
+        type = type_unknown;
+        state_text[0] = 0;
+        link[0] = 0;
+    }
 
-    size_t getIcon(String website, String name, String state, unsigned char *buffer, size_t buffer_size);
+    size_t getIcon(const char* website, const char* name, const char* state, unsigned char *buffer, size_t buffer_size);
+
+    void setLabel(const char* newlabel) { strncpy(label, newlabel, sizeof(label)); }
+    const char* getLabel() { return label; }
+
+    void setIconName(const char* newiconname) { strncpy(icon_name, newiconname, sizeof(icon_name)); }
+    const char* getIconName() { return icon_name; }
+
+    void setLink(const char * newlink) { strncpy(link, newlink, sizeof(link)); }
+    const char * getLink() { return link; }
 
     enum ItemType getType() { return type; }
     void setType(enum ItemType newtype) { type = newtype; }
-    String getStateText() { return state_text; }
-    void setStateText(String newtext) { state_text = newtext; }
-    float getStateNumber() { return state_number; }
-    void setStateNumber(float newnumber) { state_number = newnumber; }
-    String getNumberPattern() { return pattern; }
-    void setNumberPattern(String newpattern) { pattern = newpattern; }
+
+    const char* getStateText() { return state_text; }
+    void setStateText(const char* newtext) { strncpy(state_text, newtext, sizeof(state_text)); }
+    float getStateNumber() { return strtof(state_text, NULL); }
+    void setStateNumber(float newnumber) { snprintf(state_text, sizeof(state_text), "%f", newnumber); }
+
+    const char* getNumberPattern() { return pattern; }
+    void setNumberPattern(const char* newpattern) { strncpy(pattern, newpattern, sizeof(pattern)); }
+
     float getMinVal() { return min_val; }
     void setMinVal(float newval) { min_val = newval; }
+
     float getMaxVal() { return max_val; }
     void setMaxVal(float newval) { max_val = newval; }
+
     float getStep() { return step_val; }
     void setStep(float newval) { step_val = newval; }
+
     char *getSelectionCommand(size_t index) { return selection_command[index]; }
     void setSelectionCommand(size_t index, const char *command)
     {
@@ -81,220 +109,14 @@ class Item
 class Sitemap
 {
 private:
-    StaticJsonDocument<12000> doc;
-
-    JsonVariant getWidget(size_t index)
-    {
-        JsonArray array = doc["widgets"].as<JsonArray>();
-        return array.getElement(index);
-    }
+    char title[STR_TITLE_LEN];
+    Item item_array[6];
 
 public:
-    int openlink(String url);
-
-    String getPageName()
-    {
-        return (doc["title"]);
-    }
-
-    bool hasParent()
-    {
-        if (doc["parent"]["link"])
-            return true;
+    int openlink(const char* url);
 
-        return false;
-    }
-
-    String getParentLink()
-    {
-        return (doc["parent"]["link"]);
-    }
-
-    bool hasChild(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        if (v["linkedPage"]["link"])
-            return true;
-
-        return false;
-    }
-
-    String getChildLink(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        return v["linkedPage"]["link"];
-    }
-
-    size_t getWidgetcount()
-    {
-        JsonArray array = doc["widgets"].as<JsonArray>();
-        return array.size();
-    }
-
-    String getWidgetIconName(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        return v["icon"];
-    }
-
-    String getWidgetLabel(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-
-        if (v["linkedPage"])
-            return v["linkedPage"]["title"];
-        else if (v["item"])
-            return v["item"]["label"];
-
-        return "NO_LABEL";
-    }
-
-    WidgetType getWidgetType(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        if (v["type"] == "Text")
-            return WidgetType::item_text;
-        else if (v["type"] == "Switch")
-            return WidgetType::item_switch;
-        else if (v["type"] == "Setpoint")
-            return WidgetType::item_setpoint;
-        else if (v["type"] == "Slider")
-            return WidgetType::item_slider;
-        else if (v["type"] == "Selection")
-            return WidgetType::item_selection;
-        else if (v["type"] == "Colorpicker")
-            return WidgetType::item_colorpicker;
-
-        return WidgetType::unknown;
-    }
-
-    ItemType getWidgetItemType(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        if (v["item"]["type"].as<String>() >= "Number")
-            return ItemType::type_number;
-
-        return ItemType::type_text;
-    }
-
-    float getWidgetItemMinVal(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-
-        float retval = 0.0f;
-
-        if (v["minValue"])
-            retval = v["minValue"].as<float>();
-        else if (v["item"]["stateDescription"]["minimum"])
-            retval = v["item"]["stateDescription"]["minimum"].as<float>();
-
-        return retval;
-    }
-
-    float getWidgetItemMaxVal(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-
-        float retval = 100.0f;
-
-        if (v["maxValue"])
-            retval = v["maxValue"].as<float>();
-        else if (v["item"]["stateDescription"]["maximum"])
-            retval = v["item"]["stateDescription"]["maximum"].as<float>();
-
-        return retval;
-    }
-
-    float getWidgetItemStep(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-
-        float retval = 1.0f;
-
-        if (v["step"])
-            retval = v["step"].as<float>();
-        else if (v["item"]["stateDescription"]["step"])
-            retval = v["item"]["stateDescription"]["step"].as<float>();
-
-        return retval;
-    }
-
-    String getWidgetItemState(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        return v["item"]["state"];
-    }
-
-    String getWidgetItemPattern(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        if (v["item"]["stateDescription"]["pattern"])
-            return v["item"]["stateDescription"]["pattern"];
-        else
-            return "%d";
-    }
-
-    String getWidgetItemLink(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        return v["item"]["link"];
-    }
-
-    size_t getSelectionCount(size_t index)
-    {
-        JsonVariant v = getWidget(index);
-        if (v["mappings"] && v["mappings"].as<JsonArray>().size() > 0)
-        {
-            JsonArray array = v["mappings"].as<JsonArray>();
-            return array.size();
-        }
-        else if (v["item"]["commandDescription"]["commandOptions"])
-        {
-            JsonArray array = v["item"]["commandDescription"]["commandOptions"].as<JsonArray>();
-            return array.size();
-        }
-        return 0;
-    }
-
-    String getSelectionCommand(size_t wid_index, size_t sel_index)
-    {
-        JsonVariant v = getWidget(wid_index);
-        JsonArray array;
-        if (v["mappings"] && v["mappings"].as<JsonArray>().size() > 0)
-        {
-            array = v["mappings"].as<JsonArray>();
-        }
-        else if (v["item"]["commandDescription"]["commandOptions"])
-        {
-            array = v["item"]["commandDescription"]["commandOptions"].as<JsonArray>();
-        }
-        else
-        {
-            return "";
-        }
-        JsonVariant w = array.getElement(sel_index);
-        return w["command"];
-    }
-
-    String getSelectionLabel(size_t wid_index, size_t sel_index)
-    {
-        JsonVariant v = getWidget(wid_index);
-        JsonArray array;
-        if (v["mappings"] && v["mappings"].as<JsonArray>().size() > 0)
-        {
-            array = v["mappings"].as<JsonArray>();
-        }
-        else if (v["item"]["commandDescription"]["commandOptions"])
-        {
-            array = v["item"]["commandDescription"]["commandOptions"].as<JsonArray>();
-        }
-        else
-        {
-            return "";
-        }
-        JsonVariant w = array.getElement(sel_index);
-        return w["label"];
-    }
+    const char* getPageName() { return title; }
+    Item* getItem(size_t index) { return &item_array[index]; }
 };
 
 #endif
diff --git a/src/openhab_sensor_bme280.hpp b/src/openhab_sensor_bme280.hpp
index 680c8fc..82c8bf2 100644
--- a/src/openhab_sensor_bme280.hpp
+++ b/src/openhab_sensor_bme280.hpp
@@ -45,33 +45,34 @@ void openhab_sensor_bme280_setup()
 
 void openhab_sensor_bme280_update(Config &cfg)
 {
+        char buffer[10];
         bme280.takeForcedMeasurement();
 
         if (strlen(cfg.item.openhab.sensors.bme280.items.temperature) > 0)
         {
-                float temperature = bme280.readTemperature();
+                snprintf(buffer, sizeof(buffer), "%.3f", bme280.readTemperature());
 #if DEBUG_OPENHAB_SENSOR_BME280
-                Serial.printf("openhab_sensor_bme280_update: Temperature: %f\n", temperature);
+                Serial.printf("openhab_sensor_bme280_update: Temperature: %s\r\n", buffer);
 #endif
-                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.temperature, String(temperature));
+                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.temperature, buffer);
         }
 
         if (strlen(cfg.item.openhab.sensors.bme280.items.humidity) > 0)
         {
-                float humidity = bme280.readHumidity();
+                snprintf(buffer, sizeof(buffer), "%.3f", bme280.readHumidity());
 #if DEBUG_OPENHAB_SENSOR_BME280
-                Serial.printf("openhab_sensor_bme280_update: Humidity: %f\n", humidity);
+                Serial.printf("openhab_sensor_bme280_update: Humidity: %s\r\n", buffer);
 #endif
-                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.humidity, String(humidity));
+                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.humidity, buffer);
         }
 
         if (strlen(cfg.item.openhab.sensors.bme280.items.pressure) > 0)
         {
-                float pressure = bme280.readPressure() / 100.0f;
+                snprintf(buffer, sizeof(buffer), "%.3f", bme280.readPressure() / 100.0f);
 #if DEBUG_OPENHAB_SENSOR_BME280
-                Serial.printf("openhab_sensor_bme280_update: Pressure: %f\n", pressure);
+                Serial.printf("openhab_sensor_bme280_update: Pressure: %s\r\n", buffer);
 #endif
-                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.pressure, String(pressure));
+                openhab_sensor_connector_publish(cfg, cfg.item.openhab.sensors.bme280.items.pressure, buffer);
         }
 }
 
diff --git a/src/openhab_sensor_connector.hpp b/src/openhab_sensor_connector.hpp
index c1148d0..3c4a62a 100644
--- a/src/openhab_sensor_connector.hpp
+++ b/src/openhab_sensor_connector.hpp
@@ -8,18 +8,24 @@
 #define DEBUG_OPENHAB_SENSOR_CONNECTOR 0
 #endif
 
-void openhab_sensor_connector_publish(Config &cfg, String item, String value)
+#define STR_URL_LEN     128
+
+void openhab_sensor_connector_publish(Config &cfg, const char* item, const char* value)
 {
-    String url = "http://" + String(cfg.item.openhab.hostname) + ":" + String(cfg.item.openhab.port);
-    url += "/rest/items/" + item;
+    char url[STR_URL_LEN];
+
+    snprintf(url, sizeof(url), "http://%s:%u/rest/items/%s",
+            cfg.item.openhab.hostname,
+            cfg.item.openhab.port,
+            item);
 
 #if DEBUG_OPENHAB_SENSOR_CONNECTOR
-    Serial.print("openhab_sensor_connector_publish: Requesting URL: ");
-    Serial.println(url);
+    printf("openhab_sensor_connector_publish: Requesting URL: %s\r\n", url);
 #endif
 
     HTTPClient http;
     http.begin(url);
+    http.addHeader("Content-Type", "text/plain");
 
 #if DEBUG_OPENHAB_SENSOR_CONNECTOR
     printf("openhab_sensor_connector_publish: POST Message: %s\r\n", value.c_str());
@@ -29,10 +35,7 @@ void openhab_sensor_connector_publish(Config &cfg, String item, String value)
 
     if (httpCode != HTTP_CODE_OK)
     {
-        Serial.print("openhab_sensor_connector_publish: URL: ");
-        Serial.println(url);
-        Serial.print("Error on HTTP request. httpCode: ");
-        Serial.println(httpCode);
+        printf("openhab_sensor_connector_publish ERROR httpCode: %i URL: %s\r\n", httpCode, url);
     }
 
     http.end();
diff --git a/src/openhab_ui.cpp b/src/openhab_ui.cpp
index 4319463..f12cb31 100644
--- a/src/openhab_ui.cpp
+++ b/src/openhab_ui.cpp
@@ -36,6 +36,8 @@
 #define CONNECTION_ERROR_TIMEOUT_S 180
 #endif
 
+#define HEADER_SIGNAL_UPDATE_INTERVAL 5000
+
 #define ICON_PNG_BUFFER_SIZE 5000
 
 #ifndef BEEPER_VOLUME
@@ -71,10 +73,15 @@
     }
 #define BEEPER_EVENT_ERROR()                 \
     {                                        \
-        beeper_playNote(NOTE_C3, BEEPER_VOLUME, 400, 0); \
-        beeper_playNote(NOTE_C2, BEEPER_VOLUME, 800, 0); \
+        beeper_playNote(NOTE_E3, BEEPER_VOLUME, 50, 0); \
+        beeper_playNote(NOTE_C3, BEEPER_VOLUME, 100, 0); \
     }
 
+#define STR_CURRENT_PAGE_LEN        128
+#define STR_CURRENT_WEBSITE_LEN     128
+
+extern void lodepng_free(void* ptr);
+
 HTTPClient http;
 Infolabel openhab_ui_infolabel;
 
@@ -95,6 +102,7 @@ struct header_s
         lv_obj_t *clock = nullptr;
         lv_obj_t *title = nullptr;
         lv_obj_t *wifi = nullptr;
+        lv_obj_t *signal = nullptr;
     } item;
 };
 
@@ -104,11 +112,8 @@ static lv_obj_t *content = nullptr;
 
 struct widget_context_s
 {
-    bool active = false;
     unsigned long update_timestamp = 0;
     bool refresh_request = false;
-    String label;
-    String iconname;
     lv_obj_t *container = NULL;
     lv_style_t container_style;
     lv_obj_t *img_obj = NULL;
@@ -116,9 +121,7 @@ struct widget_context_s
     lv_obj_t *state_widget = NULL;
     lv_style_t state_widget_style;
     lv_obj_t *state_window_widget = NULL;
-    enum WidgetType widget_type = unknown;
-    String link = {};
-    Item item;
+    Item *item = NULL;
 };
 
 struct statistics_s
@@ -135,12 +138,21 @@ struct widget_context_s widget_context[WIDGET_COUNT_MAX];
 
 struct statistics_s statistics;
 
-void set_item_state(const char *link, struct item_context_s *item_ctx);
 void update_state_widget(struct widget_context_s *ctx);
 
-bool refresh_page;
-String current_page;
-String current_website;
+static bool refresh_page;
+static char current_page[STR_CURRENT_PAGE_LEN];
+static char current_website[STR_CURRENT_WEBSITE_LEN];
+
+uint8_t get_signal_quality(int8_t rssi)
+{
+    if (rssi < -100)
+        return 0;
+    else if (rssi > -50)
+        return 100;
+    else
+        return 2 * (rssi + 100);
+}
 
 void window_close_event_handler(lv_obj_t *btn, lv_event_t event)
 {
@@ -185,7 +197,7 @@ void header_event_handler(lv_obj_t *obj, lv_event_t event)
         lv_table_set_style(table, LV_TABLE_STYLE_CELL1, &style_cell1);
         lv_table_set_style(table, LV_TABLE_STYLE_BG, &lv_style_transp_tight);
         lv_table_set_col_cnt(table, 2);
-        lv_table_set_row_cnt(table, 8);
+        lv_table_set_row_cnt(table, 11);
         lv_coord_t table_width = lv_disp_get_hor_res(NULL) - 10;
         lv_table_set_col_width(table, 0, table_width * 30 / 100);
         lv_table_set_col_width(table, 1, table_width * 70 / 100);
@@ -210,25 +222,29 @@ void header_event_handler(lv_obj_t *obj, lv_event_t event)
         lv_table_set_cell_value(table, ++row, 0, "SSID");
         lv_table_set_cell_value(table, row, 1, WiFi.SSID().c_str());
 
+        lv_table_set_cell_value(table, ++row, 0, "BSSID");
+        lv_table_set_cell_value(table, row, 1, WiFi.BSSIDstr().c_str());
+
         lv_table_set_cell_value(table, ++row, 0, "RSSI");
-        uint8_t signal_quality = 100;
-        int8_t signal_rssi = WiFi.RSSI();
 
-        if (signal_rssi < -100)
-            signal_quality = 0;
-        else if (signal_rssi > -50)
-            signal_quality = 100;
-        else
-            signal_quality = 2 * (signal_rssi + 100);
+        int8_t signal_rssi = WiFi.RSSI();
 
-        sprintf(temp_buffer, "%i dBm (%u %%)", signal_rssi, signal_quality);
+        sprintf(temp_buffer, "%i dBm (%u %%)", signal_rssi, get_signal_quality(signal_rssi));
         lv_table_set_cell_value(table, row, 1, temp_buffer);
 
-        lv_table_set_cell_value(table, ++row, 0, "IP");
+        lv_table_set_cell_value(table, ++row, 0, "MAC");
+        lv_table_set_cell_value(table, row, 1, WiFi.macAddress().c_str());
+
+        lv_table_set_cell_value(table, ++row, 0, "IP Addr.");
         IPAddress ip = WiFi.localIP();
         sprintf(temp_buffer, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
         lv_table_set_cell_value(table, row, 1, temp_buffer);
 
+        lv_table_set_cell_value(table, ++row, 0, "Mask");
+        IPAddress mask = WiFi.subnetMask();
+        sprintf(temp_buffer, "%u.%u.%u.%u", mask[0], mask[1], mask[2], mask[3]);
+        lv_table_set_cell_value(table, row, 1, temp_buffer);
+
         lv_table_set_cell_value(table, ++row, 0, "Gateway");
         IPAddress gwip = WiFi.gatewayIP();
         sprintf(temp_buffer, "%u.%u.%u.%u", gwip[0], gwip[1], gwip[2], gwip[3]);
@@ -266,17 +282,18 @@ static void window_item_colorpicker_event_handler(lv_obj_t *obj, lv_event_t even
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
-            String hsv = {};
-            hsv += String(lv_cpicker_get_hue(ctx->state_window_widget)) + ",";
-            hsv += String(lv_cpicker_get_saturation(ctx->state_window_widget)) + ",";
-            hsv += String(lv_cpicker_get_value(ctx->state_window_widget));
+            char hsv[STR_STATE_TEXT_LEN];
+            snprintf(hsv, sizeof(hsv), "%u,%u,%u",
+                    lv_cpicker_get_hue(ctx->state_window_widget),
+                    lv_cpicker_get_saturation(ctx->state_window_widget),
+                    lv_cpicker_get_value(ctx->state_window_widget));
 #if DEBUG_OPENHAB_UI
-            Serial.printf("hsv string: %s\n", hsv.c_str());
+            Serial.printf("hsv string: %s\r\n", hsv);
 #endif
-            ctx->item.setStateText(hsv);
-            ctx->item.publish(ctx->link);
+            ctx->item->setStateText(hsv);
+            ctx->item->publish(ctx->item->getLink());
             ctx->refresh_request = true;
             BEEPER_EVENT_CHANGE();
         }
@@ -292,7 +309,7 @@ static void window_item_colorpicker_saturation_event_handler(lv_obj_t *obj, lv_e
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
 #if DEBUG_OPENHAB_UI
             Serial.printf("saturation: %u\n", lv_slider_get_value(obj));
@@ -313,7 +330,7 @@ static void window_item_colorpicker_value_event_handler(lv_obj_t *obj, lv_event_
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
 #if DEBUG_OPENHAB_UI
             Serial.printf("value: %u\n", lv_slider_get_value(obj));
@@ -331,7 +348,7 @@ void window_item_colorpicker(struct widget_context_s *ctx)
     lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
     lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
     lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
-    lv_win_set_title(win, ctx->label.c_str());
+    lv_win_set_title(win, ctx->item->getLabel());
 
     // Add close button to the header
     lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE); // Add close button and use built-in close action
@@ -378,7 +395,7 @@ void window_item_colorpicker(struct widget_context_s *ctx)
     lv_obj_set_user_data(colorPicker, (lv_obj_user_data_t)ctx);
     lv_obj_set_event_cb(colorPicker, window_item_colorpicker_event_handler);
 
-    lv_color_hsv_t color_hsv = hsvCStringToLVColor(ctx->item.getStateText().c_str());
+    lv_color_hsv_t color_hsv = hsvCStringToLVColor(ctx->item->getStateText());
     lv_cpicker_set_hsv(colorPicker, color_hsv);
 
     // Create container for saturation controls right of the colorwheel
@@ -443,7 +460,7 @@ static void window_item_selection_event_handler(lv_obj_t *obj, lv_event_t event)
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
             // deactivate all buttons
             lv_obj_t *btn = NULL;
@@ -465,8 +482,8 @@ static void window_item_selection_event_handler(lv_obj_t *obj, lv_event_t event)
 #if DEBUG_OPENHAB_UI
             Serial.printf("button pressed Label: %s, Command: %s\n", lv_label_get_text(label), command);
 #endif
-            ctx->item.setStateText(command);
-            ctx->item.publish(ctx->link);
+            ctx->item->setStateText(command);
+            ctx->item->publish(ctx->item->getLink());
             ctx->refresh_request = true;
             BEEPER_EVENT_CHANGE();
         }
@@ -482,7 +499,7 @@ void window_item_selection(struct widget_context_s *ctx)
     lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
     lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
     lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
-    lv_win_set_title(win, ctx->label.c_str());
+    lv_win_set_title(win, ctx->item->getLabel());
 
     // Add close button to the header
     lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE);
@@ -498,7 +515,7 @@ void window_item_selection(struct widget_context_s *ctx)
     lv_cont_set_fit(cont, LV_FIT_FLOOD);
     lv_cont_set_layout(cont, LV_LAYOUT_PRETTY);
 
-    for (size_t index = 0; index < ctx->item.getSelectionCount(); index++)
+    for (size_t index = 0; index < ctx->item->getSelectionCount(); index++)
     {
         lv_obj_t *btn = lv_btn_create(cont, NULL);
         lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
@@ -506,13 +523,13 @@ void window_item_selection(struct widget_context_s *ctx)
         lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
 
         lv_obj_t *label = lv_label_create(btn, NULL);
-        lv_label_set_text(label, ctx->item.getSelectionLabel(index));
-        lv_obj_set_user_data(label, (lv_obj_user_data_t)ctx->item.getSelectionCommand(index));
+        lv_label_set_text(label, ctx->item->getSelectionLabel(index));
+        lv_obj_set_user_data(label, (lv_obj_user_data_t)ctx->item->getSelectionCommand(index));
 
 #if DEBUG_OPENHAB_UI
-        printf("Label: \"%s\", State: \"%s\"\n", ctx->item.getSelectionLabel(index), ctx->item.getStateText().c_str());
+        printf("Label: \"%s\", State: \"%s\"\n", ctx->item->getSelectionLabel(index), ctx->item->getStateText());
 #endif
-        if (strcmp(ctx->item.getSelectionCommand(index), ctx->item.getStateText().c_str()) == 0)
+        if (strcmp(ctx->item->getSelectionCommand(index), ctx->item->getStateText()) == 0)
         {
 #if DEBUG_OPENHAB_UI
         printf("Button pressed!\n");
@@ -528,6 +545,222 @@ void window_item_selection(struct widget_context_s *ctx)
     ctx->state_window_widget = cont;
 }
 
+static void window_item_rollershutter_event_handler(lv_obj_t *obj, lv_event_t event)
+{
+    if (event == LV_EVENT_CLICKED)
+    {
+#if DEBUG_OPENHAB_UI
+        printf("window_item_rollershutter_event_handler: LV_EVENT_CLICKED\n");
+#endif
+        struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
+
+        if (ctx != nullptr)
+        {
+            // deactivate all buttons
+            lv_obj_t *btn = NULL;
+            do
+            {
+                btn = lv_obj_get_child(ctx->state_window_widget, btn);
+
+                if (btn != NULL)
+                    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+            } while (btn != NULL);
+
+            // activate pressed
+            lv_btn_set_style(obj, LV_BTN_STYLE_REL, &custom_style_button_toggle);
+
+            lv_obj_t *label = lv_obj_get_child(obj, NULL);
+            char *command = (char *)lv_obj_get_user_data(label);
+
+#if DEBUG_OPENHAB_UI
+            Serial.printf("button pressed Command: %s\n", command);
+#endif
+            ctx->item->setStateText(command);
+            ctx->item->publish(ctx->item->getLink());
+            ctx->refresh_request = true;
+            BEEPER_EVENT_CHANGE();
+        }
+    }
+}
+
+void window_item_rollershutter(struct widget_context_s *ctx)
+{
+#if DEBUG_OPENHAB_UI
+        printf("window_item_rollershutter()\n");
+#endif
+    // Create a window
+    lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
+    lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
+    lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
+    lv_win_set_title(win, ctx->item->getLabel());
+
+    // Add close button to the header
+    lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE);
+    lv_obj_set_event_cb(close_btn, window_close_event_handler);
+
+    // Add buttons
+    lv_obj_t *cont;
+
+    cont = lv_cont_create(win, NULL);
+    lv_cont_set_style(cont, LV_CONT_STYLE_MAIN, &lv_style_transp_fit);
+    lv_obj_set_size(cont, lv_obj_get_width(win) * 4 / 5, lv_obj_get_height(win) / 3);
+    lv_obj_align_origo(cont, NULL, LV_ALIGN_CENTER, 0, 0);
+    lv_cont_set_layout(cont, LV_LAYOUT_PRETTY);
+
+    lv_obj_t *btn;
+    lv_obj_t *label;
+
+    // Button UP
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_rollershutter_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_UP);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"UP");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    // Button STOP
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_rollershutter_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_STOP);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"STOP");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    // Button DOWN
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_rollershutter_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_DOWN);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"DOWN");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    ctx->state_window_widget = cont;
+}
+
+static void window_item_player_event_handler(lv_obj_t *obj, lv_event_t event)
+{
+    if (event == LV_EVENT_CLICKED)
+    {
+#if DEBUG_OPENHAB_UI
+        printf("window_item_player_event_handler: LV_EVENT_CLICKED\n");
+#endif
+        struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
+
+        if (ctx != nullptr)
+        {
+            // deactivate all buttons
+            lv_obj_t *btn = NULL;
+            do
+            {
+                btn = lv_obj_get_child(ctx->state_window_widget, btn);
+
+                if (btn != NULL)
+                    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+            } while (btn != NULL);
+
+            // activate pressed
+            lv_btn_set_style(obj, LV_BTN_STYLE_REL, &custom_style_button_toggle);
+
+            lv_obj_t *label = lv_obj_get_child(obj, NULL);
+            char *command = (char *)lv_obj_get_user_data(label);
+
+#if DEBUG_OPENHAB_UI
+            Serial.printf("button pressed Command: %s\n", command);
+#endif
+            ctx->item->setStateText(command);
+            ctx->item->publish(ctx->item->getLink());
+            ctx->refresh_request = true;
+            BEEPER_EVENT_CHANGE();
+        }
+    }
+}
+
+void window_item_player(struct widget_context_s *ctx)
+{
+#if DEBUG_OPENHAB_UI
+        printf("window_item_player()\r\n");
+#endif
+    // Create a window
+    lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
+    lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
+    lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
+    lv_win_set_title(win, ctx->item->getLabel());
+
+    // Add close button to the header
+    lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE);
+    lv_obj_set_event_cb(close_btn, window_close_event_handler);
+
+    // Add buttons
+    lv_obj_t *cont;
+
+    cont = lv_cont_create(win, NULL);
+    lv_cont_set_style(cont, LV_CONT_STYLE_MAIN, &lv_style_transp_fit);
+    lv_obj_set_auto_realign(cont, true);
+    lv_obj_set_size(cont, lv_obj_get_width(win) - LV_DPI / 4, lv_obj_get_height(win) / 3);
+    lv_obj_align_origo(cont, NULL, LV_ALIGN_CENTER, 0, 0);
+    lv_cont_set_layout(cont, LV_LAYOUT_PRETTY);
+
+    lv_obj_t *btn;
+    lv_obj_t *label;
+
+    // Button PREVIOUS
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_player_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_PREV);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"PREVIOUS");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    // Button PAUSE
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_player_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_PAUSE);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"PAUSE");
+    if (strcmp(ctx->item->getStateText(), "PAUSE") == 0)
+        lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button_toggle);
+    else
+        lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    // Button PLAY
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_player_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_PLAY);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"PLAY");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+    if (strcmp(ctx->item->getStateText(), "PLAY") == 0)
+        lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button_toggle);
+    else
+        lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    // Button NEXT
+    btn = lv_btn_create(cont, NULL);
+    lv_obj_set_user_data(btn, (lv_obj_user_data_t)ctx);
+    lv_obj_set_event_cb(btn, window_item_player_event_handler);
+    lv_btn_set_fit2(btn, LV_FIT_TIGHT, LV_FIT_TIGHT);
+    label = lv_label_create(btn, NULL);
+    lv_label_set_text(label, LV_SYMBOL_NEXT);
+    lv_obj_set_user_data(label, (lv_obj_user_data_t)"NEXT");
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &custom_style_button);
+
+    ctx->state_window_widget = cont;
+}
+
 static void window_item_slider_event_handler(lv_obj_t *obj, lv_event_t event)
 {
     if (event == LV_EVENT_VALUE_CHANGED)
@@ -537,16 +770,16 @@ static void window_item_slider_event_handler(lv_obj_t *obj, lv_event_t event)
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
-            ctx->item.setStateNumber(lv_slider_get_value(obj));
+            ctx->item->setStateNumber(lv_slider_get_value(obj));
 
-            if (ctx->item.getNumberPattern().startsWith("%d"))
-                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
+            if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
             else
-                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
 
-            ctx->item.publish(ctx->link);
+            ctx->item->publish(ctx->item->getLink());
             ctx->refresh_request = true;
             BEEPER_EVENT_CHANGE();
         }
@@ -559,7 +792,7 @@ void window_item_slider(struct widget_context_s *ctx)
     lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
     lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
     lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
-    lv_win_set_title(win, ctx->label.c_str());
+    lv_win_set_title(win, ctx->item->getLabel());
 
     // Add close button to the header
     lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE);
@@ -567,8 +800,8 @@ void window_item_slider(struct widget_context_s *ctx)
 
     // Add slider
     lv_obj_t *slider = lv_slider_create(win, NULL);
-    lv_slider_set_range(slider, ctx->item.getMinVal(), ctx->item.getMaxVal());
-    lv_slider_set_value(slider, ctx->item.getStateNumber(), LV_ANIM_OFF);
+    lv_slider_set_range(slider, ctx->item->getMinVal(), ctx->item->getMaxVal());
+    lv_slider_set_value(slider, ctx->item->getStateNumber(), LV_ANIM_OFF);
     lv_obj_set_width(slider, lv_obj_get_width(win) - LV_DPI / 3);
     lv_obj_align(slider, NULL, LV_ALIGN_CENTER, 0, 0);
     lv_obj_set_user_data(slider, (lv_obj_user_data_t)ctx);
@@ -577,10 +810,10 @@ void window_item_slider(struct widget_context_s *ctx)
     // Add state label above
     lv_obj_t *state_label = lv_label_create(win, NULL);
 
-    if (ctx->item.getNumberPattern().startsWith("%d"))
-        lv_label_set_text_fmt(state_label, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
+    if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+        lv_label_set_text_fmt(state_label, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
     else
-        lv_label_set_text_fmt(state_label, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+        lv_label_set_text_fmt(state_label, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
 
     lv_obj_set_style(state_label, &custom_style_label_state_large);
     lv_obj_set_auto_realign(state_label, true);
@@ -590,10 +823,10 @@ void window_item_slider(struct widget_context_s *ctx)
     // Add minimum value label left below
     lv_obj_t *min_value_label = lv_label_create(win, NULL);
 
-    if (ctx->item.getNumberPattern().startsWith("%d"))
-        lv_label_set_text_fmt(min_value_label, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getMinVal());
+    if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+        lv_label_set_text_fmt(min_value_label, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getMinVal());
     else
-        lv_label_set_text_fmt(min_value_label, ctx->item.getNumberPattern().c_str(), ctx->item.getMinVal());
+        lv_label_set_text_fmt(min_value_label, ctx->item->getNumberPattern(), ctx->item->getMinVal());
 
     lv_obj_set_style(min_value_label, &custom_style_label_state);
     lv_obj_set_auto_realign(min_value_label, true);
@@ -603,10 +836,10 @@ void window_item_slider(struct widget_context_s *ctx)
     // Add maximum value label right below
     lv_obj_t *max_value_label = lv_label_create(win, NULL);
 
-    if (ctx->item.getNumberPattern().startsWith("%d"))
-        lv_label_set_text_fmt(max_value_label, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getMaxVal());
+    if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+        lv_label_set_text_fmt(max_value_label, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getMaxVal());
     else
-        lv_label_set_text_fmt(max_value_label, ctx->item.getNumberPattern().c_str(), ctx->item.getMaxVal());
+        lv_label_set_text_fmt(max_value_label, ctx->item->getNumberPattern(), ctx->item->getMaxVal());
 
     lv_obj_set_style(max_value_label, &custom_style_label_state);
     lv_obj_set_auto_realign(max_value_label, true);
@@ -625,7 +858,7 @@ static void window_item_setpoint_event_handler(lv_obj_t *obj, lv_event_t event)
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
             const char *txt = lv_btnm_get_active_btn_text(obj);
 
@@ -635,23 +868,23 @@ static void window_item_setpoint_event_handler(lv_obj_t *obj, lv_event_t event)
 #endif
             if (strcmp(txt, LV_SYMBOL_PLUS) == 0)
             {
-                ctx->item.setStateNumber(ctx->item.getStateNumber() + ctx->item.getStep());
-                if (ctx->item.getStateNumber() > ctx->item.getMaxVal())
-                    ctx->item.setStateNumber(ctx->item.getMaxVal());
+                ctx->item->setStateNumber(ctx->item->getStateNumber() + ctx->item->getStep());
+                if (ctx->item->getStateNumber() > ctx->item->getMaxVal())
+                    ctx->item->setStateNumber(ctx->item->getMaxVal());
             }
             else if (strcmp(txt, LV_SYMBOL_MINUS) == 0)
             {
-                ctx->item.setStateNumber(ctx->item.getStateNumber() - ctx->item.getStep());
-                if (ctx->item.getStateNumber() < ctx->item.getMinVal())
-                    ctx->item.setStateNumber(ctx->item.getMinVal());
+                ctx->item->setStateNumber(ctx->item->getStateNumber() - ctx->item->getStep());
+                if (ctx->item->getStateNumber() < ctx->item->getMinVal())
+                    ctx->item->setStateNumber(ctx->item->getMinVal());
             }
 
-            if (ctx->item.getNumberPattern().startsWith("%d"))
-                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
+            if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
             else
-                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+                lv_label_set_text_fmt(ctx->state_window_widget, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
 
-            ctx->item.publish(ctx->link);
+            ctx->item->publish(ctx->item->getLink());
             ctx->refresh_request = true;
             BEEPER_EVENT_CHANGE();
         }
@@ -664,7 +897,7 @@ void window_item_setpoint(struct widget_context_s *ctx)
     lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
     lv_win_set_style(win, LV_WIN_STYLE_HEADER, &custom_style_windows_header);
     lv_win_set_sb_mode(win, LV_SB_MODE_OFF);
-    lv_win_set_title(win, ctx->label.c_str());
+    lv_win_set_title(win, ctx->item->getLabel());
 
     // Add close button to the header
     lv_obj_t *close_btn = lv_win_add_btn(win, LV_SYMBOL_CLOSE);
@@ -685,10 +918,10 @@ void window_item_setpoint(struct widget_context_s *ctx)
     lv_label_set_long_mode(state_label, LV_LABEL_LONG_BREAK);
     lv_obj_set_width(state_label, lv_obj_get_width(win) - LV_DPI / 20);
 
-    if (ctx->item.getNumberPattern().startsWith("%d"))
-        lv_label_set_text_fmt(state_label, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
+    if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+        lv_label_set_text_fmt(state_label, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
     else
-        lv_label_set_text_fmt(state_label, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+        lv_label_set_text_fmt(state_label, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
 
     lv_obj_set_style(state_label, &custom_style_label_state_large);
     lv_obj_set_auto_realign(state_label, true);
@@ -705,65 +938,78 @@ static void event_handler(lv_obj_t *obj, lv_event_t event)
 #endif
         struct widget_context_s *ctx = (struct widget_context_s *)lv_obj_get_user_data(obj);
 
-        if (ctx != nullptr && ctx->active == true)
+        if (ctx != nullptr)
         {
-            if (ctx->widget_type == WidgetType::item_text)
+            if (ctx->item->getType() == ItemType::type_string)
             {
 #if DEBUG_OPENHAB_UI
-                if (ctx->item.getType() == ItemType::type_text)
-                    printf("Item State Text: %s ", ctx->item.getStateText().c_str());
-                else if (ctx->item.getType() == ItemType::type_number)
+                if (ctx->item->getType() == ItemType::type_number)
                 {
                     printf("Item State Number :");
-                    printf(ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+                    printf(ctx->item->getNumberPattern(), ctx->item->getStateNumber());
+                }
+                else
+                {
+                    printf("Item State Text: %s ", ctx->item->getStateText());
                 }
-                printf("Item Link: %s", ctx->link.c_str());
+
+                printf("Item Link: %s", ctx->item->getLink());
 #endif
             }
-            else if (ctx->widget_type == WidgetType::linked_page || ctx->widget_type == WidgetType::parent_page)
+            else if (ctx->item->getType() == ItemType::type_link || ctx->item->getType() == ItemType::type_parent_link)
             {
 #if DEBUG_OPENHAB_UI
-                printf("LinkedPage Link: %s", ctx->link.c_str());
+                printf("LinkedPage Link: %s", ctx->item->getLink());
 #endif
-                current_page = ctx->link;
+                strncpy(current_page, ctx->item->getLink(), sizeof(current_page));
                 refresh_page = true;
-                if (ctx->widget_type == WidgetType::parent_page)
+                if (ctx->item->getType() == ItemType::type_parent_link)
                     BEEPER_EVENT_LINK_BACK()
                 else
                     BEEPER_EVENT_LINK();
             }
-            else if (ctx->widget_type == WidgetType::item_switch)
+            else if (ctx->item->getType() == ItemType::type_switch)
             {
 #if DEBUG_OPENHAB_UI
-                printf("LinkedPage Link: %s", ctx->link.c_str());
+                printf("LinkedPage Link: %s", ctx->item->getLink());
                 printf(" ... Posting update");
 #endif
 
-                if (ctx->item.getStateText() == "OFF")
-                    ctx->item.setStateText("ON");
+                if (strncmp(ctx->item->getStateText(), "OFF", 3) == 0)
+                    ctx->item->setStateText("ON");
                 else
-                    ctx->item.setStateText("OFF");
+                    ctx->item->setStateText("OFF");
 
-                ctx->item.publish(ctx->link);
+                ctx->item->publish(ctx->item->getLink());
                 ctx->refresh_request = true;
                 BEEPER_EVENT_CHANGE();
             }
-            else if (ctx->widget_type == WidgetType::item_setpoint)
+            else if (ctx->item->getType() == ItemType::type_setpoint)
             {
                 BEEPER_EVENT_WINDOW();
                 window_item_setpoint(ctx);
             }
-            else if (ctx->widget_type == WidgetType::item_slider)
+            else if (ctx->item->getType() == ItemType::type_slider)
             {
                 BEEPER_EVENT_WINDOW();
                 window_item_slider(ctx);
             }
-            else if (ctx->widget_type == WidgetType::item_selection)
+            else if (ctx->item->getType() == ItemType::type_selection)
             {
                 BEEPER_EVENT_WINDOW();
                 window_item_selection(ctx);
             }
-            else if (ctx->widget_type == WidgetType::item_colorpicker)
+            else if (ctx->item->getType() == ItemType::type_rollershutter)
+            {
+                BEEPER_EVENT_WINDOW();
+                window_item_rollershutter(ctx);
+            }
+            else if (ctx->item->getType() == ItemType::type_player)
+            {
+                BEEPER_EVENT_WINDOW();
+                window_item_player(ctx);
+            }
+            else if (ctx->item->getType() == ItemType::type_colorpicker)
             {
                 BEEPER_EVENT_WINDOW();
                 window_item_colorpicker(ctx);
@@ -787,53 +1033,52 @@ void update_state_widget(struct widget_context_s *ctx)
     if (ctx->state_widget == NULL)
         return;
 
-    if (ctx->widget_type == WidgetType::item_text)
+    if (ctx->item->getType() == ItemType::type_string)
     {
-        if (ctx->item.getType() == ItemType::type_text)
-        {
-            lv_label_set_text(ctx->state_widget, ctx->item.getStateText().c_str());
-        }
-        else if (ctx->item.getType() == ItemType::type_number)
-        {
-            if (ctx->item.getNumberPattern().startsWith("%d"))
-                lv_label_set_text_fmt(ctx->state_widget, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
-            else
-                lv_label_set_text_fmt(ctx->state_widget, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
-        }
+        lv_label_set_text(ctx->state_widget, ctx->item->getStateText());
     }
-    else if (ctx->widget_type == WidgetType::item_switch)
+    else if (ctx->item->getType() == ItemType::type_number)
     {
-        lv_label_set_text(ctx->state_widget, ctx->item.getStateText().c_str());
+        if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+            lv_label_set_text_fmt(ctx->state_widget, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
+        else
+            lv_label_set_text_fmt(ctx->state_widget, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
     }
-    else if ((ctx->widget_type == WidgetType::item_setpoint) || (ctx->widget_type == WidgetType::item_slider))
+    else if (  ctx->item->getType() == ItemType::type_switch
+            || ctx->item->getType() == ItemType::type_rollershutter
+            || ctx->item->getType() == ItemType::type_player)
     {
-        if (ctx->item.getNumberPattern().startsWith("%d"))
-            lv_label_set_text_fmt(ctx->state_widget, ctx->item.getNumberPattern().c_str(), (uint16_t)ctx->item.getStateNumber());
+        lv_label_set_text(ctx->state_widget, ctx->item->getStateText());
+    }
+    else if ((ctx->item->getType() == ItemType::type_setpoint) || (ctx->item->getType() == ItemType::type_slider))
+    {
+        if (strncmp(ctx->item->getNumberPattern(), "%d", 2) == 0)
+            lv_label_set_text_fmt(ctx->state_widget, ctx->item->getNumberPattern(), (uint16_t)ctx->item->getStateNumber());
         else
-            lv_label_set_text_fmt(ctx->state_widget, ctx->item.getNumberPattern().c_str(), ctx->item.getStateNumber());
+            lv_label_set_text_fmt(ctx->state_widget, ctx->item->getNumberPattern(), ctx->item->getStateNumber());
     }
-    else if (ctx->widget_type == WidgetType::item_selection)
+    else if (ctx->item->getType() == ItemType::type_selection)
     {
-        for (size_t index = 0; index < ctx->item.getSelectionCount(); index++)
+        for (size_t index = 0; index < ctx->item->getSelectionCount(); index++)
         {
-            if (strcmp(ctx->item.getSelectionCommand(index), ctx->item.getStateText().c_str()) == 0)
+            if (strcmp(ctx->item->getSelectionCommand(index), ctx->item->getStateText()) == 0)
             {
-                lv_label_set_text(ctx->state_widget, ctx->item.getSelectionLabel(index));
+                lv_label_set_text(ctx->state_widget, ctx->item->getSelectionLabel(index));
                 break;
             }
         }
     }
-    else if (ctx->widget_type == WidgetType::item_colorpicker)
+    else if (ctx->item->getType() == ItemType::type_colorpicker)
     {
-        lv_color_hsv_t color_hsv = hsvCStringToLVColor(ctx->item.getStateText().c_str());
+        lv_color_hsv_t color_hsv = hsvCStringToLVColor(ctx->item->getStateText());
         ctx->state_widget_style.body.main_color = lv_color_hsv_to_rgb(color_hsv.h, color_hsv.s, color_hsv.v);
         ctx->state_widget_style.body.grad_color = lv_color_hsv_to_rgb(color_hsv.h, color_hsv.s, color_hsv.v);
         lv_obj_invalidate(ctx->state_widget);
     }
     else
     {
-        Serial.print("update_state_widget: unknown or unsupported widget_type id: ");
-        Serial.println(ctx->widget_type);
+        Serial.print("update_state_widget: unknown or unsupported item type id: ");
+        Serial.println(ctx->item->getType());
     }
 }
 
@@ -915,20 +1160,14 @@ void load_icon(struct widget_context_s *wctx)
 
     static uint8_t iconbuffer[ICON_PNG_BUFFER_SIZE] = {0};
 
-    String state;
-    if (wctx->item.getType() == ItemType::type_number)
-        state = String(wctx->item.getStateNumber());
-    else
-        state = wctx->item.getStateText();
-
-    size_t iconsize = wctx->item.getIcon(current_website, wctx->iconname, state, iconbuffer, sizeof(iconbuffer));
+    size_t iconsize = wctx->item->getIcon(current_website, wctx->item->getIconName(), wctx->item->getStateText(), iconbuffer, sizeof(iconbuffer));
 
     // Decode the PNG image
     unsigned char *png_decoded;
     uint32_t png_width, png_height;
 
 #if DEBUG_OPENHAB_UI
-    printf("load_icon: %s ", wctx->iconname.c_str());
+    printf("load_icon: %s ", wctx->item->getIconName());
 #endif
 
     // Decode the loaded image in ARGB8888
@@ -956,7 +1195,7 @@ void load_icon(struct widget_context_s *wctx)
 void update_icon(struct widget_context_s *wctx)
 {
     load_icon(wctx);
-    if (wctx->img_dsc.data_size > 0)
+    if (wctx->img_dsc.data_size > 0 && wctx->img_obj != NULL)
         lv_img_set_src(wctx->img_obj, &wctx->img_dsc);
 }
 
@@ -974,7 +1213,11 @@ static void header_create(void)
 
     header.item.wifi = lv_label_create(header.container, NULL);
     lv_label_set_text(header.item.wifi, LV_SYMBOL_POWER);
-    lv_obj_align(header.item.wifi, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_DPI / 10, 0);
+    lv_obj_align(header.item.wifi, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_DPI / 2, 0);
+
+    header.item.signal = lv_label_create(header.container, NULL);
+    lv_label_set_text(header.item.signal, "  %");
+    lv_obj_align(header.item.signal, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_DPI / 5, 0);
 
     header.item.title = lv_label_create(header.container, NULL);
     lv_label_set_text(header.item.title, "Welcome to OhEzTouch");
@@ -986,27 +1229,35 @@ static void header_create(void)
     lv_obj_set_pos(header.container, 0, 0);
 }
 
-static void header_set_title(String text)
+static void header_set_title(const char* text)
 {
-    lv_label_set_text(header.item.title, text.c_str());
+    lv_label_set_text(header.item.title, text);
 }
 
-static void header_update_clock()
+static void header_update()
 {
     static int last_second;
     struct tm timeinfo;
 
-    if (!getLocalTime(&timeinfo, 0))
-        return;
-
-    if (timeinfo.tm_sec != last_second)
+    if (getLocalTime(&timeinfo, 0))
     {
-        last_second = timeinfo.tm_sec;
+        if (timeinfo.tm_sec != last_second)
+        {
+            last_second = timeinfo.tm_sec;
 
-        if (timeinfo.tm_sec % 2 == 0)
-            lv_label_set_text_fmt(header.item.clock, "%02d:%02d", timeinfo.tm_hour, timeinfo.tm_min);
-        else
-            lv_label_set_text_fmt(header.item.clock, "%02d %02d", timeinfo.tm_hour, timeinfo.tm_min);
+            if (timeinfo.tm_sec % 2 == 0)
+                lv_label_set_text_fmt(header.item.clock, "%02d:%02d", timeinfo.tm_hour, timeinfo.tm_min);
+            else
+                lv_label_set_text_fmt(header.item.clock, "%02d %02d", timeinfo.tm_hour, timeinfo.tm_min);
+        }
+    }
+
+    static unsigned long signal_last_update;
+
+    if (millis() > signal_last_update + HEADER_SIGNAL_UPDATE_INTERVAL)
+    {
+        signal_last_update = millis();
+        lv_label_set_text_fmt(header.item.signal, "%02d%%", get_signal_quality(WiFi.RSSI()));
     }
 }
 
@@ -1027,6 +1278,7 @@ void create_widget(lv_obj_t *parent, struct widget_context_s *wctx)
 {
     lv_obj_t *cont;
 
+    // Create widget button
     cont = lv_cont_create(parent, NULL);
     lv_obj_set_click(cont, true);
     lv_obj_set_event_cb(cont, event_handler);
@@ -1041,43 +1293,47 @@ void create_widget(lv_obj_t *parent, struct widget_context_s *wctx)
     wctx->container_style.body.padding.left = 0;
     wctx->container_style.body.padding.right = 0;
 
-    lv_obj_t *label = lv_label_create(cont, NULL);
+    // Create top label object
+     lv_obj_t *label = lv_label_create(cont, NULL);
     lv_obj_set_style(label, &custom_style_label);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
-    lv_label_set_text(label, wctx->label.c_str());
+    lv_label_set_text(label, wctx->item->getLabel());
     lv_obj_move_foreground(label);
     lv_obj_set_width(label, lv_obj_get_width(cont) - LV_DPI / 20);
     lv_obj_set_protect(label, LV_PROTECT_POS | LV_PROTECT_FOLLOW);
     lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 3);
 
+    // Create center image object
+    lv_obj_t *img_obj = lv_img_create(cont, NULL);
+    wctx->img_obj = img_obj;
+    lv_obj_set_opa_scale_enable(img_obj, true);
+
     if (wctx->img_dsc.data_size > 0)
     {
-        lv_obj_t *img_obj = lv_img_create(cont, NULL);
         lv_img_set_src(img_obj, &wctx->img_dsc);
-        lv_obj_move_background(img_obj);
-        lv_obj_set_opa_scale_enable(img_obj, true);
         lv_obj_set_opa_scale(img_obj, LV_OPA_30);
-        lv_obj_set_protect(img_obj, LV_PROTECT_POS | LV_PROTECT_FOLLOW);
-        lv_obj_align(img_obj, NULL, LV_ALIGN_CENTER, 0, 0);
-
-        wctx->img_obj = img_obj;
     }
-    else if (wctx->widget_type == WidgetType::parent_page)
+    else if (wctx->item->getType() == ItemType::type_parent_link)
     {
-        lv_obj_t *img_obj = lv_img_create(cont, NULL);
         lv_img_set_style(img_obj, LV_IMG_STYLE_MAIN, &custom_style_label_state_large);
         lv_img_set_src(img_obj, LV_SYMBOL_NEW_LINE);
-        lv_obj_move_background(img_obj);
-        lv_obj_set_opa_scale_enable(img_obj, true);
         lv_obj_set_opa_scale(img_obj, LV_OPA_60);
-        lv_obj_set_protect(img_obj, LV_PROTECT_POS | LV_PROTECT_FOLLOW);
-        lv_obj_align(img_obj, NULL, LV_ALIGN_CENTER, 0, 0);
-
-        wctx->img_obj = img_obj;
+    }
+    else
+    {
+        lv_img_set_style(img_obj, LV_IMG_STYLE_MAIN, &custom_style_label_state_large);
+        lv_img_set_src(img_obj, LV_SYMBOL_EYE_OPEN);
+        lv_obj_set_opa_scale(img_obj, LV_OPA_20);
     }
 
-    if (wctx->widget_type == WidgetType::parent_page || wctx->widget_type == WidgetType::linked_page)
+    lv_obj_move_background(img_obj);
+    lv_obj_set_protect(img_obj, LV_PROTECT_POS | LV_PROTECT_FOLLOW);
+    lv_obj_align(img_obj, NULL, LV_ALIGN_CENTER, 0, 0);
+
+    // Define bottom label and button boarder style
+    if (   wctx->item->getType() == ItemType::type_parent_link
+        || wctx->item->getType() == ItemType::type_link)
     {
         wctx->container_style.body.border.width *= 2;
         wctx->container_style.body.border.color = LV_COLOR_BLUE;
@@ -1085,7 +1341,8 @@ void create_widget(lv_obj_t *parent, struct widget_context_s *wctx)
         lv_obj_set_style(label, &custom_style_label_state);
         lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
     }
-    else if (wctx->widget_type == WidgetType::item_text)
+    else if (   wctx->item->getType() == ItemType::type_string
+             || wctx->item->getType() == ItemType::type_number)
     {
         lv_obj_t *state_label = lv_label_create(cont, NULL);
         lv_label_set_align(state_label, LV_LABEL_ALIGN_CENTER);
@@ -1099,26 +1356,15 @@ void create_widget(lv_obj_t *parent, struct widget_context_s *wctx)
 
         wctx->state_widget = state_label;
     }
-    else if (wctx->widget_type == WidgetType::item_switch)
-    {
-        wctx->container_style.body.border.width *= 2;
 
-        lv_obj_t *state_label = lv_label_create(cont, NULL);
-        lv_label_set_align(state_label, LV_LABEL_ALIGN_CENTER);
-        lv_label_set_long_mode(state_label, LV_LABEL_LONG_BREAK);
-        lv_style_copy(&wctx->state_widget_style, &custom_style_label_state);
-        lv_obj_set_style(state_label, &wctx->state_widget_style);
-        lv_obj_move_foreground(state_label);
-        lv_obj_set_width(state_label, lv_obj_get_width(cont));
-        lv_obj_set_protect(state_label, LV_PROTECT_POS | LV_PROTECT_FOLLOW);
-        lv_obj_align(state_label, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -3);
-
-        wctx->state_widget = state_label;
-    }
-    else if (wctx->widget_type == WidgetType::item_setpoint || wctx->widget_type == WidgetType::item_slider || wctx->widget_type == WidgetType::item_selection)
+    else if (   wctx->item->getType() == ItemType::type_switch
+             || wctx->item->getType() == ItemType::type_setpoint
+             || wctx->item->getType() == ItemType::type_slider
+             || wctx->item->getType() == ItemType::type_selection
+             || wctx->item->getType() == ItemType::type_rollershutter
+             || wctx->item->getType() == ItemType::type_player)
     {
         wctx->container_style.body.border.width *= 2;
-        //wctx->container_style.body.border.color = LV_COLOR_BLACK;
 
         lv_obj_t *state_label = lv_label_create(cont, NULL);
         lv_label_set_align(state_label, LV_LABEL_ALIGN_CENTER);
@@ -1132,10 +1378,9 @@ void create_widget(lv_obj_t *parent, struct widget_context_s *wctx)
 
         wctx->state_widget = state_label;
     }
-    else if (wctx->widget_type == WidgetType::item_colorpicker)
+    else if (wctx->item->getType() == ItemType::type_colorpicker)
     {
         wctx->container_style.body.border.width *= 2;
-        //wctx->container_style.body.border.color = LV_COLOR_BLACK;
 
         lv_obj_t *state_obj = lv_obj_create(cont, NULL);
         lv_style_copy(&wctx->state_widget_style, &lv_style_pretty_color);
@@ -1158,8 +1403,6 @@ void show(lv_obj_t *parent)
     // cleanup page
     for (size_t i = 0; i < WIDGET_COUNT_MAX; i++)
     {
-        widget_context[i].active = false;
-
         free_icon(&widget_context[i].img_dsc);
 
         // remove button
@@ -1172,141 +1415,18 @@ void show(lv_obj_t *parent)
 
     header_set_title(sitemap.getPageName());
 
-    size_t widget = 0;
-
-    if (sitemap.hasParent())
-    {
-        widget_context[widget].widget_type = WidgetType::parent_page;
-        widget_context[widget].link = sitemap.getParentLink();
-        widget_context[widget].label = "";
-        widget_context[widget].active = true;
-
-        create_widget(parent, &widget_context[widget]);
-
-        ++widget;
-    }
-
-#if DEBUG_OPENHAB_UI
-    Serial.print("Number of Widgets on sitemap: ");
-    Serial.println(sitemap.getWidgetcount());
-    if (sitemap.getWidgetcount() + widget > WIDGET_COUNT_MAX)
-    {
-        // note: widget is 1 if a parent page and therefore a back button is present
-        Serial.print("Can not display all widgets! Dropping: ");
-        Serial.println(sitemap.getWidgetcount() + widget - WIDGET_COUNT_MAX);
-    }
-#endif
-
-    for (int widget_index = 0; widget_index < sitemap.getWidgetcount(); widget_index++)
+    for (size_t i = 0; i < WIDGET_COUNT_MAX; i++)
     {
-        widget_context[widget].label = sitemap.getWidgetLabel(widget_index);
-
-        widget_context[widget].iconname = sitemap.getWidgetIconName(widget_index);
-
-        // Determine widget type
-        widget_context[widget].widget_type = WidgetType::unknown;
-
-        if (sitemap.hasChild(widget_index))
-        {
-            widget_context[widget].widget_type = WidgetType::linked_page;
-            widget_context[widget].link = sitemap.getChildLink(widget_index);
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_text)
-        {
-            widget_context[widget].widget_type = WidgetType::item_text;
-
-            if (sitemap.getWidgetItemType(widget_index) == ItemType::type_number)
-            {
-                widget_context[widget].item.setType(ItemType::type_number);
-                widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-                widget_context[widget].item.setStateNumber(sitemap.getWidgetItemState(widget_index).toFloat());
-#if DEBUG_OPENHAB_UI
-                printf("NumberItem: %s ", sitemap.getWidgetItemState(widget_index).c_str());
-                printf("FloatConversion: %f \r\n", widget_context[widget].item.getStateNumber());
-#endif
-                widget_context[widget].item.setNumberPattern(sitemap.getWidgetItemPattern(widget_index));
-            }
-            else
-            {
-                widget_context[widget].item.setType(ItemType::type_text);
-                widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-            }
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_switch)
-        {
-            widget_context[widget].widget_type = WidgetType::item_switch;
-            widget_context[widget].item.setType(ItemType::type_text);
-            widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_setpoint)
-        {
-            widget_context[widget].widget_type = WidgetType::item_setpoint;
-            widget_context[widget].item.setType(ItemType::type_number);
-            widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-            widget_context[widget].item.setStateNumber(sitemap.getWidgetItemState(widget_index).toFloat());
-            widget_context[widget].item.setNumberPattern(sitemap.getWidgetItemPattern(widget_index));
-            widget_context[widget].item.setMinVal(sitemap.getWidgetItemMinVal(widget_index));
-            widget_context[widget].item.setMaxVal(sitemap.getWidgetItemMaxVal(widget_index));
-            widget_context[widget].item.setStep(sitemap.getWidgetItemStep(widget_index));
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_slider)
-        {
-            widget_context[widget].widget_type = WidgetType::item_slider;
-            widget_context[widget].item.setType(ItemType::type_number);
-            widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-            widget_context[widget].item.setStateNumber(sitemap.getWidgetItemState(widget_index).toFloat());
-            widget_context[widget].item.setNumberPattern(sitemap.getWidgetItemPattern(widget_index));
-            widget_context[widget].item.setMinVal(sitemap.getWidgetItemMinVal(widget_index));
-            widget_context[widget].item.setMaxVal(sitemap.getWidgetItemMaxVal(widget_index));
-            widget_context[widget].item.setStep(sitemap.getWidgetItemStep(widget_index));
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_selection)
-        {
-            widget_context[widget].widget_type = WidgetType::item_selection;
-            widget_context[widget].item.setType(ItemType::type_text);
-            widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-            widget_context[widget].item.setSelectionCount(sitemap.getSelectionCount(widget_index));
+        widget_context[i].item = sitemap.getItem(i);
 
-#if DEBUG_OPENHAB_UI
-            Serial.printf("WidgetType::item_selection MappingCount = %u\n", widget_context[widget].item.getSelectionCount());
-#endif
-            for (size_t index = 0; index < widget_context[widget].item.getSelectionCount(); index++)
-            {
-                widget_context[widget].item.setSelectionCommand(index, sitemap.getSelectionCommand(widget_index, index).c_str());
-                widget_context[widget].item.setSelectionLabel(index, sitemap.getSelectionLabel(widget_index, index).c_str());
-            }
-        }
-        else if (sitemap.getWidgetType(widget_index) == WidgetType::item_colorpicker)
-        {
-            widget_context[widget].widget_type = WidgetType::item_colorpicker;
-            widget_context[widget].item.setType(ItemType::type_text);
-            widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-            // ToDo: Store color value compatible to lv color picker
-            //widget_context[widget].item.setStateText(sitemap.getWidgetItemState(widget_index));
-        }
-
-        if (widget_context[widget].widget_type != WidgetType::linked_page)
+        if (widget_context[i].item->getType() != ItemType::type_unknown)
         {
-            widget_context[widget].link = sitemap.getWidgetItemLink(widget_index);
-        }
-
-        load_icon(&widget_context[widget]);
-
-        widget_context[widget].update_timestamp = millis();
-        widget_context[widget].active = true;
-
-        create_widget(parent, &widget_context[widget]);
+            if (widget_context[i].item->getType() != ItemType::type_parent_link)
+                load_icon(&widget_context[i]);
 
-        if ((widget_context[widget].widget_type != WidgetType::linked_page) && (widget_context[widget].widget_type != WidgetType::parent_page))
-        {
-            update_state_widget(&widget_context[widget]);
+            create_widget(parent, &widget_context[i]);
+            update_state_widget(&widget_context[i]);
         }
-
-        ++widget;
-
-        // stop when widget count has been reached
-        if (widget > WIDGET_COUNT_MAX)
-            break;
     }
 }
 
@@ -1355,10 +1475,10 @@ void openhab_ui_set_wifi_state(bool wifi_state)
         lv_label_set_text(header.item.wifi, LV_SYMBOL_REFRESH);
 }
 
-void openhab_ui_connect(const char *host, int port, const char *sitemap)
+void openhab_ui_connect(const char *host, uint16_t port, const char *sitemap)
 {
-    current_website = "http://" + String(host) + ":" + String(port);
-    current_page = current_website + "/rest/sitemaps/" + current_page += String(sitemap) + "/" + String(sitemap) + "?type=json";
+    snprintf(current_website, sizeof(current_website), "http://%s:%u", host, port);
+    snprintf(current_page, sizeof(current_page), "%s/rest/sitemaps/%s/%s?type=json", current_website, sitemap, sitemap);
 
     refresh_page = true;
 }
@@ -1389,10 +1509,9 @@ void openhab_ui_loop(void)
         else
         {
 #if DEBUG_OPENHAB_UI
-            Serial.print("openhab_ui_loop: openlink failed: ");
-            Serial.println(current_page);
+            printf("openhab_ui_loop: openlink failed: %s\r\n", current_page);
 #endif
-            openhab_ui_infolabel.create(openhab_ui_infolabel.ERROR, "SITEMAP ACCESS FAILED\n" + current_page, 0);
+            openhab_ui_infolabel.create(openhab_ui_infolabel.ERROR, "SITEMAP ACCESS FAILED", current_page, 0);
             refresh_retry_timeout = millis() + GET_SITEMAP_RETRY_INTERVAL;
 
             statistics.sitemap_fail_cnt++;
@@ -1401,7 +1520,9 @@ void openhab_ui_loop(void)
 
     for (size_t i = 0; i < WIDGET_COUNT_MAX; ++i)
     {
-        if ((widget_context[i].active == true) && (widget_context[i].widget_type != WidgetType::linked_page) && (widget_context[i].widget_type != WidgetType::parent_page))
+        if (   (widget_context[i].item->getType() != ItemType::type_unknown)
+            && (widget_context[i].item->getType() != ItemType::type_link)
+            && (widget_context[i].item->getType() != ItemType::type_parent_link))
         {
             if (widget_context[i].refresh_request == true)
             {
@@ -1417,7 +1538,7 @@ void openhab_ui_loop(void)
                 // update widget from current remote openhab state
                 widget_context[i].update_timestamp = millis();
                 widget_context[i].refresh_request = false;
-                int result = widget_context[i].item.update(widget_context[i].link);
+                int result = widget_context[i].item->update(widget_context[i].item->getLink());
                 if (result > 0)
                 {
                     // item value changed
@@ -1447,7 +1568,7 @@ void openhab_ui_loop(void)
         configTime(current_config->item.ntp.gmt_offset * 3600, current_config->item.ntp.daylightsaving == true ? 3600 : 0, current_config->item.ntp.hostname);
     }
 
-    header_update_clock();
+    header_update();
 
     if (millis() > connection_error_handling_timestamp + (CONNECTION_ERROR_TIMEOUT_S * 1000))
     {
diff --git a/src/openhab_ui.hpp b/src/openhab_ui.hpp
index 2a89112..20cfac6 100644
--- a/src/openhab_ui.hpp
+++ b/src/openhab_ui.hpp
@@ -7,7 +7,7 @@
 
 void openhab_ui_setup(Config *config);
 void openhab_ui_set_wifi_state(bool wifi_state);
-void openhab_ui_connect(const char *host, int port, const char *sitemap);
+void openhab_ui_connect(const char *host, uint16_t port, const char *sitemap);
 void openhab_ui_loop(void);
 
 #endif
diff --git a/src/ui_infolabel.hpp b/src/ui_infolabel.hpp
index ac89533..ba20703 100644
--- a/src/ui_infolabel.hpp
+++ b/src/ui_infolabel.hpp
@@ -8,6 +8,8 @@
 #define DEBUG_UI_INFOLABEL 0
 #endif
 
+#define STR_INFOLABEL_TEMP_BUFFER_LEN (140 + 1)
+
 class Infolabel
 {
 private:
@@ -23,13 +25,12 @@ class Infolabel
         ERROR
     };
 
-    void create(enum infolabel_type_e type, String text, uint16_t timeout)
+    void create(enum infolabel_type_e type, const char* topic, const char* text, uint16_t timeout)
     {
         if (il == NULL)
         {
 #if DEBUG_UI_INFOLABEL
-            Serial.print("Infolabel::create: Creating new label Text: ");
-            Serial.println(text);
+            printf("Infolabel::create: Topic: %s   Text: %s", topic, text);
 #endif
             lv_style_copy(&label_style, &lv_style_plain);
             label_style.body.border.width = 4;
@@ -52,7 +53,9 @@ class Infolabel
             lv_obj_set_width(il, lv_disp_get_hor_res(NULL) * 9 / 10);
         }
 
-        lv_mbox_set_text(il, text.c_str());
+        char buffer[STR_INFOLABEL_TEMP_BUFFER_LEN];
+        snprintf(buffer, sizeof(buffer), "%s\n%s", topic, text);
+        lv_mbox_set_text(il, buffer);
 
         lv_obj_align(il, NULL, LV_ALIGN_CENTER, 0, 0);
 
diff --git a/src/version.h b/src/version.h
index 1f7dd71..c9e4ef6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -2,6 +2,6 @@
 #define VERSION_H
 
 #define VERSION_MAJOR   0
-#define VERSION_MINOR   11
+#define VERSION_MINOR   12
 
 #endif