diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php
index 7759fdf..0bcfd60 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkBL.php
@@ -25,6 +25,7 @@ if (checkSession()) {
 	$oPatternCustom->setHtml(getPage());
 	$main->setCentralPayload($oPatternCustom);
 	$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addLinkSuccess&fLinkID="));
+    $main->setHasRequiredFields(true);
 	$main->render();
 }
 ?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc
index 8ff6c27..f821ff5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc
@@ -20,6 +20,7 @@ function getPage() {
 	// create a text field that is required 
 	$oPatternCreate = & new PatternCreate("Link", "links/link.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
 	$oPatternCreate->setUniqueName("link");
+    $oPatternCreate->setDefaultValues(array(1=>"http://"));
 	
 	$sToRender .= "<table width=\"600\">" . renderHeading("Add QuickLink") . "</table>";
 	$sToRender .= "<table>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php
index db82ea4..92fb4d4 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkBL.php
@@ -53,6 +53,7 @@ if (checkSession()) {
 	}
 	//render the page
 	$main->setCentralPayload($oPatternCustom);
-	$main->render();	
+    $main->setHasRequiredFields(true);
+	$main->render();
 }
 ?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc
index 8c495c2..b55d4f2 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc
@@ -19,7 +19,6 @@ function getEditPage($iLinkID) {
     	$sHeading = "Please select a Link:";
 	} 
     $sToRender .= "<table width=\"600\">" . renderHeading("Edit QuickLink") . "</table>";
-	$sToRender .= "<b>Edit Link Properties:</b>\n";
 	$sToRender .= "<table>\n";
 	$sToRender .= "<tr><td>$sHeading</td></tr>\n";
 	$sToRender .= "<tr>\n";
@@ -49,7 +48,20 @@ function getEditPage($iLinkID) {
 	$sToRender .= getCancelButton($oLink);	
 	$sToRender .= "</table>\n";
 	
-	
+    $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
+	$sToRender .= "function validateForm(theForm) {\n";
+	$sToRender .= "\tif (!(validRequired(theForm.fLinkName, 'Link Name'))) {\n";
+	$sToRender .= "\t\treturn false;\n";
+	$sToRender .= "\t}\n";
+	$sToRender .= "\tif (!(validRequired(theForm.fUrl, 'URL'))) {\n";
+	$sToRender .= "\t\treturn false;\n";
+	$sToRender .= "\t}\n";
+	$sToRender .= "\tif (!(validRequired(theForm.fRank, 'Rank'))) {\n";
+	$sToRender .= "\t\treturn false;\n";
+	$sToRender .= "\t}\n";    
+	$sToRender .= "return true;\n}\n";
+	$sToRender .= "//-->\n</script>\n\n";
+    
 	return $sToRender;
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc
index c09c9ab..454a3de 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc
@@ -21,7 +21,7 @@ function getDeletePage($iLinkID) {
 
     $sToRender .= "<table width=\"600\">" . renderHeading("Remove QuickLink") . "</table>";
     $sToRender .= "<table>\n";
-    $sToRender .= "<tr><td>$sHeading</td></tr>\n";
+    $sToRender .= "<tr><td colspan=\"2\">$sHeading</td></tr>\n";
     $sToRender .= "<tr>\n";
     $sToRender .= "<td>Link Name: </td><td>" . getLinkDisplay($oLink) . "</td>\n";
     $sToRender .= "</tr>\n";
@@ -37,7 +37,7 @@ function getDeletePage($iLinkID) {
     $sToRender .= "</tr>\n";
     $sToRender .= "<tr>\n";
     $sToRender .= "</tr>\n";
-    $sToRender .= "<tr>" . getDeleteButton($oLink) . "</tr>\n";
+    $sToRender .= "<tr><td/>" . getDeleteButton($oLink) . "</tr>\n";
     $sToRender .= "</table>\n";
 
     return $sToRender;
@@ -123,7 +123,7 @@ function getRank($oLink) {
 function getDeleteButton($oLink) {
     global $default;
     if (isset($oLink)) {
-        return "<td colspan=\"2\"><input type=\"image\" src =\"$default->graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/>\n".
+        return "<td colspan=\"2\" align=\"right\"><input type=\"image\" src =\"$default->graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/>\n".
                "<a href=\"$default->rootUrl/control.php?action=removeLink\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
     }
 }