diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
index 4625b6a..c9cb89a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
@@ -10,66 +10,56 @@
 require_once("../../../../../config/dmsDefaults.php");
 
 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");
-	
-	$oPatternCustom = & new PatternCustom();
-	
-	if (isset($fForStore)) {
-		
-		if($fUnitName != "" and $fOrgID !=-1)
-		{
-			$oUnit = new Unit($fUnitName);
-								
-			//$oOrg = Organisation($
-			// if creation is successfull..get the unit id
-			if ($oUnit->create()) {
-				$unitID = $oUnit->getID();
-				$oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID);
-				
-				if($oUnitOrg->create()){
-					// if successfull print out success message
-					$oPatternCustom->setHtml(getAddPageSuccess());
-				}else{
-				
-					// if fail print out fail message
-					$oPatternCustom->setHtml(getAddToOrgFail());
-				}
-				
-							
-			} else {
-					// if fail print out fail message
-					$oPatternCustom->setHtml(getAddPageFail());
-			}
-		}else{
-		
-					$oPatternCustom->setHtml(getPageFail());
-		}
-		
-	} else if (isset($fUnitID)){		
-			// post back on Unit select from manual edit page	
-			$oPatternCustom->setHtml(getAddPage($fUnitID));
-			$main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
-	}else {
-		// if nothing happens...just reload edit page
-		$oPatternCustom->setHtml(getAddPage(null));
-		$main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1");
-			
-	}		
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+    require_once("addUnitUI.inc");
+    require_once("../adminUI.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");
 
-	//$oPatternCustom->setHtml(getPage());
-	
-	//$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addUnitSuccess&fUnit"));
-	$main->setCentralPayload($oPatternCustom);
-	$main->render();
+    $oPatternCustom = & new PatternCustom();
+
+    if (isset($fForStore)) {
+        if($fUnitName != "" and $fOrgID != "") {
+            $oUnit = new Unit($fUnitName);
+
+            // if creation is successfull..get the unit id
+            if ($oUnit->create()) {
+                $unitID = $oUnit->getID();
+                $oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID);
+
+                if($oUnitOrg->create()) {
+                    // if successfull print out success message
+                    $oPatternCustom->setHtml(getAddPageSuccess());
+                } else {
+                    // if fail print out fail message
+                    $oPatternCustom->setHtml(getAddToOrgFail());
+                }
+            } else {
+                // if fail print out fail message
+                $oPatternCustom->setHtml(getAddPageFail());
+            }
+        } else {
+            $oPatternCustom->setHtml(getPageFail());
+        }
+
+    } else if (isset($fUnitID)) {
+        // post back on Unit select from manual edit page
+        $oPatternCustom->setHtml(getAddPage($fUnitID));
+        $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+    } else {
+        // if nothing happens...just reload edit page
+        $oPatternCustom->setHtml(getAddPage(null));
+        $main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1");
+
+    }
+    $main->setCentralPayload($oPatternCustom);
+    $main->render();
 }
 ?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php
deleted file mode 100644
index 0078d75..0000000
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-* Presentation information when adding a unit is successful
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
-require_once("../../../../../config/dmsDefaults.php");
-
-global $default;
-	
-if(checkSession())
-{
-
-// include the page template (with navbar)
-require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");  	
-
-$Center = "<br></br>\n" ;
-$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";
-$Center .= "<tr>\n";
-$Center .= "<td>Unit added Successfully!</td>\n";
-$Center .= "</tr>\n";	
-$Center .= "<tr></tr>\n";
-$Center .= "<tr></tr>\n";
-$Center .= "<tr></tr>\n";
-$Center .= "<tr></tr>\n";
-$Center .= "<tr>\n";
-$Center .= "<td align = right><a href=\"$default->rootUrl/control.php?action=addUnit\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
-$Center .= "</tr>\n";
-$Center .= "</table>\n";
-		
-
-$oPatternCustom = & new PatternCustom();
-$oPatternCustom->setHtml($Center); 
-$main->setCentralPayload($oPatternCustom);
-$main->render();
-
-
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
index bd27d7b..b3e1482 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
@@ -9,29 +9,14 @@
 */
 // get add pages
 function getAddPage($unitID) {
-
 	global $default;
 	
-	$oOrg = null;
 	if (isset($iOrgID)) {
-		$oOrg = Organisation::get($iOrgID);
-		
+        $oOrg = Organisation::get($iOrgID);
 	}
 	
-	//$aDisplayRowNames = array("Unit Name:");
-	//$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("Unit", "unitmanagement\\Unit.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
-	//$oPatternCreate->setUniqueName("unit");
-	
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Add a New Unit to the System:</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>Unit Name: </td><td><input size = \"40\" type=\"text\" name=\"fUnitName\"> </td>\n";
@@ -45,17 +30,15 @@ function getAddPage($unitID) {
 	$sToRender .= "</table>\n";
 	
 	return $sToRender;
-	
 }
 
-// if edition is successful print otu success page
+// if edition is successful print out success page
 function getAddPageSuccess() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Addition Successful!</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Addition Successful!</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>New Unit was successfully added</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -68,14 +51,13 @@ function getAddPageSuccess() {
 	return $sToRender;
 }
 
-// if edition is successful print otu success page
+// if edition is successful print out failure page
 function getAddPageFail() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Addition Unsuccessful</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Addition Unsuccessful</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>The Unit was not added. Unit Name Already exists!</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -94,10 +76,8 @@ function getAddPageFail() {
 function getPageFail() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Addition Unsuccessful</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>Please enter a name AND Select the Organisation</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -114,10 +94,9 @@ function getPageFail() {
 function getAddPageToOrgFail() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Addition to Organisation Unsuccessful</b>\n";
-	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Add Unit") . "</table>";
+    $sToRender .= "<table>\n";
+    $sToRender .= "<tr><td><b>Addition to Organisation Unsuccessful</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>The Unit was not added to the Organisation.</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -138,8 +117,6 @@ function getOrgDisplay($oOrg) {
 	global $default;
 	if (!isset($oOrg)) {
 		$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
-		//$oPatternListBox->setIncludeDefaultValue(true);
-		//$oPatternListBox->setPostBackOnChange(true);		
 		return $oPatternListBox->render();
 	} else {
 		return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .