diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
index c387d23..a1c5938 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteBL.php
@@ -20,6 +20,7 @@ if (checkSession()) {
 	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");
+	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
 			
 	$oPatternCustom = & new PatternCustom();
 	$oPatternCustom->setHtml(getPage());
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
index de1a11e..a82c8b5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc
@@ -32,7 +32,8 @@ function getPage() {
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "</tr>\n";
-	$sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n";	
+	$sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>";
+	$sToRender .= getCancelButton("listWebsites") . "</td>\n";	
 	$sToRender .= "</table>\n";
 	
 	return $sToRender;
@@ -55,14 +56,4 @@ function getAddPageFail() {
 	
 	return $sToRender;
 }
-
-// gets the cancel button when a website is selected
-function getCancelButton($oWebsite) {
-	global $default;
-	if (!isset($oWebsite)) {
-		return "<td align = right><a href=\"$default->rootUrl/control.php?action=websiteManagement\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
-	} else {
-		return "<td align = right><a href=\"$default->rootUrl/control.php?action=editLink\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
-	}
-}
 ?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
index 3fbc164..ac6e323 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesBL.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* BL information for listing Documemnt Fields	
+* BL information for viewing a Discussion	
 *
 * @author Omar Rahbeeni
 * @date 19 May 2003
@@ -9,44 +9,21 @@
 */
 
 require_once("../../../../../config/dmsDefaults.php");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 require_once("$default->fileSystemRoot/lib/users/User.inc");    
 require_once("$default->fileSystemRoot/lib/security/permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");    
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");    
 require_once("$default->fileSystemRoot/presentation/Html.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc");
+require_once("listWebsitesUI.inc");
 
-if(checkSession()) {	
-  	$oPatternCustom = & new PatternCustom();
-	
-	$sQuery = 	"SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " . 
-				"'Edit', 'Delete' " .
-				"FROM " . $default->owl_web_sites_table . " " .
-				"ORDER BY web_site_name";
-	
-    $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
-    $aColumnNames = array("Link Name","URL", "Edit", "Delete");
-    $aColumnTypes = array(1,1,3,3);
-    $aDBColumnArray = array("WebsiteID");
-    $aQueryStringVariableNames = array("fWebSiteID");
-    	    
-    $aHyperLinkURL = array(	2=> "$default->rootUrl/control.php?action=editWebSite",                       			
-                     		3=> "$default->rootUrl/control.php?action=removeWebSite");
-                   			
-    	    
-    $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);	    
-	$oSearchResults->setDisplayColumnHeadings(true);
-    $htmlTables = $oSearchResults->render() ;
-
-	$oPatternCustom->addHtml(renderHeading("Website Management"));
-    $oPatternCustom->addHtml($htmlTables);
-   	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+if (checkSession()) {	
+    $oPatternCustom = & new PatternCustom();
+    $oPatternCustom->setHtml(getPage($fGroupID));
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	$main->setCentralPayload($oPatternCustom);
 	$main->setFormAction($_SERVER['PHP_SELF']);	
-    $main->render();
+    $main->render();	
 }
 ?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc
new file mode 100644
index 0000000..b36b882
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/listWebsitesUI.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+* Presentation information for adding a unit
+*
+* @author Omar Rahbeeni
+* @date 19 May 2003
+* @package presentation.lookAndFeel.knowledgeTree.
+*
+*/
+function getWebsites() {
+	global $default;
+	$sQuery = 	"SELECT id as WebsiteID, web_site_name as WebsiteName, web_site_url WebsiteURL, web_master_id as WebmasterID, " . 
+				"'Edit', 'Delete' " .
+				"FROM " . $default->owl_web_sites_table . " " .
+				"ORDER BY web_site_name";
+	
+    $aColumns = array("WebsiteName", "WebsiteURL", "Edit", "Delete");
+    $aColumnNames = array("Link Name","URL", "Edit", "Delete");
+    $aColumnTypes = array(1,1,3,3);
+    $aDBColumnArray = array("WebsiteID");
+    $aQueryStringVariableNames = array("fWebSiteID");
+    	    
+    $aHyperLinkURL = array(	2=> "$default->rootUrl/control.php?action=editWebSite",                       			
+                     		3=> "$default->rootUrl/control.php?action=removeWebSite");
+                   			
+    	    
+    $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);	    
+	$oSearchResults->setDisplayColumnHeadings(true);	
+
+    return $oSearchResults->render() ;	
+}
+
+function getPage() {
+	global $default;
+	$sToRender .= renderHeading("Current System Websites");
+
+	// add user link
+	$sToRender .= getAddLink("addWebsite", "Add A Website");
+	$sToRender .= getWebsites();
+	return $sToRender;
+}
+?>
\ No newline at end of file