diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index 049cd5af6..70bb710b0 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Laai op"
 #define D_SCRIPT_UPLOAD_FILES  "Laai lêers op"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "versterking:"
 #define D_AS3935_ENERGY "energie:"
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index df87380c0..7e2d2f7de 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -873,6 +873,11 @@
 #define D_SCRIPT_UPLOAD        "Изпращане"
 #define D_SCRIPT_UPLOAD_FILES  "Изпращане на файлове"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "усилване:"
 #define D_AS3935_ENERGY "енергия:"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 99e61570c..eabd83f6d 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index f60108589..bd65cb69e 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload Dateien"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "Umgebung:"
 #define D_AS3935_ENERGY "Energie:"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index 5c903e821..ac63555ca 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 6f5c7c345..8f53e456c 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index fbb2688b6..6d0942023 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Cargar"
 #define D_SCRIPT_UPLOAD_FILES  "Cargar Archivos"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "Ganancia:"
 #define D_AS3935_ENERGY "Energía:"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index 9a62e90c6..b0ffb3378 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -854,6 +854,7 @@
 #define D_SOLAX_ERROR_6   "Défaut Surchauffe"
 #define D_SOLAX_ERROR_7   "Défaut Ventilateur"
 #define D_SOLAX_ERROR_8   "Défaut Autre équipement"
+
 //xdrv_10_scripter.ino
 #define D_CONFIGURE_SCRIPT     "Éditer le script"
 #define D_SCRIPT               "édition du script"
@@ -866,6 +867,12 @@
 #define D_SCRIPT_ENABLE        "script actif"
 #define D_SCRIPT_UPLOAD        "Envoi"
 #define D_SCRIPT_UPLOAD_FILES  "Envoi de fichiers"
+
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energie:"
@@ -890,9 +897,11 @@
 #define D_AS3935_OUTDOORS "Extérieur"
 #define D_AS3935_CAL_FAIL "défaut de calibration"
 #define D_AS3935_CAL_OK "calibration établie à :"
+
 //xsns_68_opentherm.ino
 #define D_SENSOR_BOILER_OT_RX   "OpenTherm RX"
 #define D_SENSOR_BOILER_OT_TX   "OpenTherm TX"
+
 // xnrg_15_teleinfo Denky (Teleinfo)
 #define D_CONTRACT        "Type contrat"
 #define D_POWER_LOAD      "Charge actuelle"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index 10c45e1f0..de4df185d 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index ba628122a..70ebac047 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 763986451..ecc52606f 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Carica"
 #define D_SCRIPT_UPLOAD_FILES  "Carica file"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "guadagno:"
 #define D_AS3935_ENERGY "energia:"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index 25493d6c1..aba3bfb77 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index 6481799f2..28475c5d2 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Bestandsbeheer"
+#define D_FS_SIZE              "Grootte"
+#define D_FS_FREE              "Vrij"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index b33e0e221..38b59817e 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index 35eacffea..5cbf9dff6 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index 4985d386d..23a28466f 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index 8f44f53ca..6c1fc214d 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Încarcă"
 #define D_SCRIPT_UPLOAD_FILES  "Încarcă fișiere"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 678eae852..bf13e2976 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 2d567b1a4..c37af4db1 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 95303ab60..78926b602 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 82d684839..df30519b8 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 738886f35..5787cf47c 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Завантажити"
 #define D_SCRIPT_UPLOAD_FILES  "Завантажити файли"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index 2fa5e4282..c3c465fb8 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Tải lên"
 #define D_SCRIPT_UPLOAD_FILES  "Tệp tải lên"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "khuếch đại:"
 #define D_AS3935_ENERGY "năng lượng:"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index d5079a834..aba3ede8a 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "Upload"
 #define D_SCRIPT_UPLOAD_FILES  "Upload files"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "energy:"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index d68e00380..13bc7829b 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -874,6 +874,11 @@
 #define D_SCRIPT_UPLOAD        "上傳"
 #define D_SCRIPT_UPLOAD_FILES  "上傳檔案"
 
