diff --git a/postgresql-controller.lua b/postgresql-controller.lua
index 83f2a05fe06e98d1062435d6e1947f50b9245452..c1af2c5307a2ef23129dc248167e90538e7c6909 100644
--- a/postgresql-controller.lua
+++ b/postgresql-controller.lua
@@ -1,8 +1,5 @@
 module(..., package.seeall)
 
--- Load libraries
-require("controllerfunctions")
-
 mvc = {}
 mvc.on_load = function(self, parent)
 	self.model.set_processname(string.match(self.conf.prefix, "[^/]+"))
@@ -15,7 +12,7 @@ function status(self)
 end
 
 function startstop(self)
-	return controllerfunctions.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
+	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
 function details(self)
@@ -27,5 +24,5 @@ function listfiles(self)
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit Postgresql File", "File Saved")
+	return self.handle_form(self, function() return self.model.getfiledetails(self.clientdata.filename) end, self.model.updatefiledetails, self.clientdata, "Save", "Edit Postgresql File", "File Saved")
 end
diff --git a/postgresql-details-html.lsp b/postgresql-details-html.lsp
index 8f1363ecbb700135f9b592a33b6cc4c5bf7158d9..ae142cdfb8465352b8723d49df84e4c7de8375e7 100644
--- a/postgresql-details-html.lsp
+++ b/postgresql-details-html.lsp
@@ -1,5 +1,5 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
 <% viewlibrary.dispatch_component("status") %>
@@ -7,6 +7,6 @@ require("viewfunctions")
 <H2><%= html.html_escape(data.label) %></H2>
 <DL>
 <%
-displayitem(data)
+htmlviewfunctions.displayitem(data)
 %>
 </DL>
diff --git a/postgresql-listfiles-html.lsp b/postgresql-listfiles-html.lsp
index 2437393434d81468aeca65b0bc9881cbaca34965..9d8d6aa24748a933346fdf4153f2fd190c192828 100644
--- a/postgresql-listfiles-html.lsp
+++ b/postgresql-listfiles-html.lsp
@@ -1,8 +1,8 @@
 <% local data, viewlibrary, page_info, session = ... 
-require("viewfunctions")
+require("htmlviewfunctions")
 %>
 
-<% displaycommandresults({"expert"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"expert"}, session) %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
 	viewlibrary.dispatch_component("status")
diff --git a/postgresql-logfile-html.lsp b/postgresql-logfile-html.lsp
index 4f2e3887469ddd85718b725e62e8f19ccf9ec232..ab18bf436ef23c05ba6055834d674beebf562c1e 100644
--- a/postgresql-logfile-html.lsp
+++ b/postgresql-logfile-html.lsp
@@ -1,5 +1,4 @@
 <% local data, viewlibrary = ... 
-require("viewfunctions")
 %>
 
 <% if viewlibrary and viewlibrary.dispatch_component then
diff --git a/postgresql-model.lua b/postgresql-model.lua
index 690802d2ab2eb27421b9d35aba8876cdf3a87dbc..6a4d1881764d43ae66542cad89dff5985b9ed724 100644
--- a/postgresql-model.lua
+++ b/postgresql-model.lua
@@ -34,7 +34,7 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function get_startstop(clientdata)
+function get_startstop(clientdata)       
 	return modelfunctions.get_startstop(processname)
 end