diff --git a/src/se/hal/HalServer.java b/src/se/hal/HalServer.java
index f6194f72..1b50c498 100755
--- a/src/se/hal/HalServer.java
+++ b/src/se/hal/HalServer.java
@@ -2,7 +2,7 @@ package se.hal;
 
 
 import se.hal.intf.HalDaemon;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.intf.HalJsonPage;
 import se.hal.page.*;
 import se.hal.struct.Event;
@@ -29,7 +29,7 @@ public class HalServer {
     private static List<HalDaemon> daemons = new ArrayList<>();
 
     private static HttpServer http;
-    private static List<HalHttpPage> pages = new ArrayList<>();
+    private static List<HalWebPage> pages = new ArrayList<>();
 
 
 
@@ -68,17 +68,18 @@ public class HalServer {
             registerDaemon(it.next());
 
 
-        // init http server
-        HalHttpPage.getRootNav().createSubNav("Sensors");
-        HalHttpPage.getRootNav().createSubNav("Events").setWeight(100);
+        // Init http server
+        HalWebPage.getRootNav().createSubNav("Sensors");
+        HalWebPage.getRootNav().createSubNav("Events").setWeight(100);
+        HalWebPage.getRootNav().createSubNav("Settings").setWeight(200);
 
         http = new HttpServer(HalContext.getIntegerProperty("http_port"));
         http.setDefaultPage(new HttpFilePage(FileUtil.find("resource/web/")));
         http.setPage("/", new HttpRedirectPage("/map"));
         http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance());
-        for (Iterator<HalHttpPage> it = pluginManager.getObjectIterator(HalJsonPage.class); it.hasNext(); )
+        for (Iterator<HalWebPage> it = pluginManager.getObjectIterator(HalJsonPage.class); it.hasNext(); )
             registerPage(it.next());
-        for (Iterator<HalHttpPage> it=pluginManager.getObjectIterator(HalHttpPage.class); it.hasNext(); )
+        for (Iterator<HalWebPage> it = pluginManager.getObjectIterator(HalWebPage.class); it.hasNext(); )
             registerPage(it.next());
         http.start();
     }
@@ -88,7 +89,7 @@ public class HalServer {
         daemons.add(daemon);
         daemon.initiate(daemonExecutor);
     }
