diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
index 7687149..21ea136 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
@@ -41,7 +41,7 @@ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) {
 	$sToRender .= "<td>Sequence No.</td><td><input type=\"text\" name=\"fSequenceNumber\" size=\"5\" " . (isset($iSequenceNumber) ? "value=\"$iSequenceNumber\" " : " ") . "/></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=editFolder&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr></table></td>\n";
+	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></td><td>" . generateControllerLink("editFolder", "fFolderID=$iFolderID&fShowSection=folderRouting", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>") . "</td></tr></table></td>\n";
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "</table>\n";
 	
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
index 47ff8da..12227f6 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc
@@ -38,7 +38,7 @@ function getPage($iFolderID, $iDocumentTypeID) {
 	$sToRender .= "</table>\n";
 	$sToRender .= "<table>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table border=\"0\"><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"></td><td><a href=\"$default->rootUrl/control.php?action=editFolder&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr></table></td><td>&nbsp</td>\n";
+	$sToRender .= "<td><table border=\"0\"><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"></td><td>" . generateControllerLink("editFolder", "fFolderID=$iFolderID&fShowSection=documentTypes", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>") . "</td></tr></table></td><td>&nbsp</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "</table><br>\n";
 	
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
index 5b46766..86fbfc9 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc
@@ -41,7 +41,7 @@ function getDeletePage($oGroupFolderLink, $iFolderID) {
 	$sToRender .= "<td>Access</td><td>" . getAccessCheckBoxes(true, $oGroupFolderLink->getCanRead(), $oGroupFolderLink->getCanWrite()) . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=editFolder&fFolderID=" . $oGroupFolderLink->getFolderID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr></table></td>\n";
+	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/delete.gif\" border=\"0\"/></td><td>" . generateControllerLink("editFolder", "fFolderID=" . $oGroupFolderLink->getFolderID() . "&fShowSection=folderPermissions", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>") . "</td></tr></table></td>\n";
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "<table>\n";
 
@@ -65,7 +65,7 @@ function getEditPage($oGroupFolderLink, $iFolderID) {
 	$sToRender .= "<td>Access</td><td>" . getAccessCheckBoxes(false, $oGroupFolderLink->getCanRead(), $oGroupFolderLink->getCanWrite()) . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=editFolder&fFolderID=" . $oGroupFolderLink->getFolderID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr></table></td>\n";
+	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" border=\"0\"/></td><td>" . generateControllerLink("editFolder", "fFolderID=" . $oGroupFolderLink->getFolderID() . "&fShowSection=folderPermissions", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>") . "</td></tr></table></td>\n";
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "<table>\n";
 	
@@ -92,7 +92,7 @@ function getAddPage($iFolderID) {
 	$sToRender .= "<td>Access</td><td>" . getAccessCheckBoxes(false) . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=editFolder&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr></table></td>\n";
+	$sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></td><td>" . generateControllerLink("editFolder", "fFolderID=$iFolderID&fShowSection=folderPermissions", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>") . "</td></tr></table></td>\n";
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "</table>\n";