+//xdrv_50_filesystem.ino
+#define D_MANAGE_FILE_SYSTEM   "Manage File system"
+#define D_FS_SIZE              "Size"
+#define D_FS_FREE              "Free"
+
 //xsns_67_as3935.ino
 #define D_AS3935_GAIN "gain:"
 #define D_AS3935_ENERGY "能量:"
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index dddc43fc1..9cd4e2d3d 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -276,7 +276,8 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_SET_POWER, FUNC_SET_DEVICE_POWER, FUNC_SHOW_SENSOR, FUNC_ANY_KEY,
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
                     FUNC_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED,
-                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
+                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MANAGEMENT_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON,
+                    FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
                     FUNC_DEVICE_GROUP_ITEM };
 
 enum AddressConfigSteps { ADDR_IDLE, ADDR_RECEIVE, ADDR_SEND };
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 4a63588f8..e9554e774 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1302,6 +1302,9 @@ void HandleConfiguration(void)
   WSContentButton(BUTTON_BACKUP);
   WSContentButton(BUTTON_RESTORE);
 
+  WSContentSend_P(PSTR("<div></div>"));            // 5px padding
+  XdrvCall(FUNC_WEB_ADD_MANAGEMENT_BUTTON);
+
   WSContentSpaceButton(BUTTON_MAIN);
   WSContentStop();
 }
diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino
index 956fa1387..488f0b948 100644
--- a/tasmota/xdrv_50_filesystem.ino
+++ b/tasmota/xdrv_50_filesystem.ino
@@ -338,18 +338,19 @@ void UFS_free(void) {
 
 const char UFS_WEB_DIR[] PROGMEM =
   "<p><form action='" "ufsd" "' method='get'><button>" "%s" "</button></form></p>";
-const char UFS_FILE_UPLOAD[] PROGMEM = D_UFSDIR;
+
 const char UFS_FORM_FILE_UPLOAD[] PROGMEM =
   "<div id='f1' name='f1' style='display:block;'>"
-  "<fieldset><legend><b>&nbsp;%s"  "&nbsp;</b></legend>";
+  "<fieldset><legend><b>&nbsp;" D_MANAGE_FILE_SYSTEM "&nbsp;</b></legend>";
+const char UFS_FORM_FILE_UPGc[] PROGMEM =
+  "<div style='text-align:left;color:#%06x;'>" D_FS_SIZE " %s kB - " D_FS_FREE " %s kB</div>";
 const char UFS_FORM_FILE_UPG[] PROGMEM =
   "<form method='post' action='ufsu' enctype='multipart/form-data'>"
-  "<br/><input type='file' name='ufsu'><br/>"
-  "<br/><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>";
-const char UFS_FORM_FILE_UPGc[] PROGMEM =
-  "<div style='text-align:left;color:green;'>total size: %s kB - free: %s kB</div>";
+  "<br><input type='file' name='ufsu'><br>"
+  "<br><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>"
+  "<br>";
 const char UFS_FORM_SDC_DIRa[] PROGMEM =
-  "<div style='text-align:left;overflow:scroll;height:400px;'>";
+  "<div style='text-align:left;overflow:auto;height:250px;'>";
 const char UFS_FORM_SDC_DIRc[] PROGMEM =
   "</div>";
 const char UFS_FORM_FILE_UPGb[] PROGMEM =
@@ -359,7 +360,7 @@ const char UFS_FORM_FILE_UPGb[] PROGMEM =
 const char UFS_FORM_SDC_DIRd[] PROGMEM =
   "<pre><a href='%s' file='%s'>%s</a></pre>";
 const char UFS_FORM_SDC_DIRb[] PROGMEM =
-  "<pre><a href='%s' file='%s'>%s</a>     %s : %8d</pre>";
+  "<pre><a href='%s' file='%s'>%s</a> %s %8d</pre>";
 const char UFS_FORM_SDC_HREF[] PROGMEM =
   "http://%s/ufsd?download=%s/%s";
 
@@ -378,15 +379,18 @@ void UFSdirectory(void) {
     }
   }
 
