diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
index 90de3b2..0a8f9a7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
@@ -8,18 +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/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("addDocFieldUI.inc");
 
 if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-	require_once("addDocFieldUI.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);
@@ -27,4 +29,4 @@ if (checkSession()) {
     $main->setHasRequiredFields(true);
 	$main->render();
 }
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
index 525ea5d..d4fca18 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.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\"/></td>\n";
-    $sToRender .= "<td align = right><a href=\"$default->rootUrl/control.php?action=docfield\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n";
+    $sToRender .= "<td align = right>" . getCancelButton("listDocFields") . "</td>\n";
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "</table>\n";