diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php
index b4a871e..f9ca420 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php
@@ -13,6 +13,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
     require_once("assignGroupToUnitUI.inc");
+    require_once("../adminUI.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/lib/groups/Group.inc");
     require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
index d792e7f..f9ea13d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
@@ -16,12 +16,12 @@ function getPage($iGroupID, $iUnitID) {
 
     if (isset($iGroupID)) {
         $oGroup = Group::get($iGroupID);
-        $heading = "<tr>Are you Sure you wish to assign the Group to the Unit? </tr>\n";
+        $heading = "<tr><td>Are you Sure you wish to assign the Group to the Unit?</td></tr>\n";
     } else {
         if (Permission::userIsUnitAdministrator()) {
-            $heading = "<tr>Please Assign a Group to your Unit: </tr>\n";
+            $heading = "<tr><td>Please Assign a Group to your Unit:</td></tr>\n";
         } else {
-            $heading = "<tr>Please Assign a Group to a Unit: </tr>\n";
+            $heading = "<tr><td>Please Assign a Group to a Unit:</td></tr>\n";
         }
     }
     
@@ -29,10 +29,8 @@ function getPage($iGroupID, $iUnitID) {
         $oUnit = Unit::get($iUnitID);
     }
 
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<b>Assign Group to Unit:</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
     $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
     $sToRender .= $heading;
     $sToRender .= "<br>\n";
     $sToRender .= "<tr>\n";
@@ -52,12 +50,12 @@ function getPage($iGroupID, $iUnitID) {
     $sToRender .= "</td></table>\n";
 
     $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
-	$sToRender .= "function validateForm(theForm) {\n";
-	$sToRender .= "\tif (!(validRequired(document.MainForm.fGroupID, 'Group'))) {\n";
+	$sToRender .= "function validateForm(theForm) {;\n";
+	$sToRender .= "\tif (!(validRequired(theForm.fGroupID, 'Group'))) {\n";
 	$sToRender .= "\t\treturn false;\n";
 	$sToRender .= "\t}\n";	
 	$sToRender .= "return true;\n}\n";		
-	$sToRender .= "//-->\n</script>\n\n";
+	$sToRender .= "-->\n</script>\n\n";
 
     return $sToRender;
 }
@@ -76,10 +74,9 @@ function getPageFail($iGroupID) {
     // get the id of that unit
     $oUnit= Unit::get($iUnitID);
 
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<b>Sorry, Assignment Failed</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
     $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
+    $sToRender .= "<tr><td><b>Sorry, Assignment Failed</b></td></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>Group Already Belongs to A Unit\n";
     $sToRender .= "</tr>\n";
@@ -105,10 +102,9 @@ function getPageFail($iGroupID) {
 function getPageNotSelected() {
     global $default;
 
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<b>Sorry, Selection Failed</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
     $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
+    $sToRender .= "<tr><td><b>Sorry, Selection Failed</b></td></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr><td>Please select BOTH a Group AND a Unit</td></tr>\n";
     $sToRender .= "<tr></tr>\n";
@@ -126,10 +122,9 @@ function getPageNotSelected() {
 function getPageSuccess() {
     global $default;
 
-    $sToRender .= "<br></br>\n";
-    $sToRender .= "<b>Success!</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Assign Group to Unit") . "</table>";
     $sToRender .= "<table>\n";
-    $sToRender .= "<br></br>\n";
+    $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr><td>The Group was successfully assigned to the specified Unit</td></tr>\n";
     $sToRender .= "<tr></tr>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
index 7973779..161a84c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
@@ -13,6 +13,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
     require_once("removeGroupFromUnitUI.inc");
+    require_once("../adminUI.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/lib/groups/Group.inc");
     require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
index 4d26779..9c55727 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
@@ -19,7 +19,7 @@ function getPage($iGroupID, $iUnitID) {
 		$oGroup = Group::get($iGroupID);
 		$heading = "<tr><td>Are you sure you wish to remove the Group from the Unit?</td> </tr>\n";
 	}else{
-		$heading = "<tr>Please select a Group: </tr>\n";
+		$heading = "<tr><td>Please select a Group:</td></tr>\n";
 	}
 	
 	// when unitid is gotten show the name
@@ -32,10 +32,8 @@ function getPage($iGroupID, $iUnitID) {
 		$unitdisplay = "";
 	}
 		
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Select a Group to Remove from its Unit:</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
 	$sToRender .= $heading;
 	$sToRender .= "<br>\n";
 	$sToRender .= "<tr>\n";
@@ -72,10 +70,9 @@ function getPageFail($iGroupID) {
 	
 	$oUnit= Unit::get($iUnitID);
 		
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Sorry, Removal Failed</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Sorry, Removal Failed</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
@@ -93,10 +90,9 @@ function getPageFail($iGroupID) {
 function getPageNotSelected() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Sorry, Selection Failed</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Sorry, Selection Failed</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>Please select a Group</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -113,10 +109,9 @@ function getPageNotSelected() {
 function getPageSuccess() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Success!</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Remove Group From Unit") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>The Group was successfully removed from the Unit</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -182,7 +177,7 @@ function getDeleteButton($oGroup) {
 function getCancelButton($oGroup) {
 	global $default;
 	if (!isset($oGroup)) {
-		//return "<td align = right><a href=\"$default->rootUrl/control.php?action=groupManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
+		return "<td align = right><a href=\"$default->rootUrl/control.php?action=groupManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n";
 	} else {
 		return "<td align = right><a href=\"$default->rootUrl/control.php?action=removeGroupFromUnit\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
 	}