diff --git a/connectcore-demo-example/index.html b/connectcore-demo-example/index.html
index 79e903b..43c40dc 100644
--- a/connectcore-demo-example/index.html
+++ b/connectcore-demo-example/index.html
@@ -305,7 +305,7 @@ Digi Demo - Dashboard
                                                     <table>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Total memory:</span>
+                                                                <span class="device-card-content-text">Total:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="memory_total" class="device-card-content-value">-</span> MB
@@ -313,7 +313,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Used memory:</span>
+                                                                <span class="device-card-content-text">Used:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="memory_used" class="device-card-content-value">-</span> MB
@@ -321,7 +321,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Free memory:</span>
+                                                                <span class="device-card-content-text">Free:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="memory_free" class="device-card-content-value">-</span> MB
@@ -401,7 +401,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">MAC address:</span>
+                                                                <span class="device-card-content-text">MAC:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="wifi_mac" class="device-card-content-value">-</span>
@@ -409,7 +409,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">IP address:</span>
+                                                                <span class="device-card-content-text">IP:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="wifi_ip" class="device-card-content-value">-</span>
@@ -417,7 +417,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Sent data:</span>
+                                                                <span class="device-card-content-text">TX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="wifi_sent_data" class="device-card-content-value">-</span>
@@ -425,7 +425,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Received data:</span>
+                                                                <span class="device-card-content-text">RX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="wifi_received_data" class="device-card-content-value">-</span>
@@ -449,7 +449,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">MAC address:</span>
+                                                                <span class="device-card-content-text">MAC:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="bluetooth_mac" class="device-card-content-value">-</span>
@@ -457,7 +457,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Sent data:</span>
+                                                                <span class="device-card-content-text">TX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="bluetooth_sent_data" class="device-card-content-value">-</span>
@@ -465,7 +465,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Received data:</span>
+                                                                <span class="device-card-content-text">RX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="bluetooth_received_data" class="device-card-content-value">-</span>
@@ -497,7 +497,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">MAC address:</span>
+                                                                <span class="device-card-content-text">MAC:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet0_mac" class="device-card-content-value">-</span>
@@ -505,7 +505,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">IP address:</span>
+                                                                <span class="device-card-content-text">IP:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet0_ip" class="device-card-content-value">-</span>
@@ -513,7 +513,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Sent data:</span>
+                                                                <span class="device-card-content-text">TX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet0_sent_data" class="device-card-content-value">-</span>
@@ -521,7 +521,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Received data:</span>
+                                                                <span class="device-card-content-text">RX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet0_received_data" class="device-card-content-value">-</span>
@@ -553,7 +553,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">MAC address:</span>
+                                                                <span class="device-card-content-text">MAC:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet1_mac" class="device-card-content-value">-</span>
@@ -561,7 +561,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">IP address:</span>
+                                                                <span class="device-card-content-text">IP:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet1_ip" class="device-card-content-value">-</span>
@@ -569,7 +569,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Sent data:</span>
+                                                                <span class="device-card-content-text">TX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet1_sent_data" class="device-card-content-value">-</span>
@@ -577,7 +577,7 @@ Digi Demo - Dashboard
                                                         </tr>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Received data:</span>
+                                                                <span class="device-card-content-text">RX data:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="ethernet1_received_data" class="device-card-content-value">-</span>
@@ -650,21 +650,21 @@ Digi Demo - Dashboard
                                                 <img id ="led_image" class="led-image" src="./static/images/led_bubble.png"/>
                                             </div>
                                             <div id="flash_memory_panel_area" class="panel-area panel-tooltip" onclick="toggleInfoPanelVisibility('flash_memory')">
-                                                <span class="panel-tooltip-text">Flash memory</span>
+                                                <span class="panel-tooltip-text">Storage</span>
                                                 <span id="flash_memory_panel_icon" class="fas fa-database panel-area-icon"></span>
                                             </div>
                                             <div id="flash_memory_panel" class="device-card flash-memory-panel shadow-sm">
                                                 <span id="flash_memory_panel_arrow" class="panel-arrow"></span>
                                                 <div class="device-card-header">
                                                     <span class="fas fa-database fa-lg mr-2"></span>
-                                                    <span>Flash memory stats</span>
+                                                    <span>Storage stats</span>
                                                     <div class="fas fa-window-close fa-lg device-card-header-button" onclick="setInfoPanelVisible('flash_memory', false)"></div>
                                                 </div>
                                                 <div class="device-card-content">
                                                     <table>
                                                         <tr>
                                                             <td>
-                                                                <span class="device-card-content-text">Total flash memory:</span>
+                                                                <span class="device-card-content-text">Total storage:</span>
                                                             </td>
                                                             <td>
                                                                 <span id="flash_size" class="device-card-content-value">-</span> GB