diff --git a/interface/src/framework/system/ESPSystemStatus.tsx b/interface/src/framework/system/ESPSystemStatus.tsx
index b7dcf93e4..5751a84e0 100644
--- a/interface/src/framework/system/ESPSystemStatus.tsx
+++ b/interface/src/framework/system/ESPSystemStatus.tsx
@@ -8,6 +8,7 @@ import MemoryIcon from '@mui/icons-material/Memory';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
 import SdStorageIcon from '@mui/icons-material/SdStorage';
+import TapAndPlayIcon from '@mui/icons-material/TapAndPlay';
 import {
   Avatar,
   Box,
@@ -32,7 +33,7 @@ function formatNumber(num: number) {
 const ESPSystemStatus: FC = () => {
   const { LL } = useI18nContext();
 
-  useLayoutTitle(LL.STATUS_OF('ESP32'));
+  useLayoutTitle(LL.HARDWARE());
 
   const {
     data: data,
@@ -48,6 +49,18 @@ const ESPSystemStatus: FC = () => {
     return (
       <>
         <List>
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar sx={{ bgcolor: '#68374d', color: 'white' }}>
+                <TapAndPlayIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.HARDWARE() + ' ' + LL.DEVICE()}
+              secondary={data.model ? data.model : data.cpu_type}
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
           <ListItem>
             <ListItemAvatar>
               <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
@@ -90,12 +103,12 @@ const ESPSystemStatus: FC = () => {
               </Avatar>
             </ListItemAvatar>
             <ListItemText
-              primary={LL.HEAP()}
+              primary={LL.FREE_MEMORY()}
               secondary={
                 formatNumber(data.free_heap) +
-                ' KB / ' +
+                ' KB (' +
                 formatNumber(data.max_alloc_heap) +
-                ' KB '
+                ' KB alloc)'
               }
             />
           </ListItem>
@@ -131,7 +144,7 @@ const ESPSystemStatus: FC = () => {
               primary={LL.FLASH()}
               secondary={
                 formatNumber(data.flash_chip_size) +
-                ' KB / ' +
+                ' KB , ' +
                 (data.flash_chip_speed / 1000000).toFixed(0) +
                 ' MHz'
               }
diff --git a/interface/src/framework/system/SystemStatus.tsx b/interface/src/framework/system/SystemStatus.tsx
index 4160cb637..702d1ce6d 100644
--- a/interface/src/framework/system/SystemStatus.tsx
+++ b/interface/src/framework/system/SystemStatus.tsx
@@ -391,8 +391,8 @@ const SystemStatus: FC = () => {
             disabled={!me.admin}
             icon={MemoryIcon}
             bgcolor="#68374d"
-            label={LL.SYSTEM_MEMORY()}
-            text={formatNumber(data.free_heap) + ' KB'}
+            label={LL.STATUS_OF(LL.SYSTEM(1))}
+            text={formatNumber(data.free_heap) + ' KB' + ' ' + LL.FREE_MEMORY()}
             to="/system/espsystemstatus"
           />
           <Divider variant="inset" component="li" />
diff --git a/interface/src/framework/system/UploadDownload.tsx b/interface/src/framework/system/UploadDownload.tsx
index 242d96cb2..d8e7389b0 100644
--- a/interface/src/framework/system/UploadDownload.tsx
+++ b/interface/src/framework/system/UploadDownload.tsx
@@ -195,7 +195,6 @@ const UploadDownload: FC = () => {
         <Box p={2} border="2px solid grey" borderRadius={2}>
           {LL.VERSION_ON() + ' '}
           <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
-          {data.model.length > 0 && <p>Gateway Hardware:&nbsp;{data.model}</p>}
           <Divider />
           {latestVersion && (
             <Box mt={2}>
diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts
index fe9a40b67..fe2113107 100644
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -188,9 +188,9 @@ const de: Translation = {
   RELEASE_NOTES: 'Versionshinweise',
   EMS_ESP_VER: 'EMS-ESP Version',
   UPTIME: 'System Betriebszeit',
-  HEAP: 'freier RAM Speicher (Gesamt / max. Block)',
+  FREE_MEMORY: 'freier RAM Speicher',
   PSRAM: 'PSRAM (Größe / Frei)',
-  FLASH: 'Flash Speicher (Größe / Geschwindigkeit)',
+  FLASH: 'Flash Speicher (Größe , Geschwindigkeit)',
   APPSIZE: 'Programm (Partition: Genutzt / Frei)',
   FILESYSTEM: 'Dateisystem (Genutzt / Frei)',
   BUFFER_SIZE: 'max. Puffergröße',
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index 25c2738d3..42df7e815 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -188,9 +188,9 @@ const en: Translation = {
   RELEASE_NOTES: 'release notes',
   EMS_ESP_VER: 'EMS-ESP Version',
   UPTIME: 'System Uptime',
-  HEAP: 'Heap (Free / Max Alloc)',
+  FREE_MEMORY: 'Free Memory',
   PSRAM: 'PSRAM (Size / Free)',
-  FLASH: 'Flash Chip (Size / Speed)',
+  FLASH: 'Flash Chip (Size , Speed)',
   APPSIZE: 'Application (Partition: Used / Free)',
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts
index 74a59d09c..bca5d1ecd 100644
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -188,9 +188,9 @@ const fr: Translation = {
   RELEASE_NOTES: 'notes de version',
   EMS_ESP_VER: 'Version EMS-ESP',
   UPTIME: 'Durée de fonctionnement du système',
-  HEAP: 'Heap (Libre / Max Allouée)',
+  FREE_MEMORY: 'Libre Memory',
   PSRAM: 'PSRAM (Taille / Libre)',
-  FLASH: 'Flash Chip (Taille / Vitesse)',
+  FLASH: 'Flash Chip (Taille , Vitesse)',
   APPSIZE: 'Application (Partition: Utilisée / Libre)',
   FILESYSTEM: 'File System (Utilisée / Libre)',
   BUFFER_SIZE: 'Max taille du buffer',
diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts
index a0a3cc4d9..0b0e05bf8 100644
--- a/interface/src/i18n/it/index.ts
+++ b/interface/src/i18n/it/index.ts
@@ -188,9 +188,9 @@ const it: Translation = {
   RELEASE_NOTES: 'note rilascio',
   EMS_ESP_VER: 'Versione EMS-ESP',
   UPTIME: 'Tempo di attività del sistema',
-  HEAP: 'Heap (Free / Max Alloc)',
+  FREE_MEMORY: 'Free Memory',
   PSRAM: 'PSRAM (Size / Free)',
-  FLASH: 'Flash Chip (Size / Speed)',
+  FLASH: 'Flash Chip (Size , Speed)',
   APPSIZE: 'Applicazione (Partizione: Usata / Libera)',
   FILESYSTEM: 'Memoria Sistema (Usata / Libera)',
   BUFFER_SIZE: 'Max Buffer Size',
diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts
index 304adc045..ef82e4596 100644
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -188,9 +188,9 @@ const nl: Translation = {
   RELEASE_NOTES: 'release notes',
   EMS_ESP_VER: 'EMS-ESP Versie',
   UPTIME: 'Systeem Uptime',
-  HEAP: 'Heap (Free / Max Alloc)',
+  FREE_MEMORY: 'Free Memory',
   PSRAM: 'PSRAM (Size / Free)',
-  FLASH: 'Flash Chip (Size / Speed)',
+  FLASH: 'Flash Chip (Size , Speed)',
   APPSIZE: 'Application (Partition: Used / Free)',
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts
index 4264b78b5..af78ba486 100644
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -188,9 +188,9 @@ const no: Translation = {
   RELEASE_NOTES: 'release notes',
   EMS_ESP_VER: 'EMS-ESP Version',
   UPTIME: 'System Oppetid',
-  HEAP: 'Heap (Ledig / Max Allokert)',
+  FREE_MEMORY: 'Ledig Memory',
   PSRAM: 'PSRAM (Størrelse / Ledig)',
-  FLASH: 'Flash Chip (Størrelse / Hastighet)',
+  FLASH: 'Flash Chip (Størrelse , Hastighet)',
   APPSIZE: 'Applikasjon (Partition: Brukt / Ledig)',
   FILESYSTEM: 'File System (Brukt / Ledig)',
   BUFFER_SIZE: 'Max Buffer Størrelse',
diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts
index 53cfb0f21..a9ac4803a 100644
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -188,9 +188,9 @@ const pl: BaseTranslation = {
   RELEASE_NOTES: 'lista zmian',
   EMS_ESP_VER: 'Wersja EMS-ESP',
   UPTIME: 'Czas działania systemu',
-  HEAP: 'HEAP (wolne / maksymalny przydział)',
+  FREE_MEMORY: 'Wolne Memory', // TODO translate
   PSRAM: 'PSRAM (rozmiar / wolne)',
-  FLASH: 'FLASH (rozmiar / taktowanie)',
+  FLASH: 'FLASH (rozmiar , taktowanie)',
   APPSIZE: 'Aplikacja (partycja: wykorzystane / wolne)',
   FILESYSTEM: 'System plików (wykorzystane / wolne)',
   BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts
index d34a9b823..19e4dc097 100644
--- a/interface/src/i18n/sk/index.ts
+++ b/interface/src/i18n/sk/index.ts
@@ -188,9 +188,9 @@ const sk: Translation = {
   RELEASE_NOTES: 'poznámky k verzii',
   EMS_ESP_VER: 'EMS-ESP verzia',
   UPTIME: 'Beh systému',
-  HEAP: 'Zásobník (voľné / max pridelenie)',
+  FREE_MEMORY: 'Voľné Memory', // TODO translate
   PSRAM: 'PSRAM (Veľkosť / Voľné)',
-  FLASH: 'Flash chip (Veľkosť / Rýchlosť)',
+  FLASH: 'Flash chip (Veľkosť , Rýchlosť)',
   APPSIZE: 'Applikácia (Oddiel: Použité / Voľné)',
   FILESYSTEM: 'Súborový systém (Použité / Voľné)',
   BUFFER_SIZE: 'Buffer-max.veľkosť',
diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts
index f2df96d2e..afd865a7b 100644
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -184,13 +184,13 @@ const sv: Translation = {
   THE_LATEST: 'Den senaste',
   OFFICIAL: 'officiell',
   DEVELOPMENT: 'utveckling',
-  RELEASE_IS: 'release är', // TODO translate
+  RELEASE_IS: 'release är',
   RELEASE_NOTES: 'release-logg',
   EMS_ESP_VER: 'EMS-ESP Version',
   UPTIME: 'Systemets Upptid',
-  HEAP: 'Heap (Ledigt / Max allokerat)',
+  FREE_MEMORY: 'Ledigt Memory',
   PSRAM: 'PSRAM (Storlek / Ledigt)',
-  FLASH: 'Flashminne (Storlek / Hastighet)',
+  FLASH: 'Flashminne (Storlek , Hastighet)',
   APPSIZE: 'Applikationer (Partition: Använt / Ledigt)',
   FILESYSTEM: 'Filsystem (Använt / Ledigt)',
   BUFFER_SIZE: 'Max Bufferstorlek',
diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts
index f38733110..bd968418d 100644
--- a/interface/src/i18n/tr/index.ts
+++ b/interface/src/i18n/tr/index.ts
@@ -188,9 +188,9 @@ const tr: Translation = {
   RELEASE_NOTES: 'yayınlanma notları',
   EMS_ESP_VER: 'EMS-ESP Sürümü',
   UPTIME: 'Sistem Çalışma Süresi',
-  HEAP: 'Yığın (Boş / Maksimum Tahsis)',
+  FREE_MEMORY: 'Yığın Memory', // TODO translate
   PSRAM: 'PSRAM (Boyut / Boş)',
-  FLASH: 'Flash Çipi (Boyut / Hız)',
+  FLASH: 'Flash Çipi (Boyut , Hız)',
   APPSIZE: 'Uygulama (Bölme: Kullanılmış / Boş)',
   FILESYSTEM: 'Dosya Sistemi (Kullanılmış / Boş)',
   BUFFER_SIZE: 'En fazla bellek boyutu',
diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts
index c6df591d5..340cedef3 100644
--- a/mock-api/rest_server.ts
+++ b/mock-api/rest_server.ts
@@ -369,7 +369,7 @@ const ESPsystem_status = {
   psram_size: 0,
   free_psram: 0,
   has_loader: true,
-  model: 'BBQKees Electronics EMS Gateway E32 V2 (E32 V2.0 P3/2024011)'
+  // model: 'BBQKees Electronics EMS Gateway E32 V2 (E32 V2.0 P3/2024011)'
 };
 
 const system_status = {