diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
index 02c1a4b..d098eb7 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
@@ -30,7 +30,7 @@ function getPage($iFolderID, $iDocumentTypeID) {
 	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
 	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
     $sToRender  = renderHeading("Add Folder Document Type");
-    $sToRender .= renderFolderPath($iFolderID, "/control.php?action=browse");
+    $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("browse", "", false));
     $sToRender .= "<table border=\"0\">\n";
     $sToRender .= "<tr>\n";	
 	$sToRender .= "<td bgcolor=\"$sTDBGColour\">Document type</td>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
index 041a7ac..15d8f9d 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
@@ -29,13 +29,13 @@ function renderBrowseAddPage($iFolderID) {
     global $default;
 	$sToRender = "<table border=\"0\" width=\"100%\">\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "\t<td>" . renderFolderPath($iFolderID, "$default->uiUrl/foldermanagement/addFolderBL.php") . "</td>\n";
+    $sToRender .= "\t<td>" . renderFolderPath($iFolderID, generateControllerUrl("addFolder", "", false)) . "</td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
     $sToRender .= "<table border=\"0\">\n";
     $sToRender .= "<tr>\n";
 	$sToRender .= "<td valign=\"top\" width=\"300\">\n";
-	$sToRender .= wrapInTable(renderFolderList($iFolderID, "/control.php?action=addFolder"));
+	$sToRender .= wrapInTable(renderFolderList($iFolderID, generateControllerUrl("addFolder", "", false)));
 	$sToRender .= "</td>\n";
 	$sToRender .= "<td valign=\"top\">\n";
 	$sToRender .= getRightSide($iFolderID);
@@ -86,12 +86,12 @@ function renderBrowsePage($fFolderID) {
     global $default;
     $sToRender = "<table border=\"0\">\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->uiUrl/foldermanagement/addFolderBL.php") . "</td>\n";
+    $sToRender .= "\t<td>" . renderFolderPath($fFolderID, generateControllerUrl("addFolder", "", false)) . "</td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
     $sToRender .= "<table border=\"0\">\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";
+    $sToRender .= "\t<td>" . renderFolderList($fFolderID, generateControllerUrl("addFolder", "", false)) . "<td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table><br>\n";
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
index 4af75fd..e3698b0 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeUI.inc
@@ -29,7 +29,7 @@ function getPage($iFolderID) {
 	global $default;
 	$sToRender = "<table border=\"0\" width=\"100%\">\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "\t<td>" . renderFolderPath($iFolderID, "/control.php?action=editFolder&fFolderID=$iFolderID&fShowSection=documentTypes", false) . "</td>\n";
+    $sToRender .= "\t<td>" . renderFolderPath($iFolderID, generateControllerUrl("editFolder", "fFolderID=$iFolderID&fShowSection=documentTypes", false), false) . "</td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
     $sToRender .= "<table border=\"0\">\n";    
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
index ddf066a..98d83d9 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
@@ -37,7 +37,7 @@ function getFolderData($iFolderID, $sStatusMessage = "") {
 	$sql->query($sQuery);
 	
     $sToRender .= renderHeading("Modify Folder Properties");
-    $sToRender .= renderFolderPath($iFolderID, "/control.php?action=browse");    	
+    $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("browse", "", false));	
 	$sToRender .= "<table>";
 	$sToRender .= "<tr><td>";
 	$sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n";