diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
index 6edac4b..385edde 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc
@@ -235,7 +235,11 @@ function getAssignButton($oGroup) {
 // show button after group selected
 function getCancelButton($oGroup) {
     global $default;
-    return "<td align = right><a href=\"$default->rootUrl/control.php?action=listGroups\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";    
+	if ($oGroup){
+    	return "<td align = right><a href=\"$default->rootUrl/control.php?action=editGroupUnit&fGroupID=" . $oGroup->getID() . "\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";    
+	} else {
+		return "<td align = right><a href=\"$default->rootUrl/control.php?action=listGroups\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
+	}
 }
 
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
index f1b94b1..e10cc71 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
@@ -29,7 +29,7 @@ if (checkSession()) {
 if(checkSession()) {	
 		global $default;
 		
-		$oPatternCustom->addHtml(renderHeading("Link Management"));		// Create the Heading				
+		$oPatternCustom->addHtml(renderHeading("Website Management"));		// Create the Heading				
 		 		
 		$main->setFormAction($_SERVER['PHP_SELF']);