diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
index 002f2aa..a4a5e76 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
@@ -10,70 +10,61 @@
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
-	require_once("editGroupUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
-	require_once("$default->fileSystemRoot/lib/groups/Group.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 a new group has been added
-	if (isset($fFromCreate)) {
-		
-		if($fGroupID == -1){
-			$oPatternCustom->setHtml(getAddFailPage());
-		}else{
-			$oPatternCustom->setHtml(getCreatePage($fGroupID));
-		}
-		
-		$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editGroupSuccess"));		
-		
-	// coming from manual edit page	
-	} else if (isset($fForStore)) {
-		$oGroup = Group::get($fGroupID);
-		$oGroup->setName($fGroupName);
-		
-		//check if checkbox checked
-		if (isset($fGroupUnitAdmin)) {
-			$oGroup->setUnitAdmin(true);
-		} else {
-			$oGroup->setUnitAdmin(false);
-		}
-		//check if checkbox checked
-		if (isset($fGroupSysAdmin)) {
-			$oGroup->setSysAdmin(true);
-		} else {
-			$oGroup->setSysAdmin(false);
-		}
-		if ($oGroup->update()) {
-				// if successfull print out success message
-				$oPatternCustom->setHtml(getEditPageSuccess());
-				
-		} else {
-				// if fail print out fail message
-				$oPatternCustom->setHtml(getEditPageFail());
-		}
-	} else if (isset($fGroupID)){		
-		// post back on group select from manual edit page	
-		$oPatternCustom->setHtml(getEditPage($fGroupID));
-		$main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
-		
-		
-	} else {
-		// if nothing happens...just reload edit page
-		$oPatternCustom->setHtml(getEditPage(null));
-		$main->setFormAction($_SERVER["PHP_SELF"]);
-			
-	}
-	//render the page
-	$main->setCentralPayload($oPatternCustom);
-	$main->render();	
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
+    require_once("editGroupUI.inc");
+    require_once("../adminUI.inc");
+    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/groups/Group.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 a new group has been added
+    if (isset($fFromCreate)) {
+
+        if($fGroupID == -1) {
+            $oPatternCustom->setHtml(getAddFailPage());
+        } else {
+            $oPatternCustom->setHtml(getCreatePage($fGroupID));
+        }
+
+        $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editGroupSuccess"));
+
+        // coming from manual edit page
+    }
+    else if (isset($fForStore)) {
+        $oGroup = Group::get($fGroupID);
+        $oGroup->setName($fGroupName);
+
+        //check if checkbox checked
+        $oGroup->setUnitAdmin(isset($fGroupUnitAdmin));
+        //check if checkbox checked
+        $oGroup->setSysAdmin(isset($fGroupSysAdmin));
+
+        if ($oGroup->update()) {
+            // if successfull print out success message
+            $oPatternCustom->setHtml(getEditPageSuccess());
+        } else {
+            // if fail print out fail message
+            $oPatternCustom->setHtml(getEditPageFail());
+        }
+    } else if (isset($fGroupID)) {
+        // post back on group select from manual edit page
+        $oPatternCustom->setHtml(getEditPage($fGroupID));
+        $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+    } else {
+        // if nothing happens...just reload edit page
+        $oPatternCustom->setHtml(getEditPage(null));
+        $main->setFormAction($_SERVER["PHP_SELF"]);
+    }
+    //render the page
+    $main->setCentralPayload($oPatternCustom);
+    $main->render();
 }
 ?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
index a4c1d48..32b7436 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
@@ -12,9 +12,6 @@ function getCreatePage($iGroupID) {
 	
 	global $default;
 	$oGroup = null;
-	//if (isset($iGroupID)) {
-	//	$oGroup = Group::get($iGroupID);
-	//}
 	
 	$sQuery =  "SELECT * FROM $default->owl_groups_table WHERE id = $iGroupID";
 	$aDisplayColumns = array("name","is_sys_admin","is_unit_admin");
@@ -24,32 +21,24 @@ function getCreatePage($iGroupID) {
 	$aDatabaseColumnTypes = array(1,2,2);
 	
 	// get list of group properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes
-	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->owl_groups_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
+	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->owl_groups_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes);
 	$oPattern->setUniqueName("groupEdit");
 	$oPattern->setColumnsRequired(array(1,0,0));
 		
-	$sToRender .= "<b>Edit Group Properties:</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Edit Group Properties") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>" . $oPattern->render() . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	//$sToRender .= "<td>Assign to a Unit: &nbsp&nbsp" . getUnitDisplay() . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
 	
-	$sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/></td>\n";	
+	$sToRender .= "<td align=\"right\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/></td>\n";	
 	$sToRender .= "</table>\n";
-		
-	
-		
 	return $sToRender;
-	
-	
-	
 }
 
 
@@ -57,10 +46,10 @@ function getCreatePage($iGroupID) {
 function getAddFailPage() {
 	
 	global $default;
-			
+    
+	$sToRender .= "<table width=\"600\">" . renderHeading("Edit Group Properties") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<tr><b>Add Group Failed:</b></tr>\n";
+	$sToRender .= "<tr><td><b>Add Group Failed:</b></td></tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>Sorry, Group Already Exists!</td>\n";
 	$sToRender .= "</tr>\n";
@@ -84,11 +73,8 @@ function getEditPage($iGroupID) {
 		
 	}
 	
-	
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Edit Group Properties:</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Edit Group Properties") . "</table>";
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>Group Name: </td><td>" . getGroupDisplay($oGroup) . "</td>\n";
@@ -125,10 +111,9 @@ function getEditPage($iGroupID) {
 function getEditPageSuccess() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Success!</b>\n";
+	$sToRender .= "<table width=\"600\">" . renderHeading("Edit Group Properties") . "</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 modified</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -147,10 +132,10 @@ function getEditPageSuccess() {
 function getEditPageFail() {	
 	global $default;
 			
-	$sToRender .= "<br></br>\n";
-	$sToRender .= "<b>Success!</b>\n";
+    $sToRender .= "<table width=\"600\">" . renderHeading("Edit Group Properties") . "</table>";
+
 	$sToRender .= "<table>\n";
-	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr><td><b>Failure!</b></td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr><td>The Group modification Failed!</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
@@ -230,9 +215,9 @@ function getUpdateButton($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=editGroup\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
+		return "<td align = right><a href=\"$default->rootUrl/control.php?action=editGroup\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/></a></td>\n";
 	}
 }
 ?>
\ No newline at end of file