diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
index 291509a..7c823f8 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php
@@ -25,13 +25,12 @@ if (checkSession()) {
 		$oPatternCustom = & new PatternCustom();
 		$oPatternCustom->setHtml(getCreatePage($fGroupID));
 		$main->setCentralPayload($oPatternCustom);
-		$main->setFormAction("$default->owl_root_url/presentation/lookAndFeel/knowledgeTree/store.php?fRedirectURL=" . urlencode("$default->owl_root_url/control.php?action=editGroup&fGroupID=$fGroupID"));		
+		$main->setFormAction("$default->owl_root_url/presentation/lookAndFeel/knowledgeTree/store.php?fRedirectURL=" . urlencode("$default->owl_root_url/control.php?action=editGroupSuccess"));		
 		$main->render();		
 	} else if (isset($fForStore)) {
 		$oGroup = Group::get($fGroupID);
 		$oGroup->setName($fGroupName);
 		
-		echo "Group name:" . $fGroupName;
 		if (isset($fGroupUnitAdmin)) {
 			$oGroup->setUnitAdmin(true);
 		} else {
@@ -44,9 +43,9 @@ if (checkSession()) {
 			$oGroup->setSysAdmin(false);
 		}
 		if ($oGroup->update()) {
-			redirect($_SERVER["PHP_SELF"]);
+			redirect("$default->owl_root_url/control.php?action=editGroupSuccess");
 		} else {
-			
+			redirect("$default->owl_root_url/control.php?action=editGroupFail");
 		}
 	} else if (isset($fGroupID)){		
 		$oPatternCustom = & new PatternCustom();		
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php
new file mode 100644
index 0000000..0a071d5
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php
@@ -0,0 +1,47 @@
+<?php
+/**
+* Presentation information when updating froup properties fail
+*
+* @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->owl_fs_root/presentation/webPageTemplate.inc");  	
+
+
+$Center = "<br></br>\n" ;
+$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";
+$Center .= "<tr>\n";
+$Center .= "<td>Deletion Failed!</td>\n";
+$Center .= "</tr>\n";	
+$Center .= "<tr></tr>\n";
+$Center .= "<tr><td>Please Ensure that The Group has been Removed from any Unit it belongs to</td></tr>\n";
+$Center .= "<tr></tr>\n";
+$Center .= "<tr></tr>\n";
+$Center .= "<tr>\n";
+$Center .= "<td align = right><a href=\"$default_owl_root_url/control.php?action=editGroup\"><img src =\"$default->owl_graphics_url/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/groupmanagement/editGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
new file mode 100644
index 0000000..3ec1bda
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
@@ -0,0 +1,46 @@
+<?php
+/**
+* Presentation information when updating group properties 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->owl_fs_root/presentation/webPageTemplate.inc");  	
+
+$Center = "<br></br>\n" ;
+$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";
+$Center .= "<tr>\n";
+$Center .= "<td>Update SuccessFul!</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_owl_root_url/control.php?action=editGroup\"><img src =\"$default->owl_graphics_url/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/groupmanagement/editGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
index ac3bcff..9ab0e34 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
@@ -19,7 +19,7 @@
 	$sQuery =  "SELECT * FROM $default->owl_groups_table WHERE id = $iGroupID";
 	$aDisplayColumns = array("name","is_sys_admin","is_unit_admin");
 	$aStoreColumns = array("name","is_sys_admin","is_unit_admin");
-	$aColumnNames = array("Name","System admin", "Unit admin");
+	$aColumnNames = array("Name:","System admin:", "Unit admin:");
 	$aDisplayColumnTypes = array(1,2,2);
 	$aDatabaseColumnTypes = array(1,2,2);
 	
@@ -35,9 +35,9 @@
 	$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 .="<input type=\"hidden\" name=\"fGroupName\" value=\"" . $oGroup->setName() . "\"";
 	$sToRender .= "</tr>\n";
 	
 	$sToRender .= "<td align = right><input type=\"image\" src =\"$default->owl_graphics_url/widgets/update.gif\" value=\"Update\" /></td>\n";	
@@ -56,27 +56,39 @@ function getEditPage($iGroupID) {
 	$oGroup = null;
 	if (isset($iGroupID)) {
 		$oGroup = Group::get($iGroupID);
+		
 	}
 	
+	
 	$sToRender .= "<br></br>\n";
 	$sToRender .= "<b>Edit Group Properties:</b>\n";
 	$sToRender .= "<table>\n";
 	$sToRender .= "<br></br>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>" . getGroupDisplay($oGroup) . "</td>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>" . getUnitAdminCheckBox($oGroup) . "</td>\n";
+	$sToRender .= "<td>Group Name: </td><td>" . getGroupDisplay($oGroup) . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>" . getSysAdminCheckBox($oGroup) . "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
+	
+	if (isset($iGroupID)) {
+		$sToRender .= "<td>Assign to Unit: </td><td>" . getUnitDisplay() . "</td>\n";
+		$sToRender .= "</tr>\n";
+		$sToRender .= "<tr>\n";
+		$sToRender .= "<td>Unit Administrator: </td><td>" . getUnitAdminCheckBox($oGroup) . "</td>\n";
+		$sToRender .= "</tr>\n";
+		$sToRender .= "<tr>\n";
+		$sToRender .= "<td>System Administrator: </td><td>" . getSysAdminCheckBox($oGroup) . "</td>\n";
+		$sToRender .= "</tr>\n";
+		$sToRender .= "<tr>\n";
+		$sToRender .= "</tr>\n";
+	}
+
+
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= getUpdateButton($oGroup);	
+	$sToRender .= "<td></td>" . getUpdateButton($oGroup);	
 	$sToRender .= getCancelButton($oGroup);	
 	$sToRender .= "</table>\n";
 	
@@ -88,16 +100,25 @@ function getGroupDisplay($oGroup) {
 	global $default;
 	if (!isset($oGroup)) {
 		$oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
-		$oPatternListBox->setIncludeDefaultValue(true);
+		//$oPatternListBox->setIncludeDefaultValue(true);
 		$oPatternListBox->setPostBackOnChange(true);		
 		return $oPatternListBox->render();
 	} else {
 		return "<input type=\"hidden\" name=\"fGroupID\" value=\"" . $oGroup->iId . "\">\n" .
-		"<input type=\"text\" name=\"fGroupName\" value=\"" . $oGroup->getName() . "\"";
+		"<input size = \"40\" type=\"text\" name=\"fGroupName\" value=\"" . $oGroup->getName() . "\">";
 	}
 	
 }
 
+function getUnitDisplay() {
+	global $default;
+	$oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
+	return $oPatternListBox->render();
+		
+	
+	
+}
+
 function getUnitAdminCheckBox($oGroup) {
 	if (!isset($oGroup)) {
 		return "";
@@ -120,16 +141,16 @@ function getUpdateButton($oGroup) {
 	if (!isset($oGroup)) {
 		return "Please select a group";
 	} else {
-		return "<td align = right><input type=\"image\" src =\"$default->owl_graphics_url/widgets/update.gif\" value=\"update\" /></td>\n";
+		return "<td align = right><input type=\"image\" src =\"$default->owl_graphics_url/widgets/update.gif\" value=\"submit\" /></td>\n";
 	}
 }
 
 function getCancelButton($oGroup) {
 	global $default;
 	if (!isset($oGroup)) {
-		return "<td align = right><a href=\"$default_owl_root_url/control.php?action=browse\"><img src =\"$default->owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
+		//return "<td align = right><a href=\"$default_owl_root_url/control.php?action=groupManagement\"><img src =\"$default->owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
 	} else {
-		return "<td align = right><a href=\"$default_owl_root_url/control.php?action=editGroup\"><img src =\"$default->owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
+		return "<td align = right><a href=\"$default_owl_root_url/control.php?action=editGroup\"><img src =\"$default->owl_graphics_url/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
 	}
 }
 ?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php
new file mode 100644
index 0000000..c8e3690
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupBL.php
@@ -0,0 +1,51 @@
+<?php
+/**
+* BL information for adding a group
+*
+* @author Mukhtar Dharsey
+* @date 5 February 2003
+* @package presentation.lookAndFeel.knowledgeTree.
+*
+*/
+require_once("../../../../../config/dmsDefaults.php");
+
+if (checkSession()) {
+	require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+	require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
+	require_once("removeGroupUI.inc");
+	require_once("$default->owl_fs_root/lib/security/permission.inc");
+	require_once("$default->owl_fs_root/lib/groups/Group.inc");
+	require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+	require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");	
+	require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+	require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+	require_once("$default->owl_fs_root/presentation/Html.inc");
+	
+	if (isset($fGroupID)) {
+		$oPatternCustom = & new PatternCustom();		
+		$oPatternCustom->setHtml(getDeletePage($fGroupID));
+		$main->setCentralPayload($oPatternCustom);				
+		$main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");
+		$main->render();		
+	
+	} else {
+		$oPatternCustom = & new PatternCustom();		
+		$oPatternCustom->setHtml(getDeletePage(null));
+		$main->setCentralPayload($oPatternCustom);		
+		$main->setFormAction($_SERVER["PHP_SELF"]);
+		$main->render();
+	
+	}
+	
+		if (isset($fForDelete)) {
+			$oGroup = Group::get($fGroupID);
+			$oGroup->setName($fGroupName);
+			
+		if ($oGroup->delete()) {
+			redirect("$default->owl_root_url/control.php?action=removeGroupSuccess");
+		} else {
+			redirect("$default->owl_root_url/control.php?action=removeGroupFail");
+		}
+	}
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php
new file mode 100644
index 0000000..7056371
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFail.php
@@ -0,0 +1,47 @@
+<?php
+/**
+* Presentation information when updating froup properties fail
+*
+* @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->owl_fs_root/presentation/webPageTemplate.inc");  	
+
+
+$Center = "<br></br>\n" ;
+$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";
+$Center .= "<tr>\n";
+$Center .= "<td>Deletion Failed!</td>\n";
+$Center .= "</tr>\n";	
+$Center .= "<tr></tr>\n";
+$Center .= "<tr><td>Please Ensure that The Group has been Removed from any Unit it belongs to</td></tr>\n";
+$Center .= "<tr></tr>\n";
+$Center .= "<tr></tr>\n";
+$Center .= "<tr>\n";
+$Center .= "<td align = right><a href=\"$default_owl_root_url/control.php?action=removeGroup\"><img src =\"$default->owl_graphics_url/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/groupmanagement/removeGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php
new file mode 100644
index 0000000..63f1cb6
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupSuccess.php
@@ -0,0 +1,46 @@
+<?php
+/**
+* Presentation information when updating group properties 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->owl_fs_root/presentation/webPageTemplate.inc");  	
+
+$Center = "<br></br>\n" ;
+$Center .= "<TABLE BORDER=\"0\" CELLSPACING=\"2\" CELLPADDING=\"2\">\n";
+$Center .= "<tr>\n";
+$Center .= "<td>Group SuccessFully Removed!</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_owl_root_url/control.php?action=removeGroup\"><img src =\"$default->owl_graphics_url/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/groupmanagement/removeGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc
new file mode 100644
index 0000000..cf26ade
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc
@@ -0,0 +1,91 @@
+<?php
+
+/**
+* Presentation information for Deleting a group 
+*
+* @author Mukhtar Dharsey
+* @date 5 February 2003
+* @package presentation.lookAndFeel.knowledgeTree.
+*
+*/
+
+function getDeletePage($iGroupID) {	
+	global $default;
+	$oGroup = null;
+	if (isset($iGroupID)) {
+		$oGroup = Group::get($iGroupID);
+		$sToRender .= "<br></br>\n";
+		$sToRender .= "<b>Are you sure you wish to Remove this Group?:</b>\n";
+	}
+	else{
+		$sToRender .= "<br></br>\n";		
+		$sToRender .= "<b>Remove Group From System:</b>\n";
+	}
+	
+	$sToRender .= "<table>\n";
+	$sToRender .= "<br></br>\n";
+	$sToRender .= "<tr></tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "<td>" . getGroupDisplay($oGroup) . "</td>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "<td>" . getUnitAdminCheckBox($oGroup) . "</td>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "<td>" . getSysAdminCheckBox($oGroup) . "</td>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= getDeleteButton($oGroup);	
+	$sToRender .= "</table>\n";
+	
+	
+	return $sToRender;
+}
+
+function getGroupDisplay($oGroup) {
+	global $default;
+	if (!isset($oGroup)) {
+		$oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
+		$oPatternListBox->setIncludeDefaultValue(true);
+		$oPatternListBox->setPostBackOnChange(true);		
+		return $oPatternListBox->render();
+	} else {
+		return "<input type=\"hidden\" name=\"fGroupID\" value=\"" . $oGroup->iId . "\">\n" .
+		"Group Name: <b>" . $oGroup->getName() . "</b>";
+	}
+	
+}
+
+function getUnitAdminCheckBox($oGroup) {
+	if (!isset($oGroup)) {
+		return "";
+	} else {
+		return "Unit Administrator: <input type=\"checkbox\" name=\"fGroupUnitAdmin\" " . ($oGroup->getUnitAdmin() ? "CHECKED " : " ") . " />";
+	}
+}
+
+function getSysAdminCheckBox($oGroup) {
+	if (!isset($oGroup)) {
+		return "";
+	} else {
+		return "System Administrator: <input type=\"checkbox\" name=\"fGroupSysAdmin\" " . ($oGroup->getSysAdmin() ? "CHECKED " : " ") . " />";
+	}
+	
+}
+
+
+function getDeleteButton($oGroup) {
+	global $default;
+	if (!isset($oGroup)) {
+		return "Please select a group";
+	} else {
+		return "<td align = right><input type=\"image\" src =\"$default->owl_graphics_url/widgets/Delete.gif\" value=\"submit\" /></td>\n".
+		"<td align = right><a href=\"$default_owl_root_url/control.php?action=removeGroup\"><img src =\"$default->owl_graphics_url/widgets/Cancel.gif\" border = \"0\" /></a></td>\n";
+	}
+}
+?>