-    public static void registerPage(HalHttpPage page){
+    public static void registerPage(HalWebPage page){
         pages.add(page);
         http.setPage(page.getId(), page);
     }
diff --git a/src/se/hal/intf/HalJsonPage.java b/src/se/hal/intf/HalJsonPage.java
index 35dd174a..68a10d4d 100755
--- a/src/se/hal/intf/HalJsonPage.java
+++ b/src/se/hal/intf/HalJsonPage.java
@@ -2,7 +2,6 @@ package se.hal.intf;
 
 import zutil.log.LogUtil;
 import zutil.net.http.HttpHeader;
-import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.DataNode;
 import zutil.parser.Templator;
@@ -16,7 +15,7 @@ import java.util.logging.Logger;
 /**
  * A interface defining a Hal json endpoint
  */
-public abstract class HalJsonPage extends HalHttpPage{
+public abstract class HalJsonPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
 
     public HalJsonPage(String id) {
diff --git a/src/se/hal/intf/HalHttpPage.java b/src/se/hal/intf/HalWebPage.java
old mode 100755
new mode 100644
similarity index 96%
rename from src/se/hal/intf/HalHttpPage.java
rename to src/se/hal/intf/HalWebPage.java
index 45a66c29..d3671c07
--- a/src/se/hal/intf/HalHttpPage.java
+++ b/src/se/hal/intf/HalWebPage.java
@@ -16,7 +16,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-public abstract class HalHttpPage implements HttpPage{
+public abstract class HalWebPage implements HttpPage{
     private static final String TEMPLATE = "resource/web/main_index.tmpl";
     private static Navigation rootNav = Navigation.createRootNav();
     private static Navigation userNav = Navigation.createRootNav();
@@ -24,7 +24,7 @@ public abstract class HalHttpPage implements HttpPage{
     private String pageId;
     private boolean showSubNav;
 
-    public HalHttpPage(String id){
+    public HalWebPage(String id){
         this.pageId = id;
         this.showSubNav = true;
     }
diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigWebPage.java
old mode 100755
new mode 100644
similarity index 97%
rename from src/se/hal/page/EventConfigHttpPage.java
rename to src/se/hal/page/EventConfigWebPage.java
index 15764928..ce7ab682
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigWebPage.java
@@ -2,7 +2,7 @@ package se.hal.page;
 
 import se.hal.ControllerManager;
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.page.HalAlertManager.AlertLevel;
 import se.hal.page.HalAlertManager.AlertTTL;
 import se.hal.page.HalAlertManager.HalAlert;
@@ -19,14 +19,14 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class EventConfigHttpPage extends HalHttpPage {
+public class EventConfigWebPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
     private static final String TEMPLATE = "resource/web/event_config.tmpl";
 
     private ArrayList<ClassConfigurationData> eventConfigurations;
 
 
-    public EventConfigHttpPage() {
+    public EventConfigWebPage() {
         super("event_config");
         super.getRootNav().createSubNav("Settings").createSubNav(this.getId(), "Event Settings").setWeight(100);
 
diff --git a/src/se/hal/page/EventOverviewHttpPage.java b/src/se/hal/page/EventOverviewWebPage.java
old mode 100755
new mode 100644
similarity index 92%
rename from src/se/hal/page/EventOverviewHttpPage.java
rename to src/se/hal/page/EventOverviewWebPage.java
index b3be3b8a..da52a70c
--- a/src/se/hal/page/EventOverviewHttpPage.java
+++ b/src/se/hal/page/EventOverviewWebPage.java
@@ -2,10 +2,7 @@ package se.hal.page;
 
 import se.hal.ControllerManager;
 import se.hal.HalContext;
-import se.hal.intf.HalEventConfig;
-import se.hal.intf.HalEventData;
-import se.hal.intf.HalHttpPage;
-import se.hal.struct.AbstractDevice;
+import se.hal.intf.HalWebPage;
 import se.hal.struct.Event;
 import se.hal.struct.devicedata.SwitchEventData;
 import se.hal.util.DeviceNameComparator;
@@ -23,14 +20,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class EventOverviewHttpPage extends HalHttpPage {
+public class EventOverviewWebPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
     private static final int HISTORY_LIMIT = 200;
     private static final String OVERVIEW_TEMPLATE = "resource/web/event_overview.tmpl";
     private static final String DETAIL_TEMPLATE = "resource/web/event_detail.tmpl";
 
 
-    public EventOverviewHttpPage(){
+    public EventOverviewWebPage(){
         super("event_overview");
         super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Overview");
     }
diff --git a/src/se/hal/page/MapHttpPage.java b/src/se/hal/page/MapWebPage.java
old mode 100755
new mode 100644
similarity index 96%
rename from src/se/hal/page/MapHttpPage.java
rename to src/se/hal/page/MapWebPage.java
index ed22dcfc..266a7979
--- a/src/se/hal/page/MapHttpPage.java
+++ b/src/se/hal/page/MapWebPage.java
@@ -1,7 +1,7 @@
 package se.hal.page;
 
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import zutil.io.file.FileUtil;
 import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPrintStream;
@@ -16,14 +16,14 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Map;
 
-public class MapHttpPage extends HalHttpPage {
+public class MapWebPage extends HalWebPage {
     private static final String TEMPLATE = "resource/web/map.tmpl";
 
     private String bgType;
     private byte[] bgImage;
 
 
-    public MapHttpPage() {
+    public MapWebPage() {
         super("map");
         super.getRootNav().createSubNav(this.getId(), "Map").setWeight(-100);
         super.showSubNav(false);
diff --git a/src/se/hal/page/PCHeatMapHttpPage.java b/src/se/hal/page/PCHeatMapWebPage.java
old mode 100755
new mode 100644
similarity index 80%
rename from src/se/hal/page/PCHeatMapHttpPage.java
rename to src/se/hal/page/PCHeatMapWebPage.java
index 6d25b87b..8831e047
--- a/src/se/hal/page/PCHeatMapHttpPage.java
+++ b/src/se/hal/page/PCHeatMapWebPage.java
@@ -1,17 +1,16 @@
 package se.hal.page;
 
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import zutil.io.file.FileUtil;
-import zutil.net.http.HttpHeader;
 import zutil.parser.Templator;
 
 import java.util.Map;
 
-public class PCHeatMapHttpPage extends HalHttpPage {
+public class PCHeatMapWebPage extends HalWebPage {
     private static final String TEMPLATE = "resource/web/pc_heatmap.tmpl";
 
 
-    public PCHeatMapHttpPage() {
+    public PCHeatMapWebPage() {
         super("pc_heatmap");
         super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Heatmap").setWeight(60);
     }
diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewWebPage.java
old mode 100755
new mode 100644
similarity index 88%
rename from src/se/hal/page/PCOverviewHttpPage.java
rename to src/se/hal/page/PCOverviewWebPage.java
index 255cd276..aac6ed5e
--- a/src/se/hal/page/PCOverviewHttpPage.java
+++ b/src/se/hal/page/PCOverviewWebPage.java
@@ -1,7 +1,7 @@
 package se.hal.page;
 
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
@@ -11,10 +11,10 @@ import zutil.parser.Templator;
 import java.util.List;
 import java.util.Map;
 
-public class PCOverviewHttpPage extends HalHttpPage {
+public class PCOverviewWebPage extends HalWebPage {
     private static final String TEMPLATE = "resource/web/pc_overview.tmpl";
 
-    public PCOverviewHttpPage() {
+    public PCOverviewWebPage() {
         super("pc_overview");
         super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Power;Challenge").setWeight(50);
     }
diff --git a/src/se/hal/page/PropertySettingsPage.java b/src/se/hal/page/PropertyConfigWebPage.java
similarity index 54%
rename from src/se/hal/page/PropertySettingsPage.java
rename to src/se/hal/page/PropertyConfigWebPage.java
index 53ac2a28..cc0906ff 100644
--- a/src/se/hal/page/PropertySettingsPage.java
+++ b/src/se/hal/page/PropertyConfigWebPage.java
@@ -1,30 +1,20 @@
 package se.hal.page;
 
-import se.hal.ControllerManager;
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
-import se.hal.struct.Event;
-import se.hal.struct.devicedata.SwitchEventData;
-import se.hal.util.DeviceNameComparator;
-import se.hal.util.HistoryDataListSqlResult;
-import se.hal.util.HistoryDataListSqlResult.HistoryData;
-import zutil.ObjectUtil;
+import se.hal.intf.HalWebPage;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
-import zutil.log.LogUtil;
 import zutil.parser.Templator;
 
-import java.sql.PreparedStatement;
 import java.util.*;
-import java.util.logging.Logger;
 
-public class PropertySettingsPage extends HalHttpPage {
+public class PropertyConfigWebPage extends HalWebPage {
     private static final String TEMPLATE = "resource/web/properties_config.tmpl";
 
 
-    public PropertySettingsPage(){
+    public PropertyConfigWebPage(){
         super("properties");
-        super.getRootNav().createSubNav("Settings").setWeight(100).createSubNav(this.getId(), "Properties");
+        super.getRootNav().createSubNav("Settings").createSubNav(this.getId(), "Properties");
     }
 
     @Override
diff --git a/src/se/hal/page/SensorConfigHttpPage.java b/src/se/hal/page/SensorConfigWebPage.java
old mode 100755
new mode 100644
similarity index 98%
rename from src/se/hal/page/SensorConfigHttpPage.java
rename to src/se/hal/page/SensorConfigWebPage.java
index 147eb1df..941fbe83
--- a/src/se/hal/page/SensorConfigHttpPage.java
+++ b/src/se/hal/page/SensorConfigWebPage.java
@@ -2,7 +2,7 @@ package se.hal.page;
 
 import se.hal.ControllerManager;
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.page.HalAlertManager.AlertLevel;
 import se.hal.page.HalAlertManager.AlertTTL;
 import se.hal.page.HalAlertManager.HalAlert;
@@ -19,14 +19,14 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class SensorConfigHttpPage extends HalHttpPage {
+public class SensorConfigWebPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
     private static final String TEMPLATE = "resource/web/sensor_config.tmpl";
 
     private ArrayList<ClassConfigurationData> sensorConfigurations;
 
 
-    public SensorConfigHttpPage() {
+    public SensorConfigWebPage() {
         super("sensor_config");
         super.getRootNav().createSubNav("Settings").createSubNav(this.getId(), "Sensor Settings").setWeight(100);
 
diff --git a/src/se/hal/page/SensorOverviewHttpPage.java b/src/se/hal/page/SensorOverviewWebPage.java
old mode 100755
new mode 100644
similarity index 93%
rename from src/se/hal/page/SensorOverviewHttpPage.java
rename to src/se/hal/page/SensorOverviewWebPage.java
index 0ee1b63c..f284e0b3
--- a/src/se/hal/page/SensorOverviewHttpPage.java
+++ b/src/se/hal/page/SensorOverviewWebPage.java
@@ -1,8 +1,7 @@
 package se.hal.page;
 
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
-import se.hal.struct.Event;
+import se.hal.intf.HalWebPage;
 import se.hal.struct.Sensor;
 import se.hal.util.DeviceNameComparator;
 import se.hal.util.HistoryDataListSqlResult;
@@ -17,13 +16,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-public class SensorOverviewHttpPage extends HalHttpPage {
+public class SensorOverviewWebPage extends HalWebPage {
     private static final int HISTORY_LIMIT = 200;
     private static final String OVERVIEW_TEMPLATE = "resource/web/sensor_overview.tmpl";
     private static final String DETAIL_TEMPLATE = "resource/web/sensor_detail.tmpl";
 
 
-    public SensorOverviewHttpPage(){
+    public SensorOverviewWebPage(){
         super("sensor_overview");
         super.getRootNav().createSubNav("Sensors").createSubNav(this.getId(), "Overview");
     }
diff --git a/src/se/hal/page/TriggerHttpPage.java b/src/se/hal/page/TriggerWebPage.java
old mode 100755
new mode 100644
similarity index 98%
rename from src/se/hal/page/TriggerHttpPage.java
rename to src/se/hal/page/TriggerWebPage.java
index 1246c206..1745bc8e
--- a/src/se/hal/page/TriggerHttpPage.java
+++ b/src/se/hal/page/TriggerWebPage.java
@@ -2,7 +2,7 @@ package se.hal.page;
 
 import se.hal.HalContext;
 import se.hal.TriggerManager;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.struct.Action;
 import se.hal.struct.ClassConfigurationData;
 import se.hal.struct.Trigger;
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class TriggerHttpPage extends HalHttpPage {
+public class TriggerWebPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
     private static final String TEMPLATE = "resource/web/trigger.tmpl";
 
@@ -25,7 +25,7 @@ public class TriggerHttpPage extends HalHttpPage {
     private ArrayList<ClassConfigurationData> actionConfigurators;
 
 
-    public TriggerHttpPage() {
+    public TriggerWebPage() {
         super("trigger");
         super.getRootNav().createSubNav("Events").createSubNav(this.getId(), "Triggers");
 
diff --git a/src/se/hal/page/UserConfigHttpPage.java b/src/se/hal/page/UserConfigWebPage.java
old mode 100755
new mode 100644
similarity index 94%
rename from src/se/hal/page/UserConfigHttpPage.java
rename to src/se/hal/page/UserConfigWebPage.java
index 146e540c..caf21f7f
--- a/src/se/hal/page/UserConfigHttpPage.java
+++ b/src/se/hal/page/UserConfigWebPage.java
@@ -1,7 +1,7 @@
 package se.hal.page;
 
 import se.hal.HalContext;
-import se.hal.intf.HalHttpPage;
+import se.hal.intf.HalWebPage;
 import se.hal.page.HalAlertManager.AlertLevel;
 import se.hal.page.HalAlertManager.AlertTTL;
 import se.hal.page.HalAlertManager.HalAlert;
@@ -14,12 +14,12 @@ import zutil.parser.Templator;
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class UserConfigHttpPage extends HalHttpPage {
+public class UserConfigWebPage extends HalWebPage {
     private static final Logger logger = LogUtil.getLogger();
     private static final String TEMPLATE = "resource/web/user_config.tmpl";
 
 
-    public UserConfigHttpPage() {
+    public UserConfigWebPage() {
         super("user_profile");
         super.getUserNav().createSubNav(this.getId(), "Profile");
     }
diff --git a/src/se/hal/plugin.json b/src/se/hal/plugin.json
index 662ff29f..ecd1aded 100755
--- a/src/se/hal/plugin.json
+++ b/src/se/hal/plugin.json
@@ -7,17 +7,16 @@
 
 
 		{"se.hal.intf.HalJsonPage": "se.hal.page.MapJsonPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.MapHttpPage"},
-
 		{"se.hal.intf.HalJsonPage": "se.hal.page.SensorJsonPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.SensorOverviewHttpPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.SensorConfigHttpPage"},
 
-		{"se.hal.intf.HalHttpPage": "se.hal.page.EventOverviewHttpPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.EventConfigHttpPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.TriggerHttpPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.UserConfigHttpPage"},
-		{"se.hal.intf.HalHttpPage": "se.hal.page.PropertySettingsPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.MapWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.SensorOverviewWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.SensorConfigWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.EventOverviewWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.EventConfigWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.TriggerWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.UserConfigWebPage"},
+		{"se.hal.intf.HalWebPage": "se.hal.page.PropertySettingsPage"},
 
 
 		{"se.hal.intf.HalTrigger": "se.hal.trigger.DateTimeTrigger"},