diff --git a/Makefile b/Makefile
index f62397de1..cd9301de5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,35 @@ MAKE=make
 CSS=$(wildcard *.css)
 CSS=$(subst .tiny,,$(shell find themes -type f -name '*.css'))
 COMPRESSED_CSS := $(patsubst %.css,%.tiny.css,$(CSS))
+PWD=`pwd`
 
 ## Catch-all tagets
-default: template docs css dirs
+default: cherrypy.config dirs template css docs 
 all: default
 
 dirs:
-	mkdir -p data/cherrypy_sessions
+	@mkdir -p data/cherrypy_sessions
+
+cherrypy.config: Makefile
+	@echo [global]\\n\
+server.socket_host = \'0.0.0.0\'\\n\
+server.socket_port = 8000\\n\
+server.thread_pool = 10\\n\
+tools.staticdir.root = \"$(PWD)\"\\n\
+tools.sessions.on = True\\n\
+tools.auth.on = True\\n\
+tools.sessions.storage_type = \"file\"\\n\
+tools.sessions.timeout = 90\\n\
+tools.sessions.storage_path = \"$(PWD)/data/cherrypy_sessions\"\\n\
+\\n\
+[/static]\\n\
+tools.staticdir.on = True\\n\
+tools.staticdir.dir = \"static\"\\n\
+\\n\
+[/favicon.ico]\\n\
+tools.staticfile.on = True\\n\
+tools.staticfile.filename = \"$(PWD)/static/theme/favicon.ico\"\\n\
+> cherrypy.config
 
 %.tiny.css: %.css
 	@cat $< | python -c 'import re,sys;print re.sub("\s*([{};,:])\s*", "\\1", re.sub("/\*.*?\*/", "", re.sub("\s+", " ", sys.stdin.read())))' > $@
diff --git a/cherrypy.config b/cherrypy.config
deleted file mode 100644
index c388f1c58..000000000
--- a/cherrypy.config
+++ /dev/null
@@ -1,19 +0,0 @@
-[global]
-server.socket_host = '0.0.0.0'
-server.socket_port = 8000
-server.thread_pool = 10
-tools.staticdir.root = "."
-tools.sessions.on = True
-tools.auth.on = True
-tools.sessions.storage_type = "file"
-tools.sessions.storage_path = "./data/cherrypy_sessions"
-tools.sessions.timeout = 90
-
-[/static]
-tools.staticdir.on = True
-tools.staticdir.dir = "static"
-
-[/favicon.ico]
-tools.staticfile.on = True
-tools.staticfile.filename = "./static/theme/favicon.ico"
-
diff --git a/modules/installed/help/help.py b/modules/installed/help/help.py
index 28229a354..f6ae45720 100644
--- a/modules/installed/help/help.py
+++ b/modules/installed/help/help.py
@@ -4,6 +4,7 @@ from gettext import gettext as _
 from plugin_mount import PagePlugin
 import cfg
 class Help(PagePlugin):
+    order = 20 # order of running init in PagePlugins
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
         self.register_page("help")
diff --git a/modules/installed/services/services.py b/modules/installed/services/services.py
index c99da08eb..ba623782c 100644
--- a/modules/installed/services/services.py
+++ b/modules/installed/services/services.py
@@ -4,6 +4,7 @@ from plugin_mount import PagePlugin
 import cfg
 
 class Services(PagePlugin):
+    order = 9 # order of running init in PagePlugins
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
         self.register_page("services")
diff --git a/modules/installed/sharing/sharing.py b/modules/installed/sharing/sharing.py
index fcba99331..a3ef736dc 100644
--- a/modules/installed/sharing/sharing.py
+++ b/modules/installed/sharing/sharing.py
@@ -5,6 +5,8 @@ from plugin_mount import PagePlugin
 import cfg
 
 class Sharing(PagePlugin):
+    order = 9 # order of running init in PagePlugins
+
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
         self.register_page("sharing")
diff --git a/modules/installed/system/system.py b/modules/installed/system/system.py
index 7f04f64f9..75aa8504b 100644
--- a/modules/installed/system/system.py
+++ b/modules/installed/system/system.py
@@ -16,7 +16,6 @@ sys_dir = "modules/installed/sys"
 class Sys(PagePlugin):
     order = 10
     def __init__(self, *args, **kwargs):
-        cfg.log("!!!!!!!!!!!!!!!!!!!!")
         PagePlugin.__init__(self, *args, **kwargs)
         self.register_page("sys")
         self.menu = cfg.main_menu.add_item(_("%s System" % cfg.product_name), "/sys", 100)
diff --git a/modules/installed/system/users.py b/modules/installed/system/users.py
index 73fbb04c6..ce99f6417 100644
--- a/modules/installed/system/users.py
+++ b/modules/installed/system/users.py
@@ -7,6 +7,7 @@ from forms import Form
 from util import *
 
 class users(PagePlugin):
+    order = 20 # order of running init in PagePlugins
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
         self.register_page("sys.users")