diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php
index 27660cd..0e76de1 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php
@@ -8,19 +8,20 @@
 *
 */
 require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
+require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
+require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
+require_once("addGroupUI.inc");
 
 if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-	require_once("addGroupUI.inc");
-	require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
-	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-	require_once("$default->fileSystemRoot/presentation/Html.inc");
-			
+
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");			
 	$oPatternCustom = & new PatternCustom();
 	$oPatternCustom->setHtml(getPage());
 	$main->setCentralPayload($oPatternCustom);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc
index cbc7935..1589ff2 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc
@@ -33,7 +33,7 @@ function getPage() {
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<td align=\"right\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
-	$sToRender .= generateControllerLink("listGroups", "", "<image border=\"0\" src=\"$default->graphicsUrl/widgets/cancel.gif\"/>") . "</td>\n";	
+	$sToRender .= getCancelButton("listGroups") . "</td>\n";	
 	$sToRender .= "</table>\n";
 	
 	return $sToRender;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
index 2e69b03..9606b66 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
@@ -8,24 +8,24 @@
 *
 */
 require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
+require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
+require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
+require_once("addOrgUI.inc");
 
 if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-	require_once("addOrgUI.inc");
-	require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
-	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-	require_once("$default->fileSystemRoot/presentation/Html.inc");
-			
 	$oPatternCustom = & new PatternCustom();
 	$oPatternCustom->setHtml(getPage());
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	$main->setCentralPayload($oPatternCustom);
 	$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addOrgSuccess&fedit=1"));
     $main->setHasRequiredFields(true);
 	$main->render();
 }
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
index 547f9a9..8f48b7e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
@@ -15,7 +15,6 @@ function getPage() {
 	$aParameterNumbers = array(0);
 	$aDisplayColumnTypes = array(1);
 	$aRequired = array(1);
-	//$aDropDownListTableNames = array(10=>"document_types_lookup");
 
 	// create a text field that is required 
 	$oPatternCreate = & new PatternCreate("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
@@ -31,7 +30,8 @@ function getPage() {
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
-	$sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n";	
+	$sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
+	$sToRender .= getCancelButton("listOrg") . "</td>\n";	
 	$sToRender .= "</table>\n";
 	
 	return $sToRender;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
index 90916eb..ad5c38a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
@@ -8,20 +8,21 @@
 *
 */
 require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
+require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
+require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
+require_once("addUnitUI.inc");
 
 if (checkSession()) {
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-    require_once("addUnitUI.inc");
-    require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
-    require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
-    require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-    require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-    require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-    require_once("$default->fileSystemRoot/presentation/Html.inc");
 
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     $oPatternCustom = & new PatternCustom();
 
     if (isset($fForStore)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
index 3e3da99..6f99395 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
@@ -23,7 +23,7 @@ function getAddPage() {
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
-	$sToRender .= generateControllerLink("listUnits", "", "<image border=\"0\" src=\"$default->graphicsUrl/widgets/cancel.gif\"/>") . "</td>\n";	
+	$sToRender .= getCancelButton("listUnits") . "</td>\n";	
 	$sToRender .= "</table>\n";
 	
 	// javascript validation
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
index 998ea84..54c775d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
@@ -8,21 +8,21 @@
 *
 */
 require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+require_once("$default->fileSystemRoot/lib/users/User.inc");
+require_once("$default->fileSystemRoot/lib/groups/Group.inc");
+require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");    
+require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
+require_once("addUserUI.inc");
 
 if (checkSession()) {
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-    require_once("addUserUI.inc");
-    require_once("$default->fileSystemRoot/lib/users/User.inc");
-    require_once("$default->fileSystemRoot/lib/groups/Group.inc");
-	require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");    
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
-    require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-    require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-    require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-    require_once("$default->fileSystemRoot/presentation/Html.inc");
-
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     $oPatternCustom = & new PatternCustom();
     //create db object
     $oAuth = new $default->authenticationClass;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
index b90a357..8c8a7e7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
@@ -71,7 +71,7 @@ function getDetailsDBPage($sUserName, $aAttributes) {
         $sToRender .= "</tr>\n";
         $sToRender .= "<tr><td><b>Initial Group</b></td><td>" . getGroupListBox() . "</td></tr>\n";        
         $sToRender .= "<tr>\n";
-        $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>";
+        $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton("listUsers") . "</td>";
         $sToRender .= "</tr>\n";
         $sToRender .= "</table>\n";
 		$sToRender .= getJavascriptValidation();        
@@ -110,7 +110,7 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) {
         $sToRender .= "</tr>\n";
         $sToRender .= "<tr><td><b>Group</b></td><td>" . getGroupListBox() . "</td></tr>\n";        
         $sToRender .= "<tr>\n";
-        $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton() . "</td>";
+        $sToRender .= "<td colspan=\"2\" align=\"right\">" . getAddButton() . getCancelButton("listUsers") . "</td>";
         $sToRender .= "</tr>\n";
         $sToRender .= "</table>\n";
         $sToRender .= getJavascriptValidation(true);
@@ -161,11 +161,6 @@ function getAddButton() {
 	return "<input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n";
 }
 
-function getCancelButton() {
-	global $default;
-	return generateControllerLink("listUsers", "", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" />");
-}
-
 function getGroupListBox() {
 	global $default;
 	if (Permission::userIsSystemAdministrator()) {