diff --git a/scripts/makeweb.py b/scripts/makeweb.py
index 4b054d82..f3682eb4 100644
--- a/scripts/makeweb.py
+++ b/scripts/makeweb.py
@@ -42,9 +42,7 @@ for filename in os.listdir(webroot):
         dst.write(")==\"==\";\n")
         dst.write("const int ");
         dst.write(varname)
-        dst.write("_LEN = sizeof(");
-        dst.write(varname)
-        dst.write(")/sizeof(");
-        dst.write(varname)
-        dst.write("[0]);");
+        dst.write("_LEN = ");
+        dst.write(str(len(content)))
+        dst.write(";");
         
\ No newline at end of file
diff --git a/src/AmsConfiguration.cpp b/src/AmsConfiguration.cpp
index bc913588..89083299 100644
--- a/src/AmsConfiguration.cpp
+++ b/src/AmsConfiguration.cpp
@@ -72,6 +72,13 @@ void AmsConfiguration::setWifiHostname(const char* wifiHostname) {
 	strcpy(config.wifiHostname, wifiHostname);
 }
 
+void AmsConfiguration::clearWifi() {
+	setWifiSsid("");
+	setWifiPassword("");
+	setWifiHostname("");
+	clearWifiIp();
+}
+
 void AmsConfiguration::clearWifiIp() {
 	setWifiIp("");
 	setWifiGw("");
@@ -262,6 +269,24 @@ void AmsConfiguration::setSubstituteMissing(bool substituteMissing) {
 	config.substituteMissing = substituteMissing;
 }
 
+bool AmsConfiguration::isSendUnknown() {
+	return config.sendUnknown;
+}
+
+void AmsConfiguration::setSendUnknown(bool sendUnknown) {
+	config.sendUnknown = sendUnknown;
+}
+
+void AmsConfiguration::clearMeter() {
+	setMeterType(0);
+	setDistributionSystem(0);
+	setMainFuse(0);
+	setProductionCapacity(0);
+	setSubstituteMissing(false);
+	setSendUnknown(false);
+}
+
+
 bool AmsConfiguration::isDebugTelnet() {
 	return config.debugTelnet;
 }
@@ -475,6 +500,23 @@ void AmsConfiguration::ackDomoChange() {
 	domoChanged = false;
 }
 
+void AmsConfiguration::clear() {
+	clearMeter();
+	clearWifi();
+	clearMqtt();
+	clearAuth();
+	clearDomo();
+
+	int address = EEPROM_CONFIG_ADDRESS;
+
+	EEPROM.begin(EEPROM_SIZE);
+	while(address < EEPROM_CONFIG_ADDRESS+EEPROM_SIZE) {
+		EEPROM.put(address++, 0);
+	}
+	EEPROM.commit();
+	EEPROM.end();
+}
+
 bool AmsConfiguration::hasConfig() {
 	if(configVersion == 0) {
 		EEPROM.begin(EEPROM_SIZE);
@@ -768,7 +810,8 @@ int AmsConfiguration::readByte(int address, byte *value) {
 
 void AmsConfiguration::print(Print* debugger)
 {
-	debugger->println("Configuration:");
+	debugger->print("Configuration size: ");
+	debugger->println(sizeof(config));
 	debugger->println("-----------------------------------------------");
 	debugger->printf("WiFi SSID:            '%s'\r\n", this->getWifiSsid());
 	debugger->printf("WiFi Psk:             '%s'\r\n", this->getWifiPassword());
diff --git a/src/AmsConfiguration.h b/src/AmsConfiguration.h
index ff102962..b368bd9d 100644
--- a/src/AmsConfiguration.h
+++ b/src/AmsConfiguration.h
@@ -29,6 +29,7 @@ struct ConfigObject {
 	uint8_t mainFuse;
 	uint8_t productionCapacity;
 	bool substituteMissing;
+	bool sendUnknown;
 
 	bool debugTelnet;
 	bool debugSerial;
@@ -78,6 +79,7 @@ public:
 	void setWifiDns2(const char* wifiDns1);
 	char* getWifiHostname();
 	void setWifiHostname(const char* wifiHostname);
+	void clearWifi();
 	void clearWifiIp();
 
 	bool isWifiChanged();
@@ -125,6 +127,9 @@ public:
 	void setProductionCapacity(uint8_t productionCapacity);
 	bool isSubstituteMissing();
 	void setSubstituteMissing(bool substituteMissing);
+	bool isSendUnknown();
+	void setSendUnknown(bool sendUnknown);
+	void clearMeter();
 
 	bool isDebugTelnet();
 	void setDebugTelnet(bool debugTelnet);
@@ -179,6 +184,8 @@ public:
 	bool isDomoChanged();
 	void ackDomoChange();
 
+	void clear();
+
 protected:
 
 private:
@@ -209,6 +216,7 @@ private:
 		0, // Main fuse
 		0, // Production capacity
 		false, // Substitute
+		false, // Send unknown
 		false, // Debug telnet
 		false, // Debug serial
 		5, // Debug level
@@ -230,10 +238,11 @@ private:
 		0, // VL2IDX
 		0, // VL3IDX
 		0 // CL1IDX
+		// 786 bytes
 	};
 	bool wifiChanged, mqttChanged, domoChanged;
 
-	const int EEPROM_SIZE = 2048;
+	const int EEPROM_SIZE = 790; // Config size + 4 bytes for config version
 	const int EEPROM_CHECK_SUM = 82; // Used to check if config is stored. Change if structure changes
 	const int EEPROM_CONFIG_ADDRESS = 0;
 
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 03f4670e..688f1a53 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -235,6 +235,7 @@ void setup() {
 	if(config.hasConfig()) {
 		if(Debug.isActive(RemoteDebug::INFO)) config.print(&Debug);
 		WiFi_connect();
+		timeClient.begin();
 	} else {
 		if(Debug.isActive(RemoteDebug::INFO)) {
 			debugI("No configuration, booting AP");
@@ -243,7 +244,6 @@ void setup() {
 	}
 
 	ws.setup(&config, &mqtt);
-	timeClient.begin();
 }
 
 int buttonTimer = 0;
@@ -296,12 +296,6 @@ void loop() {
 		lastTemperatureRead = now;
 	}
 
-	if(now > 10000 && now - lastErrorBlink > 3000) {
-		errorBlink();
-	}
-
-	timeClient.update();
-
 	// Only do normal stuff if we're not booted as AP
 	if (WiFi.getMode() != WIFI_AP) {
 		if (WiFi.status() != WL_CONNECTED) {
@@ -328,6 +322,13 @@ void loop() {
 					MDNS.addService("http", "tcp", 80);
 				}
 			}
+
+			if(now > 10000 && now - lastErrorBlink > 3000) {
+				errorBlink();
+			}
+
+			timeClient.update();
+
 			if (strlen(config.getMqttHost()) > 0) {
 				mqtt.loop();
 				delay(10); // Needed to preserve power. After adding this, the voltage is super smooth on a HAN powered device
@@ -344,7 +345,7 @@ void loop() {
 	} else {
 		dnsServer.processNextRequest();
 		// Continously flash the LED when AP mode
-		hw.ledBlink(LED_INTERNAL, 1);
+		if (now / 50 % 64 == 0) hw.ledBlink(LED_INTERNAL, 1);
 	}
 
 	if(hanSerialPin != config.getHanPin()) {
@@ -716,7 +717,7 @@ void readHanPort() {
 					delay(10);
 				}
 			} else {
-				if(strlen(config.getMqttHost()) > 0 && strlen(config.getMqttPublishTopic()) > 0) {
+				if(config.isSendUnknown() && strlen(config.getMqttHost()) > 0 && strlen(config.getMqttPublishTopic()) > 0) {
 					byte buf[512];
 					int length = hanReader.getBuffer(buf);
 					String hexstring = "";
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index 07b82b46..20d50b7f 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -5,7 +5,7 @@
 #include "root/head_html.h"
 #include "root/foot_html.h"
 #include "root/index_html.h"
-#include "root/index_js.h"
+#include "root/application_js.h"
 #include "root/setup_html.h"
 #include "root/configmeter_html.h"
 #include "root/configwifi_html.h"
@@ -19,6 +19,7 @@
 #include "root/github_svg.h"
 #include "root/upload_html.h"
 #include "root/delete_html.h"
+#include "root/reset_html.h"
 
 #include "Base64.h"
 
@@ -33,7 +34,7 @@ void AmsWebServer::setup(AmsConfiguration* config, MQTTClient* mqtt) {
 
 	server.on("/", HTTP_GET, std::bind(&AmsWebServer::indexHtml, this));
 	server.on("/", HTTP_POST, std::bind(&AmsWebServer::handleSetup, this));
-	server.on("/index.js", HTTP_GET, std::bind(&AmsWebServer::indexJs, this));
+	server.on("/application.js", HTTP_GET, std::bind(&AmsWebServer::applicationJs, this));
 	server.on("/config-meter", HTTP_GET, std::bind(&AmsWebServer::configMeterHtml, this));
 	server.on("/config-wifi", HTTP_GET, std::bind(&AmsWebServer::configWifiHtml, this));
 	server.on("/config-mqtt", HTTP_GET, std::bind(&AmsWebServer::configMqttHtml, this));
@@ -59,6 +60,11 @@ void AmsWebServer::setup(AmsConfiguration* config, MQTTClient* mqtt) {
 	server.on("/mqtt-key", HTTP_GET, std::bind(&AmsWebServer::mqttKey, this));
 	server.on("/mqtt-key", HTTP_POST, std::bind(&AmsWebServer::mqttKeyDelete, this), std::bind(&AmsWebServer::mqttKeyUpload, this));
 
+	server.on("/reset", HTTP_GET, std::bind(&AmsWebServer::factoryResetHtml, this));
+	server.on("/reset", HTTP_POST, std::bind(&AmsWebServer::factoryResetPost, this));
+	
+	server.onNotFound(std::bind(&AmsWebServer::notFound, this));
+	
 	server.begin(); // Web server start
 }
 
@@ -175,16 +181,18 @@ void AmsWebServer::indexHtml() {
 		html.replace("${wifi.channel}", WiFi.channel() > 0 ? String(WiFi.channel()) : "");
 		html.replace("${wifi.ssid}", !WiFi.SSID().isEmpty() ? String(WiFi.SSID()) : "");
 
-		server.setContentLength(html.length());
-		server.send(200, "text/html", html);
+		server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+		server.send_P(200, "text/html", HEAD_HTML);
+		server.sendContent(html);
+		server.sendContent_P(FOOT_HTML);
 	}
 }
 
-void AmsWebServer::indexJs() {
-	printD("Serving /index.js over http...");
+void AmsWebServer::applicationJs() {
+	printD("Serving /application.js over http...");
 
 	server.sendHeader("Cache-Control", "public, max-age=3600");
-	server.send_P(200, "application/javascript", INDEX_JS);
+	server.send_P(200, "application/javascript", APPLICATION_JS);
 }
 
 void AmsWebServer::configMeterHtml() {
@@ -212,9 +220,12 @@ void AmsWebServer::configMeterHtml() {
 	}
 	html.replace("${config.productionCapacity}", String(config->getProductionCapacity()));
 	html.replace("${config.substituteMissing}", config->isSubstituteMissing() ? "checked" : "");
+	html.replace("${config.sendUnknown}", config->isSendUnknown() ? "checked" : "");
 
-	server.setContentLength(html.length());
-	server.send(200, "text/html", html);
+	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent(html);
+	server.sendContent_P(FOOT_HTML);
 }
 
 void AmsWebServer::configWifiHtml() {
@@ -238,8 +249,10 @@ void AmsWebServer::configWifiHtml() {
 	html.replace("${config.wifiDns2}", config->getWifiDns2());
 	html.replace("${config.wifiHostname}", config->getWifiHostname());
 
-	server.setContentLength(html.length());
-	server.send(200, "text/html", html);
+	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent(html);
+	server.sendContent_P(FOOT_HTML);
 }
 
 void AmsWebServer::configMqttHtml() {
@@ -322,8 +335,11 @@ void AmsWebServer::configDomoticzHtml() {
 	} else { html.replace("${config.domoVL3IDX}", ""); }
 	if(config->getDomoCL1IDX() > 0){ html.replace("${config.domoCL1IDX}", String(config->getDomoCL1IDX()));
 	} else { html.replace("${config.domoCL1IDX}", ""); }
-	server.setContentLength(html.length());
-	server.send(200, "text/html", html);
+
+	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent(html);
+	server.sendContent_P(FOOT_HTML);
 }
 
 
@@ -345,8 +361,10 @@ void AmsWebServer::configWebHtml() {
 	html.replace("${config.authUser}", config->getAuthUser());
 	html.replace("${config.authPassword}", config->getAuthPassword());
 
-	server.setContentLength(html.length());
-	server.send(200, "text/html", html);
+	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent(html);
+	server.sendContent_P(FOOT_HTML);
 }
 
 void AmsWebServer::bootCss() {
@@ -639,6 +657,7 @@ void AmsWebServer::handleSave() {
 		config->setMainFuse(server.arg("mainFuse").toInt());
 		config->setProductionCapacity(server.arg("productionCapacity").toInt());
 		config->setSubstituteMissing(server.hasArg("substituteMissing") && server.arg("substituteMissing") == "true");
+		config->setSendUnknown(server.hasArg("sendUnknown") && server.arg("sendUnknown") == "true");
 	}
 
 	if(server.hasArg("wifiConfig") && server.arg("wifiConfig") == "true") {
@@ -795,8 +814,10 @@ void AmsWebServer::configSystemHtml() {
 	server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
 	server.sendHeader("Pragma", "no-cache");
 
-	server.setContentLength(html.length());
-	server.send(200, "text/html", html);
+	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent(html);
+	server.sendContent_P(FOOT_HTML);
 }
 
 String AmsWebServer::getSerialSelectOptions(int selected) {
@@ -949,14 +970,20 @@ void AmsWebServer::uploadHtml(const char* label, const char* action, const char*
 	server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
 	server.sendHeader("Pragma", "no-cache");
 	
-	server.send_P(200, "text/html", UPLOAD_HTML);
+	server.setContentLength(UPLOAD_HTML_LEN + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent_P(UPLOAD_HTML);
+	server.sendContent_P(FOOT_HTML);
 }
 
 void AmsWebServer::deleteHtml(const char* label, const char* action, const char* menu) {
 	server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
 	server.sendHeader("Pragma", "no-cache");
 	
-	server.send_P(200, "text/html", DELETE_HTML);
+	server.setContentLength(DELETE_HTML_LEN + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent_P(DELETE_HTML);
+	server.sendContent_P(FOOT_HTML);
 }
 
 void AmsWebServer::mqttCa() {
@@ -1085,6 +1112,34 @@ void AmsWebServer::mqttKeyDelete() {
 	}
 }
 
+void AmsWebServer::factoryResetHtml() {
+	server.sendHeader("Cache-Control", "public, max-age=3600");
+	
+	server.setContentLength(RESET_HTML_LEN + HEAD_HTML_LEN + FOOT_HTML_LEN);
+	server.send_P(200, "text/html", HEAD_HTML);
+	server.sendContent_P(RESET_HTML);
+	server.sendContent_P(FOOT_HTML);
+}
+
+void AmsWebServer::factoryResetPost() {
+	if(server.hasArg("perform") && server.arg("perform") == "true") {
+		SPIFFS.format();
+		config->clear();
+		performRestart = true;
+		server.sendHeader("Location","/restart-wait");
+		server.send(303);
+	} else {
+		server.sendHeader("Location","/");
+		server.send(303);
+	}
+}
+
+
+void AmsWebServer::notFound() {
+	server.sendHeader("Location","/");
+	server.send(303);
+}
+
 
 void AmsWebServer::printD(String fmt, ...) {
 	va_list args;
diff --git a/src/web/AmsWebServer.h b/src/web/AmsWebServer.h
index 994fe5fe..8ce294a1 100644
--- a/src/web/AmsWebServer.h
+++ b/src/web/AmsWebServer.h
@@ -57,7 +57,7 @@ private:
 	bool checkSecurity(byte level);
 
 	void indexHtml();
-	void indexJs();
+	void applicationJs();
 	void configMeterHtml();
 	void configWifiHtml();
 	void configMqttHtml();
@@ -93,6 +93,11 @@ private:
 	void mqttKeyUpload();
 	void mqttKeyDelete();
 
+	void factoryResetHtml();
+	void factoryResetPost();
+
+	void notFound();
+
 	void printD(String fmt, ...);
 	void printI(String fmt, ...);
 	void printW(String fmt, ...);
diff --git a/web/index.js b/web/application.js
similarity index 69%
rename from web/index.js
rename to web/application.js
index e0b13edc..c8cd5d8b 100644
--- a/web/index.js
+++ b/web/application.js
@@ -18,7 +18,80 @@ $(function() {
         });
     }
 
-    fetch();
+    if($('.SimpleMeter').length > 0) {
+        fetch();
+    }
+
+    // For config-mqtt
+    $('#mqttEnable').on('change', function() {
+        var inputs = $('.mqtt-config');
+        inputs.prop('disabled', !$(this).is(':checked'));
+    });
+    
+    $('#mqttPayloadFormat').on('change', function() {
+        var val = parseInt($(this).val());
+        if(val == 3) {
+            $('.format-type-domoticz').show();
+        } else {
+            $('.format-type-domoticz').hide();
+        }
+    });
+
+    $('#mqttEnable').trigger('change');
+    $('#mqttPayloadFormat').trigger('change');
+
+    // For config-meter
+    $('.subtitute-dependent').on('change', function() {
+        console.log("test");
+        if($('#meterType').val() == 2 && $('#distributionSystem').val() == 1) {
+            $('#substitute').show();
+        } else {
+            $('#substitute').hide();
+        }
+    });
+    $('#meterType').trigger('change');
+
+    // For config-wifi
+    $('#wifiIpType').on('change', function() {
+        if($(this).is(':checked')) {
+            $('#staticIp').show();
+        } else {
+            $('#staticIp').hide();
+        }
+    });
+    $('#wifiIpType').trigger('change');
+
+    // For config-web
+    $('#authSecurity').on('change', function() {
+        var inputs = $('.auth-config');
+        inputs.prop('disabled', $(this).val() == 0);
+    });
+    
+    $('#authSecurity').trigger('change');
+
+    switch(window.location.pathname) {
+        case '/config-meter':
+            $('#config-meter-link').addClass('active');
+            break;
+        case '/config-wifi':
+            $('#config-wifi-link').addClass('active');
+            break;
+        case '/config-mqtt':
+        case '/mqtt-ca':
+        case '/mqtt-cert':
+        case '/mqtt-key':
+        case '/config-domoticz':
+            $('#config-mqtt-link').addClass('active');
+            break;
+        case '/config-web':
+            $('#config-web-link').addClass('active');
+            break;
+        case '/config-system':
+        case '/firmware':
+        case '/reset':
+            $('#config-system-link').addClass('active');
+            break;
+    }
 });
 
 var setStatus = function(id, status) {
diff --git a/web/configdomoticz.html b/web/configdomoticz.html
index 2e898819..6dec843f 100644
--- a/web/configdomoticz.html
+++ b/web/configdomoticz.html
@@ -1,102 +1,60 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - WiFi configuration</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link " href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link " href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link active" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link " href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-             </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
+<form method="post" action="/save">
+    <input type="hidden" name="domoConfig" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <p>Domoticz Configuration. Requires that a Domoticz MQTT-message-broker is setup. HOWTO: https://www.domoticz.com/wiki/MQTT.</p>
+        <p>The following virtual sensors can currently be used:</p>
+        <ul>
+            <li>Electricity (instant and counter)</li>
+            <li>Electricity Current/Ampere 3 Phase</li>
+            <li>Voltage</li>
         </ul>
-    </header>
-    <form method="post" action="/save">
-        <input type="hidden" name="domoConfig" value="true"/>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <p>Domoticz Configuration. Requires that a Domoticz MQTT-message-broker is setup. HOWTO: https://www.domoticz.com/wiki/MQTT.</p>
-            <p>The following virtual sensors can currently be used:</p>
-            <ul>
-                <li>Electricity (instant and counter)</li>
-                <li>Electricity Current/Ampere 3 Phase</li>
-                <li>Voltage</li>
-            </ul>
-            <p>see: <a href="https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's">https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's</a></p>
-            <p>Create the sensors in Domoticz under Hardware > Dummy > Create virtual sensor, and use the IDX assigned to the sensor as input here.</p>
-            <p>"Electricity (instant and counter)" relies on Total energy import "tPI" and will not start before the first value is read (once an hour).</p>
-        </div>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="d-flex flex-row flex-wrap">
-                <div class="m-2 input-group input-group-sm" style="width: 200px;">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">Electricity IDX</span>
-                    </div>
-                    <input type="number" class="form-control" name="domoELIDX" value="${config.domoELIDX}" min="0" max="65535"/> 
-                </div>
-                <div class="m-2 input-group input-group-sm" style="width: 240px;">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">Current (3 Phase) IDX</span>
-                    </div>
-                    <input type="number" class="form-control" name="domoCL1IDX" value="${config.domoCL1IDX}" min="0" max="65535"/>
+        <p>see: <a href="https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's">https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's</a></p>
+        <p>Create the sensors in Domoticz under Hardware > Dummy > Create virtual sensor, and use the IDX assigned to the sensor as input here.</p>
+        <p>"Electricity (instant and counter)" relies on Total energy import "tPI" and will not start before the first value is read (once an hour).</p>
+    </div>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="d-flex flex-row flex-wrap">
+            <div class="m-2 input-group input-group-sm" style="width: 200px;">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">Electricity IDX</span>
                 </div>
+                <input type="number" class="form-control" name="domoELIDX" value="${config.domoELIDX}" min="0" max="65535"/> 
             </div>
-            <div class="d-flex flex-row flex-wrap">
-                <div class="m-2 input-group input-group-sm" style="width: 200px;">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">Voltage L1 IDX</span>
-                    </div>
-                    <input type="number" class="form-control" name="domoVL1IDX" value="${config.domoVL1IDX}" min="0" max="65535"/>
-                </div>
-                <div class="m-2 input-group input-group-sm" style="width: 200px;">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">Voltage L1 IDX</span>
-                    </div>
-                    <input type="number" class="form-control" name="domoVL2IDX" value="${config.domoVL2IDX}" min="0" max="65535"/>
-                </div>
-                <div class="m-2 input-group input-group-sm" style="width: 200px;">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">Voltage L1 IDX</span>
-                    </div>
-                    <input type="number" class="form-control" name="domoVL3IDX" value="${config.domoVL3IDX}" min="0" max="65535"/>
+            <div class="m-2 input-group input-group-sm" style="width: 240px;">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">Current (3 Phase) IDX</span>
                 </div>
+                <input type="number" class="form-control" name="domoCL1IDX" value="${config.domoCL1IDX}" min="0" max="65535"/>
             </div>
         </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="/" class="btn btn-outline-secondary">Back</a>
+        <div class="d-flex flex-row flex-wrap">
+            <div class="m-2 input-group input-group-sm" style="width: 200px;">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">Voltage L1 IDX</span>
+                </div>
+                <input type="number" class="form-control" name="domoVL1IDX" value="${config.domoVL1IDX}" min="0" max="65535"/>
             </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-primary">Save</button>
+            <div class="m-2 input-group input-group-sm" style="width: 200px;">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">Voltage L1 IDX</span>
+                </div>
+                <input type="number" class="form-control" name="domoVL2IDX" value="${config.domoVL2IDX}" min="0" max="65535"/>
+            </div>
+            <div class="m-2 input-group input-group-sm" style="width: 200px;">
+                <div class="input-group-prepend">
+                    <span class="input-group-text">Voltage L1 IDX</span>
+                </div>
+                <input type="number" class="form-control" name="domoVL3IDX" value="${config.domoVL3IDX}" min="0" max="65535"/>
             </div>
         </div>
-    </form>
-</main>
-</body>
-</html>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/web/configmeter.html b/web/configmeter.html
index c545f3b0..a647c283 100644
--- a/web/configmeter.html
+++ b/web/configmeter.html
@@ -1,127 +1,78 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - Meter configuration</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"></script>
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link active" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-               <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <form method="post" action="/save">
-        <input type="hidden" name="meterConfig" value="true"/>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="row">
-                <div class="col-lg-3 col-md-4 col-sm-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Meter type</span>
-                        </div>
-                        <select id="meterType" class="form-control subtitute-dependent" name="meterType">
-                            <option value="0" ${config.meterType0}>Autodetect</option>
-                            <option value="1" ${config.meterType1}>Kaifa</option>
-                            <option value="2" ${config.meterType2}>Aidon</option>
-                            <option value="3" ${config.meterType3}>Kamstrup</option>
-                        </select>
+<form method="post" action="/save">
+    <input type="hidden" name="meterConfig" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="row">
+            <div class="col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Meter type</span>
                     </div>
+                    <select id="meterType" class="form-control subtitute-dependent" name="meterType">
+                        <option value="0" ${config.meterType0}>Autodetect</option>
+                        <option value="1" ${config.meterType1}>Kaifa</option>
+                        <option value="2" ${config.meterType2}>Aidon</option>
+                        <option value="3" ${config.meterType3}>Kamstrup</option>
+                    </select>
                 </div>
-                <div class="col-xl-3 col-lg-4 col-md-5 col-sm-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Distribution system</span>
-                        </div>
-                        <select id="distributionSystem" class="form-control subtitute-dependent" name="distributionSystem">
-                            <option value="0" ${config.distributionSystem0}></option>
-                            <option value="1" ${config.distributionSystem1}>IT (230V)</option>
-                            <option value="2" ${config.distributionSystem2}>TN (400V)</option>
-                        </select>
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-5 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Distribution system</span>
                     </div>
+                    <select id="distributionSystem" class="form-control subtitute-dependent" name="distributionSystem">
+                        <option value="0" ${config.distributionSystem0}></option>
+                        <option value="1" ${config.distributionSystem1}>IT (230V)</option>
+                        <option value="2" ${config.distributionSystem2}>TN (400V)</option>
+                    </select>
                 </div>
-                <div class="col-xl-2 col-md-3 col-sm-5">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Main fuse</span>
-                        </div>
-                        <select class="form-control" name="mainFuse">
-                            <option value="0" ${config.mainFuse0}></option>
-                            <option value="25" ${config.mainFuse25}>25A</option>
-                            <option value="32" ${config.mainFuse32}>32A</option>
-                            <option value="35" ${config.mainFuse32}>35A</option>
-                            <option value="40" ${config.mainFuse40}>40A</option>
-                            <option value="50" ${config.mainFuse50}>50A</option>
-                            <option value="63" ${config.mainFuse63}>63A</option>
-                        </select>
+            </div>
+            <div class="col-xl-2 col-md-3 col-sm-5">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Main fuse</span>
                     </div>
+                    <select class="form-control" name="mainFuse">
+                        <option value="0" ${config.mainFuse0}></option>
+                        <option value="25" ${config.mainFuse25}>25A</option>
+                        <option value="32" ${config.mainFuse32}>32A</option>
+                        <option value="35" ${config.mainFuse32}>35A</option>
+                        <option value="40" ${config.mainFuse40}>40A</option>
+                        <option value="50" ${config.mainFuse50}>50A</option>
+                        <option value="63" ${config.mainFuse63}>63A</option>
+                    </select>
                 </div>
-                <div class="col-xl-3 col-lg-4 col-md-5 col-sm-7">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Production capacity</span>
-                        </div>
-                        <input class="form-control" name="productionCapacity" type="number" min="0" max="50" value="${config.productionCapacity}"/>
-                        <div class="input-group-append">
-                            <span class="input-group-text">kWp</span>
-                        </div>
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-5 col-sm-7">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Production capacity</span>
                     </div>
-                </div>
-                <div id="substitute" class="col-lg-3 col-md-4 col-sm-5">
-                    <div class="m-2">
-                        <label class="small"><input id="substituteMissing" type="checkbox" name="substituteMissing" value="true" ${config.substituteMissing}/> Substitute missing values</label>
+                    <input class="form-control" name="productionCapacity" type="number" min="0" max="50" value="${config.productionCapacity}"/>
+                    <div class="input-group-append">
+                        <span class="input-group-text">kWp</span>
                     </div>
                 </div>
             </div>
-        </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="/" class="btn btn-outline-secondary">Back</a>
+            <div id="substitute" class="col-lg-3 col-md-4 col-sm-5">
+                <div class="m-2">
+                    <label class="small"><input id="substituteMissing" type="checkbox" name="substituteMissing" value="true" ${config.substituteMissing}/> Substitute missing values</label>
+                </div>
             </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-primary">Save</button>
+            <div class="col-lg-3 col-md-4 col-sm-5">
+                <div class="m-2">
+                    <label class="small"><input type="checkbox" name="sendUnknown" value="true" ${config.sendUnknown}/> Send unknown packets to MQTT</label>
+                </div>
             </div>
         </div>
-    </form>
-</main>
-<script>
-    $('.subtitute-dependent').on('change', function() {
-        console.log("test");
-        if($('#meterType').val() == 2 && $('#distributionSystem').val() == 1) {
-            $('#substitute').show();
-        } else {
-            $('#substitute').hide();
-        }
-    });
-    $('#meterType').trigger('change');
-</script>
-</body>
-</html>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/web/configmqtt.html b/web/configmqtt.html
index abab7964..06b7da2d 100644
--- a/web/configmqtt.html
+++ b/web/configmqtt.html
@@ -133,21 +133,3 @@
             </div>
         </div>
     </form>
-<script>
-    $('#mqttEnable').on('change', function() {
-        var inputs = $('.mqtt-config');
-        inputs.prop('disabled', !$(this).is(':checked'));
-    });
-    
-    $('#mqttPayloadFormat').on('change', function() {
-        var val = parseInt($(this).val());
-        if(val == 3)
-            $('.format-type-domoticz').show();
-        else
-            $('.format-type-domoticz').hide();
-    });
-    $(function() {
-        $('#mqttEnable').trigger('change');
-        $('#mqttPayloadFormat').trigger('change');
-    });
-</script>
diff --git a/web/configsystem.html b/web/configsystem.html
index 56fc4f66..b926e308 100644
--- a/web/configsystem.html
+++ b/web/configsystem.html
@@ -1,169 +1,134 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - System configuration</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link " href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link " href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-               <li class="nav-item">
-                    <a class="nav-link active" href="/config-system">System</a>
-                </li>
-             </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <div class="alert alert-warning">!!WARNING!!<br/>Do not change anything here unless you know exactly what you are doing! Changing things here coulds cause the device to stop responding</div>
-    <form method="post" action="/save">
-        <input type="hidden" name="sysConfig" value="true"/>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <h6>GPIO settings</h6>
-            <div class="row">
-                <div class="col-xl-2 col-md-3 col-sm-6 col-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">HAN</span>
+<div class="alert alert-warning">!!WARNING!!<br/>Do not change anything here unless you know exactly what you are doing! Changing things here coulds cause the device to stop responding</div>
+<form method="post" action="/save">
+    <input type="hidden" name="sysConfig" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>GPIO settings</h6>
+        <div class="row">
+            <div class="col-xl-2 col-md-3 col-sm-6 col-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">HAN</span>
+                    </div>
+                    <select name="hanPin" class="form-control">
+                        ${options.han}
+                    </select>
+                </div>
+            </div>
+            <div class="col-xl-2 col-lg-3 col-md-4 col-sm-5 col-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">LED</span>
+                    </div>
+                    <input name="ledPin" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPin}"/>
+                    <div class="input-group-append" title="Inverted">
+                        <label class="input-group-text">
+                            <input type="checkbox" name="ledInverted" value="true" ${config.ledInverted}/> inv
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">RGB</span>
+                    </div>
+                    <input name="ledPinRed" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinRed}"/>
+                    <input name="ledPinGreen" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinGreen}"/>
+                    <input name="ledPinBlue" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinBlue}"/>
+                    <div class="input-group-append" title="Inverted">
+                        <label class="input-group-text">
+                            <input type="checkbox" name="ledRgbInverted" value="true" ${config.ledRgbInverted}/> inv
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-2 col-md-3 col-sm-6 col-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">AP button</span>
+                    </div>
+                    <input name="apPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.apPin}"/>
+                </div>
+            </div>
+            <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6 col-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Temperature</span>
+                    </div>
+                    <input name="tempSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempSensorPin}"/>
+                </div>
+            </div>
+            <div class="col-xl-6 col-lg-8">
+                <div class="row p-2">
+                    <div class="col-sm-3 col-5">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">Vcc</span>
+                            </div>
+                            <input name="vccPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.vccPin}"/>
                         </div>
-                        <select name="hanPin" class="form-control">
-                            ${options.han}
+                    </div>
+                    <div class="col-sm-4 col-7">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">Multiplier</span>
+                            </div>
+                            <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="vccMultiplier" value="${config.vccMultiplier}" />
+                        </div>
+                    </div>
+                    <div class="col-sm-4 col-7">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">Boot limit</span>
+                            </div>
+                            <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="vccBootLimit" value="${config.vccBootLimit}" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>Debugger</h6>
+        <div class="row">
+            <div class="col-xl-2 col-md-3">
+                <label><input type="checkbox" name="debugTelnet" value="true" ${config.debugTelnet}/> Telnet debugger</label>
+            </div>
+            <div class="col-xl-2 col-md-3">
+                <label><input type="checkbox" name="debugSerial" value="true" ${config.debugSerial}/> Serial debugger</label>
+            </div>
+            <div class="col-xl-3 col-md-4">
+                <div class="row form-group">
+                    <label class="col-6">Debug level</label>
+                    <div class="col-6">
+                        <select class="form-control form-control-sm" name="debugLevel">
+                            <option value="2" ${config.debugLevel2}>Debug</option>
+                            <option value="3" ${config.debugLevel3}>Info</option>
+                            <option value="4" ${config.debugLevel4}>Warning</option>
+                            <option value="5" ${config.debugLevel5}>Error</option>
                         </select>
                     </div>
                 </div>
-                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-5 col-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">LED</span>
-                        </div>
-                        <input name="ledPin" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPin}"/>
-                        <div class="input-group-append" title="Inverted">
-                            <label class="input-group-text">
-                                <input type="checkbox" name="ledInverted" value="true" ${config.ledInverted}/> inv
-                            </label>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xl-3 col-lg-4 col-md-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">RGB</span>
-                        </div>
-                        <input name="ledPinRed" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinRed}"/>
-                        <input name="ledPinGreen" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinGreen}"/>
-                        <input name="ledPinBlue" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinBlue}"/>
-                        <div class="input-group-append" title="Inverted">
-                            <label class="input-group-text">
-                                <input type="checkbox" name="ledRgbInverted" value="true" ${config.ledRgbInverted}/> inv
-                            </label>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-2 col-md-3 col-sm-6 col-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">AP button</span>
-                        </div>
-                        <input name="apPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.apPin}"/>
-                    </div>
-                </div>
-                <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6 col-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Temperature</span>
-                        </div>
-                        <input name="tempSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempSensorPin}"/>
-                    </div>
-                </div>
-                <div class="col-xl-6 col-lg-8">
-                    <div class="row p-2">
-                        <div class="col-sm-3 col-5">
-                            <div class="input-group input-group-sm">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text">Vcc</span>
-                                </div>
-                                <input name="vccPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.vccPin}"/>
-                            </div>
-                        </div>
-                        <div class="col-sm-4 col-7">
-                            <div class="input-group input-group-sm">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text">Multiplier</span>
-                                </div>
-                                <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="vccMultiplier" value="${config.vccMultiplier}" />
-                            </div>
-                        </div>
-                        <div class="col-sm-4 col-7">
-                            <div class="input-group input-group-sm">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text">Boot limit</span>
-                                </div>
-                                <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="vccBootLimit" value="${config.vccBootLimit}" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <h6>Debugger</h6>
-            <div class="row">
-                <div class="col-xl-2 col-md-3">
-                    <label><input type="checkbox" name="debugTelnet" value="true" ${config.debugTelnet}/> Telnet debugger</label>
-                </div>
-                <div class="col-xl-2 col-md-3">
-                    <label><input type="checkbox" name="debugSerial" value="true" ${config.debugSerial}/> Serial debugger</label>
-                </div>
-                <div class="col-xl-3 col-md-4">
-                    <div class="row form-group">
-                        <label class="col-6">Debug level</label>
-                        <div class="col-6">
-                            <select class="form-control form-control-sm" name="debugLevel">
-                                <option value="2" ${config.debugLevel2}>Debug</option>
-                                <option value="3" ${config.debugLevel3}>Info</option>
-                                <option value="4" ${config.debugLevel4}>Warning</option>
-                                <option value="5" ${config.debugLevel5}>Error</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <a href="/firmware" class="btn btn-sm btn-outline-secondary">Upload firmware</a>
-        </div>
-        <hr/>
-        <div class="row form-group">
+    </div>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="row">
             <div class="col-6">
-                <a href="/" class="btn btn-outline-secondary">Back</a>
+                <a href="/firmware" class="btn btn-sm btn-outline-secondary">Upload firmware</a>
             </div>
             <div class="col-6 text-right">
-                <button class="btn btn-primary">Save</button>
+                <a href="/reset" class="btn btn-sm btn-danger">Factory reset</a>
             </div>
         </div>
-    </form>
-</main>
-</body>
-</html>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/web/configweb.html b/web/configweb.html
index 85ef2c60..89fbf1de 100644
--- a/web/configweb.html
+++ b/web/configweb.html
@@ -1,97 +1,44 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - Web configuration</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"></script>
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link active" href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <form method="post" action="/save">
-        <input type="hidden" name="authConfig" value="true"/>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="row">
-                <div class="col-xl-3 col-lg-4 col-md-7">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Security</span>
-                        </div>
-                        <select id="authSecurity" class="form-control" name="authSecurity">
-                            <option value="0" ${config.authSecurity0}>None</option>
-                            <option value="1" ${config.authSecurity1}>Only configuration</option>
-                            <option value="2" ${config.authSecurity2}>Everything</option>
-                        </select>
+<form method="post" action="/save">
+    <input type="hidden" name="authConfig" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="row">
+            <div class="col-xl-3 col-lg-4 col-md-7">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Security</span>
                     </div>
+                    <select id="authSecurity" class="form-control" name="authSecurity">
+                        <option value="0" ${config.authSecurity0}>None</option>
+                        <option value="1" ${config.authSecurity1}>Only configuration</option>
+                        <option value="2" ${config.authSecurity2}>Everything</option>
+                    </select>
                 </div>
-                <div class="col-xl-3 col-lg-4 col-md-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Username</span>
-                        </div>
-                        <input type="text" class="form-control auth-config" name="authUser" value="${config.authUser}" maxlength="64"/>
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Username</span>
                     </div>
+                    <input type="text" class="form-control auth-config" name="authUser" value="${config.authUser}" maxlength="64"/>
                 </div>
-                <div class="col-xl-3 col-lg-4 col-md-6">
-                    <div class="m-2 input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Password</span>
-                        </div>
-                        <input type="password" class="form-control auth-config" name="authPassword" value="${config.authPassword}" maxlength="64"/>
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Password</span>
                     </div>
+                    <input type="password" class="form-control auth-config" name="authPassword" value="${config.authPassword}" maxlength="64"/>
                 </div>
             </div>
         </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="/" class="btn btn-outline-secondary">Back</a>
-            </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-primary">Save</button>
-            </div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
         </div>
-    </form>
-</main>
-<script>
-    $('#authSecurity').on('change', function() {
-        var inputs = $('.auth-config');
-        inputs.prop('disabled', $(this).val() == 0);
-    });
-    
-    $(function() {
-        $('#authSecurity').trigger('change');
-    });
-</script>
-</body>
-</html>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/web/configwifi.html b/web/configwifi.html
index 7869a166..578aa501 100644
--- a/web/configwifi.html
+++ b/web/configwifi.html
@@ -1,133 +1,85 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - WiFi configuration</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link active" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <form method="post" action="/save">
-        <input type="hidden" name="wifiConfig" value="true"/>
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="row">
-                <div class="col-xl-3 col-md-6 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">SSID</span>
-                        </div>
-                        <input type="text" name="wifiSsid" class="form-control" maxlength="32" placeholder="Name of your WiFi"  value="${config.wifiSsid}" required/>
+<form method="post" action="/save">
+    <input type="hidden" name="wifiConfig" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="row">
+            <div class="col-xl-3 col-md-6 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">SSID</span>
                     </div>
-                </div>
-                <div class="col-xl-3 col-md-6 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">PSK</span>
-                        </div>
-                        <input type="password" name="wifiPassword" class="form-control" maxlength="63" placeholder="Password for WiFi" value="${config.wifiPassword}" required/>
-                    </div>
-                </div>
-                <div class="col-xl-4 col-md-6 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Hostname</span>
-                        </div>
-                        <input type="text" name="wifiHostname" class="form-control" maxlength="32" pattern="[a-z0-9_-]+" placeholder="Optional, ex.: ams-reader" value="${config.wifiHostname}"/>
-                    </div>
-                </div>
-                <div class="col-xl-2 col-md-6 form-group">
-                    <label><input type="checkbox" name="wifiIpType" value="1" onchange="staticChecked(this);" ${config.wifiStaticIp}/> Static IP</label>
+                    <input type="text" name="wifiSsid" class="form-control" maxlength="32" placeholder="Name of your WiFi"  value="${config.wifiSsid}" required/>
                 </div>
             </div>
-            <div class="row" id="staticIp">
-                <div class="col-xl-3 col-lg-4 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">IP</span>
-                        </div>
-                        <input type="text" name="wifiIp" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex: 192.168.1.200" value="${config.wifiIp}"/>
+            <div class="col-xl-3 col-md-6 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">PSK</span>
                     </div>
+                    <input type="password" name="wifiPassword" class="form-control" maxlength="63" placeholder="Password for WiFi" value="${config.wifiPassword}" required/>
                 </div>
-                <div class="col-xl-3 col-lg-4 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Subnet</span>
-                        </div>
-                        <input type="text" name="wifiSubnet" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 255.255.255.0" value="${config.wifiSubnet}"/>
+            </div>
+            <div class="col-xl-4 col-md-6 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Hostname</span>
                     </div>
+                    <input type="text" name="wifiHostname" class="form-control" maxlength="32" pattern="[a-z0-9_-]+" placeholder="Optional, ex.: ams-reader" value="${config.wifiHostname}"/>
                 </div>
-                <div class="col-xl-3 col-lg-4 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Gateway</span>
-                        </div>
-                        <input type="text" name="wifiGw" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 192.168.1.1" value="${config.wifiGw}"/>
+            </div>
+            <div class="col-xl-2 col-md-6 form-group">
+                <label><input id="wifiIpType" type="checkbox" name="wifiIpType" value="1" ${config.wifiStaticIp}/> Static IP</label>
+            </div>
+        </div>
+        <div class="row" id="staticIp">
+            <div class="col-xl-3 col-lg-4 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">IP</span>
                     </div>
+                    <input type="text" name="wifiIp" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex: 192.168.1.200" value="${config.wifiIp}"/>
                 </div>
-                <div class="col-xl-4 col-lg-5 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Primary DNS</span>
-                        </div>
-                        <input type="text" name="wifiDns1" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 192.168.1.1" value="${config.wifiDns1}"/>
+            </div>
+            <div class="col-xl-3 col-lg-4 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Subnet</span>
                     </div>
+                    <input type="text" name="wifiSubnet" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 255.255.255.0" value="${config.wifiSubnet}"/>
                 </div>
-                <div class="col-xl-4 col-lg-5 form-group">
-                    <div class="input-group input-group-sm">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Secondary DNS</span>
-                        </div>
-                        <input type="text" name="wifiDns2" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 8.8.8.8" value="${config.wifiDns2}"/>
+            </div>
+            <div class="col-xl-3 col-lg-4 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Gateway</span>
                     </div>
+                    <input type="text" name="wifiGw" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 192.168.1.1" value="${config.wifiGw}"/>
+                </div>
+            </div>
+            <div class="col-xl-4 col-lg-5 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Primary DNS</span>
+                    </div>
+                    <input type="text" name="wifiDns1" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 192.168.1.1" value="${config.wifiDns1}"/>
+                </div>
+            </div>
+            <div class="col-xl-4 col-lg-5 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Secondary DNS</span>
+                    </div>
+                    <input type="text" name="wifiDns2" class="form-control" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" placeholder="Ex.: 8.8.8.8" value="${config.wifiDns2}"/>
                 </div>
             </div>
         </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="/" class="btn btn-outline-secondary">Back</a>
-            </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-primary">Save</button>
-            </div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
         </div>
-    </form>
-</main>
-<script>
-    document.getElementById('staticIp').style.display = "none";
-    var staticChecked = function(el) {
-        document.getElementById('staticIp').style.display = el.checked ? "" : "none";
-    }
-</script>
-</body>
-</html>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/web/delete.html b/web/delete.html
index d966ae4f..c03d0859 100644
--- a/web/delete.html
+++ b/web/delete.html
@@ -1,56 +1,14 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - Delete</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
+<form method="post">
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="alert alert-warning">Are you sure you want to delete this file?</div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
         </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <form method="post">
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="alert alert-warning">Are you sure you want to delete this file?</div>
+        <div class="col-6 text-right">
+            <button class="btn btn-danger">Delete</button>
         </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
-            </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-danger">Delete</button>
-            </div>
-        </div>
-    </form>
-</main>
-</body>
-</html>
+    </div>
+</form>
diff --git a/web/foot.html b/web/foot.html
index 98653613..775a564c 100644
--- a/web/foot.html
+++ b/web/foot.html
@@ -1,3 +1,9 @@
 </main>
+
+<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
+<script src="gaugemeter.js"></script>
+<script src="application.js"></script>
+
 </body>
 </html>
diff --git a/web/head.html b/web/head.html
index 103ea372..ee3f1255 100644
--- a/web/head.html
+++ b/web/head.html
@@ -2,9 +2,50 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - WiFi configuration</title>
+    <title>AMS reader</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+    <style>
+        .GaugeMeter {
+            position: Relative;
+            text-align: Center;
+            overflow: Hidden;
+            cursor: Default;
+            display: inline-block;
+        }
+        
+        .GaugeMeter SPAN, .GaugeMeter B {
+            width: 54%;
+            position: Absolute;
+            text-align: Center;
+            display: Inline-Block;
+            color: RGBa(0,0,0,.8);
+            font-weight: 100;
+            font-family: "Open Sans", Arial;
+            overflow: Hidden;
+            white-space: NoWrap;
+            text-overflow: Ellipsis;
+            margin: 0 23%;
+        }
+        
+        .GaugeMeter[data-style="Semi"] B {
+            width: 80%;
+            margin: 0 10%;
+        }
+        
+        .GaugeMeter S, .GaugeMeter U {
+            text-decoration: None;
+            font-size: .60em;
+            font-weight: 200;
+            opacity: .6;
+        }
+        
+        .GaugeMeter B {
+            color: #000;
+            font-weight: 200;
+            opacity: .8;
+        }
+    </style>
 </head>
 <body class="bg-light">
 <main role="main" class="container">
@@ -13,22 +54,28 @@
         <div class="navbar-nav-scroll">
             <ul class="navbar-nav bd-navbar-nav flex-row">
                 <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
+                    <a id="config-meter-link" class="nav-link" href="/config-meter">Meter</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
+                    <a id="config-wifi-link" class="nav-link" href="/config-wifi">WiFi</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
+                    <a id="config-mqtt-link" class="nav-link" href="/config-mqtt">MQTT</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
+                    <a id="config-web-link" class="nav-link" href="/config-web">Web</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
+                    <a id="config-system-link" class="nav-link" href="/config-system">System</a>
                 </li>
             </ul>
         </div>
+        <div class="flex-row ml-md-auto d-md-flex">
+            <div id="esp" class="d-none m-2">ESP</div>
+            <div id="han" class="d-none m-2">HAN</div>
+            <div id="wifi" class="d-none m-2">WiFi</div>
+            <div id="mqtt" class="d-none m-2">MQTT</div>
+        </div>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
             <li class="nav-item">
                 <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
diff --git a/web/index.html b/web/index.html
index 403f4766..a0e9ff7c 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,201 +1,107 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-    <script src="gaugemeter.js"></script>
-    <style>
-    .GaugeMeter {
-        position: Relative;
-        text-align: Center;
-        overflow: Hidden;
-        cursor: Default;
-        display: inline-block;
-    }
-
-    .GaugeMeter SPAN, .GaugeMeter B {
-        width: 54%;
-        position: Absolute;
-        text-align: Center;
-        display: Inline-Block;
-        color: RGBa(0,0,0,.8);
-        font-weight: 100;
-        font-family: "Open Sans", Arial;
-        overflow: Hidden;
-        white-space: NoWrap;
-        text-overflow: Ellipsis;
-        margin: 0 23%;
-    }
-
-    .GaugeMeter[data-style="Semi"] B {
-        width: 80%;
-        margin: 0 10%;
-    }
-
-    .GaugeMeter S, .GaugeMeter U {
-        text-decoration: None;
-        font-size: .60em;
-        font-weight: 200;
-        opacity: .6;
-    }
-
-    .GaugeMeter B {
-        color: #000;
-        font-weight: 200;
-        opacity: .8;
-    }
-    </style>
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row rounded mt-2 mb-4" style="background-color: var(--purple);"> 
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
-        </div>
-      
-        <div class="flex-row ml-md-auto d-md-flex">
-            <div id="esp" class="d-none m-2">ESP</div>
-            <div id="han" class="d-none m-2">HAN</div>
-            <div id="wifi" class="d-none m-2">WiFi</div>
-            <div id="mqtt" class="d-none m-2">MQTT</div>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <div class="my-3 p-3 bg-white rounded shadow">
-        <div class="row">
-            <div class="col-md-3">
-                <div class="text-center">
-                    <div id="P" class="SimpleMeter" style="display: inline;">
-                        ${data.P} W
-                    </div>
-                    <div id="importMeter" class="GaugeMeter rounded"
-                        style="display: none;"
-                        data-size="200px"
-                        data-text_size="0.11"
-                        data-width="25"
-                        data-style="Arch"
-                        data-theme="Green-Gold-Red"
-                        data-animationstep="0"
-                        data-label="${text.import}"
-                    ></div>
+<div class="my-3 p-3 bg-white rounded shadow">
+    <div class="row">
+        <div class="col-md-3">
+            <div class="text-center">
+                <div id="P" class="SimpleMeter" style="display: inline;">
+                    ${data.P} W
                 </div>
+                <div id="importMeter" class="GaugeMeter rounded"
+                    style="display: none;"
+                    data-size="200px"
+                    data-text_size="0.11"
+                    data-width="25"
+                    data-style="Arch"
+                    data-theme="Green-Gold-Red"
+                    data-animationstep="0"
+                    data-label="${text.import}"
+                ></div>
             </div>
-            <div class="col-md-3">
-                <div id="U1-row" class="row" style="display: ${display.P1};">
-                    <div class="col-2">L1</div>
-                    <div class="col-5 text-right"><span id="U1">${data.U1}</span> V</div>
-                    <div class="col-5 text-right"><span id="I1">${data.I1}</span> A</div>
-                </div>
-                <div id="U2-row" class="row" style="display: ${display.P2};">
-                    <div class="col-2">L2</div>
-                    <div class="col-5 text-right"><span id="U2">${data.U2}</span> V</div>
-                    <div class="col-5 text-right"><span id="I2">${data.I2}</span> A</div>
-                </div>
-                <div id="U3-row" class="row" style="display: ${display.P3};">
-                    <div class="col-2">L3</div>
-                    <div class="col-5 text-right"><span id="U3">${data.U3}</span> V</div>
-                    <div class="col-5 text-right"><span id="I3">${data.I3}</span> A</div>
-                </div>
-                <hr/>
-                <div id="tPI-row" class="row" style="display: ${display.accumulative};">
-                    <div class="col-6">Active in</div>
-                    <div class="col-6 text-right"><span id="tPI">${data.tPI}</span> kWh</div>
-                </div>
-                <div id="tPO-row" class="row" style="display: ${display.accumulative};">
-                    <div class="col-6">Active out</div>
-                    <div class="col-6 text-right"><span id="tPO">${data.tPO}</span> kWh</div>
-                </div>
-                <div id="tQI-row" class="row" style="display: ${display.accumulative};">
-                    <div class="col-6">Reactive in</div>
-                    <div class="col-6 text-right"><span id="tQI">${data.tQI}</span> kvarh</div>
-                </div>
-                <div id="tQO-row" class="row" style="display: ${display.accumulative};">
-                    <div class="col-6">Reactive out</div>
-                    <div class="col-6 text-right"><span id="tQO">${data.tQO}</span> kvarh</div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="text-center" style="display: ${display.export};">
-                    <div id="P" class="SimpleMeter" style="display: inline;">
-                        ${data.PO} W
-                    </div>
-                    <div id="exportMeter" class="GaugeMeter rounded"
-                        style="display: none;"
-                        data-size="200px"
-                        data-text_size="0.11"
-                        data-width="25"
-                        data-style="Arch"
-                        data-theme="DarkGreen-LightGreen"
-                        data-animationstep="0"
-                        data-label="Export"
-                    ></div>
-                </div>
         </div>
-            <div class="col-md-3">
-                <hr class="d-md-inline"/>
-                <div class="row">
-                    <div class="col-6">Vcc</div>
-                    <div class="col-6 text-right"><span id="vcc">${vcc}</span> V</div>
-                </div>
-                <div class="row" style="display: ${display.temp};">
-                    <div class="col-6">Temperature</div>
-                    <div class="col-6 text-right"><span id="temp">${temp}</span> °C</div>
-                </div>
-                <div class="row" style="display: none;">
-                    <div class="col-6">Uptime</div>
-                    <div class="col-6 text-right"><span id="currentMillis">${currentMillis}</span></div>
-                </div>
-                <hr/>
-                <div class="row">
-                    <div class="col-6">SSID</div>
-                    <div class="col-6 text-right"><span id="ssid">${wifi.ssid}</span></div>
-                </div>
-                <div class="row">
-                    <div class="col-6">Channel</div>
-                    <div class="col-6 text-right"><span id="channel">${wifi.channel}</span></div>
-                </div>
-                <div class="row">
-                    <div class="col-6">RSSI</div>
-                    <div class="col-6 text-right"><span id="rssi">${wifi.rssi}</span> dBm</div>
-                </div>
-                <hr class="d-none mqtt-error mqtt-error-1 mqtt-error-2 mqtt-error-3 mqtt-error-4 mqtt-error-5 mqtt-error-6 mqtt-error-7 mqtt-error-8 mqtt-error-9 mqtt-error-10 mqtt-error-11 mqtt-error-12 mqtt-error-13"/>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-1 mqtt-error-2 mqtt-error-5 mqtt-error-6 mqtt-error-7 mqtt-error-8 mqtt-error-9 mqtt-error-12">MQTT communication error (<span id="mqtt-lastError">-</span>)</div>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-3">MQTT failed to connect</div>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-4">MQTT network timeout</div>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-10">MQTT connection denied</div>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-11">MQTT failed to subscribe</div>
-                <div class="d-none badge badge-danger mqtt-error mqtt-error-13">MQTT lost connection</div>
+        <div class="col-md-3">
+            <div id="U1-row" class="row" style="display: ${display.P1};">
+                <div class="col-2">L1</div>
+                <div class="col-5 text-right"><span id="U1">${data.U1}</span> V</div>
+                <div class="col-5 text-right"><span id="I1">${data.I1}</span> A</div>
             </div>
+            <div id="U2-row" class="row" style="display: ${display.P2};">
+                <div class="col-2">L2</div>
+                <div class="col-5 text-right"><span id="U2">${data.U2}</span> V</div>
+                <div class="col-5 text-right"><span id="I2">${data.I2}</span> A</div>
+            </div>
+            <div id="U3-row" class="row" style="display: ${display.P3};">
+                <div class="col-2">L3</div>
+                <div class="col-5 text-right"><span id="U3">${data.U3}</span> V</div>
+                <div class="col-5 text-right"><span id="I3">${data.I3}</span> A</div>
+            </div>
+            <hr/>
+            <div id="tPI-row" class="row" style="display: ${display.accumulative};">
+                <div class="col-6">Active in</div>
+                <div class="col-6 text-right"><span id="tPI">${data.tPI}</span> kWh</div>
+            </div>
+            <div id="tPO-row" class="row" style="display: ${display.accumulative};">
+                <div class="col-6">Active out</div>
+                <div class="col-6 text-right"><span id="tPO">${data.tPO}</span> kWh</div>
+            </div>
+            <div id="tQI-row" class="row" style="display: ${display.accumulative};">
+                <div class="col-6">Reactive in</div>
+                <div class="col-6 text-right"><span id="tQI">${data.tQI}</span> kvarh</div>
+            </div>
+            <div id="tQO-row" class="row" style="display: ${display.accumulative};">
+                <div class="col-6">Reactive out</div>
+                <div class="col-6 text-right"><span id="tQO">${data.tQO}</span> kvarh</div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="text-center" style="display: ${display.export};">
+                <div id="P" class="SimpleMeter" style="display: inline;">
+                    ${data.PO} W
+                </div>
+                <div id="exportMeter" class="GaugeMeter rounded"
+                    style="display: none;"
+                    data-size="200px"
+                    data-text_size="0.11"
+                    data-width="25"
+                    data-style="Arch"
+                    data-theme="DarkGreen-LightGreen"
+                    data-animationstep="0"
+                    data-label="Export"
+                ></div>
+            </div>
+    </div>
+        <div class="col-md-3">
+            <hr class="d-md-inline"/>
+            <div class="row">
+                <div class="col-6">Vcc</div>
+                <div class="col-6 text-right"><span id="vcc">${vcc}</span> V</div>
+            </div>
+            <div class="row" style="display: ${display.temp};">
+                <div class="col-6">Temperature</div>
+                <div class="col-6 text-right"><span id="temp">${temp}</span> °C</div>
+            </div>
+            <div class="row" style="display: none;">
+                <div class="col-6">Uptime</div>
+                <div class="col-6 text-right"><span id="currentMillis">${currentMillis}</span></div>
+            </div>
+            <hr/>
+            <div class="row">
+                <div class="col-6">SSID</div>
+                <div class="col-6 text-right"><span id="ssid">${wifi.ssid}</span></div>
+            </div>
+            <div class="row">
+                <div class="col-6">Channel</div>
+                <div class="col-6 text-right"><span id="channel">${wifi.channel}</span></div>
+            </div>
+            <div class="row">
+                <div class="col-6">RSSI</div>
+                <div class="col-6 text-right"><span id="rssi">${wifi.rssi}</span> dBm</div>
+            </div>
+            <hr class="d-none mqtt-error mqtt-error-1 mqtt-error-2 mqtt-error-3 mqtt-error-4 mqtt-error-5 mqtt-error-6 mqtt-error-7 mqtt-error-8 mqtt-error-9 mqtt-error-10 mqtt-error-11 mqtt-error-12 mqtt-error-13"/>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-1 mqtt-error-2 mqtt-error-5 mqtt-error-6 mqtt-error-7 mqtt-error-8 mqtt-error-9 mqtt-error-12">MQTT communication error (<span id="mqtt-lastError">-</span>)</div>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-3">MQTT failed to connect</div>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-4">MQTT network timeout</div>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-10">MQTT connection denied</div>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-11">MQTT failed to subscribe</div>
+            <div class="d-none badge badge-danger mqtt-error mqtt-error-13">MQTT lost connection</div>
         </div>
     </div>
-</main>
-<script src="index.js"></script>
-</body>
-</html>
+</div>
diff --git a/web/reset.html b/web/reset.html
new file mode 100644
index 00000000..1438eb21
--- /dev/null
+++ b/web/reset.html
@@ -0,0 +1,14 @@
+<form method="post">
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="alert alert-danger">Are you sure you want reset this device to factory settings? ALL configuration will be erased!</div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-danger" name="perform" value="true">Perform factory reset</button>
+        </div>
+    </div>
+</form>
diff --git a/web/restartwait.html b/web/restartwait.html
index 1a705ecc..251a6433 100644
--- a/web/restartwait.html
+++ b/web/restartwait.html
@@ -53,7 +53,7 @@
         xhr.addEventListener('load', function(e) {
             window.location.href = url ? url : "/";
         });
-        xhr.open("GET", "/is-alive", true);
+        xhr.open("GET", url + "/is-alive", true);
         xhr.send();
     };
     setTimeout(fetch, 10000);
diff --git a/web/upload.html b/web/upload.html
index 706366fd..a7e34af9 100644
--- a/web/upload.html
+++ b/web/upload.html
@@ -1,77 +1,32 @@
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AMS reader - Upload</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
-</head>
-<body class="bg-light">
-<main role="main" class="container">
-    <header class="navbar navbar-expand navbar-dark flex-column flex-md-row bg-purple rounded mt-2 mb-4" style="background-color: var(--purple);">
-        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
-        <div class="navbar-nav-scroll">
-            <ul class="navbar-nav bd-navbar-nav flex-row">
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-meter">Meter</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-wifi">WiFi</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-mqtt">MQTT</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-web">Web</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/config-system">System</a>
-                </li>
-            </ul>
-        </div>
-        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
-            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
-                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
-                </a>
-            </li>
-        </ul>
-    </header>
-    <form method="post" enctype="multipart/form-data">
-        <div class="my-3 p-3 bg-white rounded shadow">
-            <div class="row">
-                <div class="col-lg-6">
-                    <div class="input-group mb-3">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text">Upload</span>
-                        </div>
-                        <div class="custom-file">
-                            <input name="file" type="file" class="custom-file-input" id="inputGroupFile01">
-                            <label class="custom-file-label" for="inputGroupFile01">Choose file</label>
-                        </div>
+<form method="post" enctype="multipart/form-data">
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <div class="row">
+            <div class="col-lg-6">
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Upload</span>
+                    </div>
+                    <div class="custom-file">
+                        <input name="file" type="file" class="custom-file-input" id="inputGroupFile01">
+                        <label class="custom-file-label" for="inputGroupFile01">Choose file</label>
                     </div>
-                    <script>
-                        $('#inputGroupFile01').on('change',function(){
-                            var fileName = $(this).val();
-                            $(this).next('.custom-file-label').html(fileName);
-                        })
-                    </script>
                 </div>
+                <script>
+                    $('#inputGroupFile01').on('change',function(){
+                        var fileName = $(this).val();
+                        $(this).next('.custom-file-label').html(fileName);
+                    })
+                </script>
             </div>
         </div>
-        <hr/>
-        <div class="row form-group">
-            <div class="col-6">
-                <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
-            </div>
-            <div class="col-6 text-right">
-                <button class="btn btn-primary">Upload</button>
-            </div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
         </div>
-    </form>
-</main>
-</body>
-</html>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Upload</button>
+        </div>
+    </div>
+</form>