diff --git a/lib/AmsConfiguration/src/AmsConfiguration.cpp b/lib/AmsConfiguration/src/AmsConfiguration.cpp
index e331e67d..0e174bb1 100644
--- a/lib/AmsConfiguration/src/AmsConfiguration.cpp
+++ b/lib/AmsConfiguration/src/AmsConfiguration.cpp
@@ -358,8 +358,9 @@ bool AmsConfiguration::pinUsed(uint8_t pin, GpioConfig& config) {
 }
 
 bool AmsConfiguration::getGpioConfig(GpioConfig& config) {
-	if(hasConfig()) {
-		EEPROM.begin(EEPROM_SIZE);
+	EEPROM.begin(EEPROM_SIZE);
+	uint8_t configVersion = EEPROM.read(EEPROM_CONFIG_ADDRESS);
+	if(configVersion == EEPROM_CHECK_SUM || configVersion == EEPROM_CLEARED_INDICATOR) {
 		EEPROM.get(CONFIG_GPIO_START, config);
 		EEPROM.end();
 		return true;
diff --git a/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte b/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
index 29bc503d..f0a0c911 100644
--- a/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
@@ -7,6 +7,7 @@
     import HelpIcon from './HelpIcon.svelte';
     import CountrySelectOptions from './CountrySelectOptions.svelte';
     import { Link, navigate } from 'svelte-navigator';
+    import SubnetOptions from './SubnetOptions.svelte';
     
 
     export let sysinfo = {}
@@ -362,11 +363,9 @@
                         <option value="dhcp">DHCP</option>
                         <option value="static">Static</option>
                     </select>
-                    <input name="ni" bind:value={configuration.n.i} type="text" class="in-m w-full" disabled={configuration.n.m == 'dhcp'}/>
-                    <select name="ns" bind:value={configuration.n.s} class="in-l" disabled={configuration.n.m == 'dhcp'}>
-                        <option value="255.255.255.0">/24</option>
-                        <option value="255.255.0.0">/16</option>
-                        <option value="255.0.0.0">/8</option>
+                    <input name="ni" bind:value={configuration.n.i} type="text" class="in-m w-full" disabled={configuration.n.m == 'dhcp'} required={configuration.n.m == 'static'}/>
+                    <select name="ns" bind:value={configuration.n.s} class="in-l" disabled={configuration.n.m == 'dhcp'} required={configuration.n.m == 'static'}>
+                        <SubnetOptions/>
                     </select>
                 </div>
             </div>
diff --git a/lib/SvelteUi/app/src/lib/Dashboard.svelte b/lib/SvelteUi/app/src/lib/Dashboard.svelte
index 8cc35c26..01a939fc 100644
--- a/lib/SvelteUi/app/src/lib/Dashboard.svelte
+++ b/lib/SvelteUi/app/src/lib/Dashboard.svelte
@@ -48,7 +48,7 @@
         <div class="cnt">
             <div class="grid grid-cols-2">
                 <div class="col-span-2">
-                    <PowerGauge val={data.e ? data.e : 0} max={data.om ? data.om : 10000} unit="W" label="Export"/>
+                    <PowerGauge val={data.e ? data.e : 0} max={data.om ? data.om * 1000 : 10000} unit="W" label="Export"/>
                 </div>
                 <div></div>
                 <div class="text-right">{data.ec ? data.ec.toFixed(1) : '-'} kWh</div>
diff --git a/lib/SvelteUi/app/src/lib/PowerGauge.svelte b/lib/SvelteUi/app/src/lib/PowerGauge.svelte
index 65cc757f..923139f3 100644
--- a/lib/SvelteUi/app/src/lib/PowerGauge.svelte
+++ b/lib/SvelteUi/app/src/lib/PowerGauge.svelte
@@ -8,10 +8,15 @@
     export let label;
     export let sub = "";
     export let subunit = "";
+
+    let pct = 0;
+    $: {
+        pct = (Math.min(val,max)/max) * 100
+    }
 </script>
 
 <div class="pl-root">
-    <PowerGaugeSvg pct={val/max * 100} color={ampcol(val/max * 100)}/>
+    <PowerGaugeSvg pct={pct} color={ampcol(pct)}/>
     <span class="pl-ov">
         <span class="pl-lab">{label}</span>
         <br/>
diff --git a/lib/SvelteUi/app/src/lib/SetupPanel.svelte b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
index d1ef3c36..0d9a4b39 100644
--- a/lib/SvelteUi/app/src/lib/SetupPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
@@ -1,6 +1,7 @@
 <script>
     import { sysinfoStore } from './DataStores.js';
     import Mask from './Mask.svelte'
+    import SubnetOptions from './SubnetOptions.svelte';
 
     export let sysinfo = {}
 
@@ -92,9 +93,7 @@
                 <div class="flex">
                     <input name="si" type="text" class="in-f w-full" required={staticIp}/>
                     <select name="su" class="in-l" required={staticIp}>
-                        <option value="255.255.255.0">/24</option>
-                        <option value="255.255.0.0">/16</option>
-                        <option value="255.0.0.0">/8</option>
+                        <SubnetOptions/>
                     </select>
                 </div>
                 {/if}
diff --git a/lib/SvelteUi/app/src/lib/SubnetOptions.svelte b/lib/SvelteUi/app/src/lib/SubnetOptions.svelte
new file mode 100644
index 00000000..065c8a0b
--- /dev/null
+++ b/lib/SvelteUi/app/src/lib/SubnetOptions.svelte
@@ -0,0 +1,16 @@
+<optgroup label="Most common is /24 (255.255.255.0)">
+    <option value="255.255.255.0">/24</option>
+</optgroup>
+<optgroup label="Smaller subnets">
+    <option value="255.255.255.128">/25</option>
+    <option value="255.255.255.192">/26</option>
+    <option value="255.255.255.224">/27</option>
+    <option value="255.255.255.240">/28</option>
+    <option value="255.255.255.248">/29</option>
+</optgroup>
+<optgroup label="Larger subnets">
+    <option value="255.255.254.0">/23</option>
+    <option value="255.255.252.0">/22</option>
+    <option value="255.255.0.0">/16</option>
+</optgroup>
+