diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
index 3520c75..f7df18a 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
@@ -47,7 +47,7 @@ if (checkSession()) {
 			}		
 			
 		} else if (isset($fAddCommentSubmit)) {					
-			if ($_POST["NewComment"] != "" and $_POST["NewCommentSubject"] != "")						{
+			if ($_POST["NewComment"] != "" && $_POST["NewCommentSubject"] != "")						{
 				
 				if (isset($fNewThread)){ // Create a New Thread for this document as it doesn't exist
 					 
@@ -97,7 +97,7 @@ if (checkSession()) {
 				}// End Of if for THREAD ID test
 									
 			}else { // the user has not entered BOTH a subject and a text body
-				$main->setErrorMessage("The subject line and/or body may be empty");				
+				$main->setErrorMessage("The subject line and/or body may be empty" . $NewCommentSubject . "#" . $NewComment);				
 				$main->setFormAction($_SERVER['PHP_SELF'] . "?fAddCommentSubmit=1&iDocumentID=$fDocumentID");
 				$oPatternCustom->addHtml(getAddComment($fDocumentID,$_POST["NewCommentSubject"],$_POST["NewComment"]));
 			} // end of IF for Subject and Body test	
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
index 858d038..0dbe75a 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
@@ -72,7 +72,7 @@ function getAddComment($fDocumentID, $sSubject, $sBody) {
 	$sToRender .= "<td align=right width=100%><input onmouseover=\"this.style.cursor='hand'\" type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\"></td>";
 	$sToRender .= "<td width=\"10\"><img src=\"$default->graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" ></td></tr>\n";
 	$sToRender .= "<br><tr><td valign=\"top\" width=10><b>Subject</b></td><td colspan=2>\n";
-	$sToRender .= "<input type=\"text\" style=\"width:385\" width= name=\"NewCommentSubject\" id=\"NewCommentSubject\" value=\"$sSubject\"></td></tr>\n";
+	$sToRender .= "<input type=\"text\" style=\"width:385\"  name=\"NewCommentSubject\" id=\"NewCommentSubject\" value=\"$sSubject\"></td></tr>\n";	
 	$sToRender .= "<tr><td valign=\"top\"><b>Body</b></td><td colspan=2><textarea  cols=60 rows=\"21\" name=\"NewComment\" id=\"NewComment\" style=\"FONT-STYLE: normal; FONT-FAMILY: sans-serif; FONT-VARIANT: normal\">$sBody</textarea></td></tr></table>\n";		
 
 	return $sToRender;	
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
index 559202f..028ef6f 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
@@ -62,7 +62,7 @@ if(checkSession()) {
 					    $oSearchResults = & new PatternBrowseableSearchResults ($sQuery, 13, $aColumns, $aColumnTypes, $aColumnNames, $aHyperLinkURL, $aQueryStringCols, $aQueryStringVars);
 					    $oSearchResults->setStartIndex($iStartIndex);
 					    $oSearchResults->setQueryString("&fDocumentID=$fDocumentID&fForDiscussion=1");
-					    $oPatternCustom->addHtml(goBack());
+					    $oPatternCustom->addHtml(getPageButtons($oThread));
 					    $oPatternCustom->addHtml($oSearchResults->render());    
 						
 						// On opening, increment the number of views of current thread & update database
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
index 53a058e..6e88031 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
@@ -9,9 +9,18 @@
 */
 
 
-function goBack(){
+function getPageButtons($oThread){
 	global $default;
-	return "<table width=100%><tr><td align=right><img src=\"$default->graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" ></td></tr></table>";
+	
+	$sToRender .= "<table width=100%><tr>\n";
+	$sToRender .= "<td align=right width=100%><a href=\"" . generateControllerLink("addComment", "fDocumentID=" . $oThread->getDocumentID() . "&fAddComment=1") . "\"><img src=\"$default->graphicsUrl/widgets/addcomment.gif\" border=\"0\" /></a></td>\n";
+	$sToRender .= "<td align=right width=10><img src=\"$default->graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" /></td>\n";
+		
+	$sToRender .= "</tr></table>\n";
+	//$sToRender .= "<a href=\"" . generateControllerLink("addComment", "fDocumentID=" . $oThread->getDocumentID() . "&fAddComment=1") . "\"><img src=\"$default->graphicsUrl/widgets/addcomment.gif\" border=\"0\" /></a>\n";
+	//$sToRender .= "<img src=\"$default->graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" />\n";
+	
+	return $sToRender ; 
 }
 
 // If there are no threads to view for a document