diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php
index 7fbcf9f..c349a34 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksBL.php
@@ -8,56 +8,26 @@
 *
 */
 
-	require_once("../../../../../config/dmsDefaults.php");
+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("listLinksUI.inc");
 
-if (checkSession()) {    
-    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/presentation/webpageTemplate.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");
-	
-	
+if (checkSession()) {	
     $oPatternCustom = & new PatternCustom();
-
-if(checkSession()) {	
-		global $default;
-		
-		$oPatternCustom->addHtml(renderHeading("Link Management"));		// Create the Heading				
-		 		
-		$main->setFormAction($_SERVER['PHP_SELF']);
-				
-		
-		$sQuery = 	"SELECT id as LinkID, name as LinkName, url LinkURL, rank as LinkRank, " . 
-					"'Edit', 'Delete' " .
-					"FROM " . $default->owl_links_table . " " .
-					"ORDER BY name";
-		
-	    $aColumns = array("LinkName", "LinkURL", "LinkRank", "Edit", "Delete");
-	    $aColumnNames = array("Link Name","URL", "Rank", "Edit", "Delete");
-	    $aColumnTypes = array(1,1,1,3,3);
-	    $aDBColumnArray = array("LinkID");
-	    $aQueryStringVariableNames = array("fLinkID");
-	    	    
-	    $aHyperLinkURL = array(	3=> "$default->rootUrl/control.php?action=editLink",                       			
-                       			4=> "$default->rootUrl/control.php?action=removeLink");
-                     			
-	    	    
-	    $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);	    
-		$oSearchResults->setDisplayColumnHeadings(true);
-	    $htmlTables = $oSearchResults->render() ;
-	
-	    $oPatternCustom->addHtml($htmlTables);	    
-	
-	} // end of if checksession
-	
+    $oPatternCustom->setHtml(getPage($fGroupID));
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	$main->setCentralPayload($oPatternCustom);
-    $main->render();
+	$main->setFormAction($_SERVER['PHP_SELF']);	
+    $main->render();	
 }
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc
new file mode 100644
index 0000000..d4ed2f3
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/listLinksUI.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+* Presentation information for list links
+*
+* @author Omar Rahbeeni
+* @date 19 May 2003
+* @package presentation.lookAndFeel.knowledgeTree.
+*
+*/
+
+function getQuickLinks() {
+	global $default;
+	$sQuery = 	"SELECT id as LinkID, name as LinkName, url LinkURL, rank as LinkRank, " . 
+				"'Edit', 'Delete' " .
+				"FROM " . $default->owl_links_table . " " .
+				"ORDER BY name";
+	
+    $aColumns = array("LinkName", "LinkURL", "LinkRank", "Edit", "Delete");
+    $aColumnNames = array("Link Name","URL", "Rank", "Edit", "Delete");
+    $aColumnTypes = array(1,1,1,3,3);
+    $aDBColumnArray = array("LinkID");
+    $aQueryStringVariableNames = array("fLinkID");
+    	    
+    $aHyperLinkURL = array(	3=> "$default->rootUrl/control.php?action=editLink",                       			
+                     			4=> "$default->rootUrl/control.php?action=removeLink");
+                   			
+    	    
+    $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 QuickLinks");
+
+	// add user link
+	$sToRender .= getAddLink("addLink", "Add A QuickLink");
+	$sToRender .= getQuickLinks();
+	return $sToRender;
+}
+?>
\ No newline at end of file