-  WSContentStart_P(UFS_FILE_UPLOAD);
+  WSContentStart_P(PSTR(D_MANAGE_FILE_SYSTEM));
   WSContentSendStyle();
-  WSContentSend_P(UFS_FORM_FILE_UPLOAD, D_UFSDIR);
-  WSContentSend_P(UFS_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
+  WSContentSend_P(UFS_FORM_FILE_UPLOAD);
+
   char ts[16];
   char fs[16];
   UFS_form1000(ufs_fsinfo(0), ts, '.');
   UFS_form1000(ufs_fsinfo(1), fs, '.');
-  WSContentSend_P(UFS_FORM_FILE_UPGc, ts, fs);
+  WSContentSend_P(UFS_FORM_FILE_UPGc, WebColor(COL_TEXT), ts, fs);
+
+  WSContentSend_P(UFS_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
+
   WSContentSend_P(UFS_FORM_SDC_DIRa);
   if (ufs_type) {
     UFS_ListDir(ufs_path, depth);
@@ -434,9 +438,9 @@ void UFS_ListDir(char *path, uint8_t depth) {
       if (lcp) {
         ep = lcp + 1;
       }
-      time_t tm = entry.getLastWrite();
-      char tstr[24];
-      strftime(tstr, 22, "%d-%m-%Y - %H:%M:%S ", localtime(&tm));  // Theo note to me. Isn't strftime expensive? SHould use ISO Date/Time
+
+      uint32_t tm = entry.getLastWrite();
+      String tstr = GetDT(tm);
 
       char *pp = path;
       if (!*(pp + 1)) { pp++; }
@@ -461,7 +465,7 @@ void UFS_ListDir(char *path, uint8_t depth) {
           path[plen] = 0;
         } else {
           snprintf_P(npath, sizeof(npath), UFS_FORM_SDC_HREF, WiFi.localIP().toString().c_str(), pp, ep);
-          WSContentSend_P(UFS_FORM_SDC_DIRb, npath, ep, name, tstr, entry.size());
+          WSContentSend_P(UFS_FORM_SDC_DIRb, npath, ep, name, tstr.c_str(), entry.size());
         }
       }
       entry.close();
@@ -556,18 +560,6 @@ void UFS_Upload(void) {
   }
 }
 
-void UFSFileUploadSuccess(void) {
-  WSContentStart_P(PSTR(D_INFORMATION));
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
-  WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br/>"), WebColor(COL_TEXT_SUCCESS));
-  WSContentSend_P(PSTR("</div><br/>"));
-  WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"), "/ufsd", D_UPL_DONE);
-  WSContentStop();
-}
-
-
-
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -583,14 +575,14 @@ bool Xdrv50(uint8_t function) {
       result = DecodeCommand(kUFSCommands, kUFSCommand);
       break;
 #ifdef USE_WEBSERVER
-    case FUNC_WEB_ADD_BUTTON:
+    case FUNC_WEB_ADD_MANAGEMENT_BUTTON:
       if (ufs_type) {
-        WSContentSend_PD(UFS_WEB_DIR,D_UFSDIR);
+        WSContentSend_PD(UFS_WEB_DIR, D_MANAGE_FILE_SYSTEM);
       }
       break;
     case FUNC_WEB_ADD_HANDLER:
       Webserver->on("/ufsd", UFSdirectory);
-      Webserver->on("/ufsu", HTTP_GET, UFSFileUploadSuccess);
+      Webserver->on("/ufsu", HTTP_GET, UFSdirectory);
       Webserver->on("/ufsu", HTTP_POST,[]() {
         Webserver->sendHeader("Location","/ufsu");
         Webserver->send(303);