diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
index ff444f1..cd73654 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
@@ -27,41 +27,30 @@ if (checkSession()) {
 	global $default;
 	$oPatternCustom = & new PatternCustom();		
 	
-	$oPatternCustom->addHtml(renderHeading("Edit Document Checkout"));
-
-	if (isset($fDocID)){	
+	if (isset($fDocumentID)) {	
 		if (isset($fUpdate)) {	
-			$oDocument = Document::get($fDocID);
-			
-			if (($oDocument->getIsCheckedOut() > 0 && $fDocCheckout=="on" ) ||
-				($oDocument->getIsCheckedOut() == 0 && $fDocCheckout=="" )){
-				$main->setErrorMessage("No changes were made to the document checkout.");
-			} else {
-				if ($fDocCheckout=="on"){
-					$oDocument->setIsCheckedOut(1);				
+			$oDocument = Document::get($fDocumentID);
+			$oDocument->setIsCheckedOut(0);
+			$oDocument->setCheckedOutUserID(-1);
+			if ($oDocument->update()) {
+				// checkout cancelled transaction
+				$oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), "Document checked out cancelled", FORCE_CHECKIN);
+				if ($oDocumentTransaction->create()) {
+					$default->log->debug("editDocCheckoutBL.php created forced checkin document transaction for document ID=" . $oDocument->getID());                                    	
 				} else {
-					$oDocument->setIsCheckedOut(0);
-					$oDocument->setCheckedOutUserID(-1);
-				}				
-				if ($oDocument->update()){
-                    // checkout cancelled transaction
-                    $oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), "Document checked out cancelled", FORCE_CHECKIN);
-                    if ($oDocumentTransaction->create()) {
-                    	$default->log->debug("editDocCheckoutBL.php created forced checkin document transaction for document ID=" . $oDocument->getID());                                    	
-                    } else {
-                    	$default->log->error("editDocCheckoutBL.php couldn't create create document transaction for document ID=" . $oDocument->getID());
-                    }                                    
-					$oPatternCustom->addHtml(getEditCheckoutSuccessPage());
-				} else {
-					$main->setErrorMessage("Error while trying to update the document checkout.");
-				}
-			}			
+					$default->log->error("editDocCheckoutBL.php couldn't create create document transaction for document ID=" . $oDocument->getID());
+				}                                    
+				$oPatternCustom->setHtml(getEditCheckoutSuccessPage());
+			} else {
+				$oPatternCustom->setHtml(getErrorPage("Error while trying to update the document checkout."));
+			}
 		} else {
-			$oPatternCustom->addHtml($fDocCheckout . getEditCheckoutPage($fDocID));
-			$main->setFormAction($_SERVER["PHP_SELF"] . "?fUpdate=1&fDocID=$fDocID");
+			$oPatternCustom->addHtml(getEditCheckoutPage($fDocumentID));
+			$main->setFormAction($_SERVER["PHP_SELF"]);
 		}
 	} else {
 		// no document selected
+		$oPatternCustom->setHtml(getErrorPage("No document selected to check back in"));
 	}
 	//render the page
 	$main->setCentralPayload($oPatternCustom);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
index 6d5f117..03744f5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
@@ -8,39 +8,25 @@
 *
 */
 
-
 function getEditCheckoutSuccessPage(){
 	global $default;
-	
-	$sToRender .= "Succesfully updated document checkout.\n";
-	$sToRender .= "<a href=\"$default->rootUrl/control.php?action=listDocs\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a>";
-	
-	return $sToRender;
-	
+	return statusPage("Edit Document Checkout", "Succesfully updated document checkout.", "", "listDocs");
 }
 
-function getEditCheckoutPage($fDocID){
+function getErrorPage($sMessage) {
+	return statusPage("Edit Document Checkout", "Error checking in document", $sMessage, "listDocs");
+}	
+
+function getEditCheckoutPage($fDocumentID){
 	global $default;
 	
-	$oDoc = Document::get($fDocID);
-		
+	$oDocument = Document::get($fDocumentID);
+	$sToRender .= renderHeading("Edit Document Checkout");	
 	$sToRender .= "<table>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>\n";
-	$sToRender .= "<b>Document Name: </b>" . $oDoc->getName();
-	$sToRender .= "</td>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>\n";
-	$sToRender .= "<b>Checked out?: </b>";
-	
-	if($oDoc->getIsCheckedOut() > 0){
-		$bCheckedOut = "checked";	
-	} 	
-	$sToRender .= "<input type=checkbox $bCheckedOut name=fDocCheckout>";
-	
-	$sToRender .= "</td>\n";
-	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr><td>Are you sure you want to Check In this document:</tr></td>";
+	$sToRender .= "<tr><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>"; 
+ 	$sToRender .= "<input type=\"hidden\" name=\"fUpdate\" value=\"1\">\n";
+ 	$sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td align=right>\n";	
 	$sToRender .= getUpdateButton();	
@@ -50,22 +36,18 @@ function getEditCheckoutPage($fDocID){
 	$sToRender .= "</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "</table>\n";
-	
 	return $sToRender;
-
 }
 
 // gets the updatebutton when a unit is selected
 function getUpdateButton() {
 	global $default;
-	
 	return "<input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/>\n";	
 }
 
 // gets the cancel button when a unit is selected
 function getCancelButton() {
 	global $default;
-	
 	return "<a href=\"$default->rootUrl/control.php?action=listDocs\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a>\n";
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
index ebf649e..daf397c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
@@ -8,59 +8,38 @@
 *
 */
 
-	require_once("../../../../../config/dmsDefaults.php");
-
-if (checkSession()) {    
-    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");    
-    //require_once("listOrgUI.inc"); 
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-    require_once("$default->fileSystemRoot/lib/documentmanagement/Document.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/lib/discussions/DiscussionThread.inc");  
-    require_once("$default->fileSystemRoot/lib/discussions/DiscussionComment.inc");   
-    require_once("$default->fileSystemRoot/presentation/Html.inc");
-	
+require_once("../../../../../config/dmsDefaults.php");
+require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
+require_once("$default->fileSystemRoot/lib/users/User.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
+require_once("$default->fileSystemRoot/presentation/Html.inc");
 	
-    $oPatternCustom = & new PatternCustom();
-
-if(checkSession()) {	
+if (checkSession()) {
 
-		$oPatternCustom->addHtml(renderHeading("Checked out Documents"));		// Create the Heading				
-		 
-		
-		$main->setFormAction($_SERVER['PHP_SELF']);
-				
-		$sQuery = "SELECT documents.id as DocId, documents.name as Name, documents.filename as File, " .
-				"CASE  WHEN users.name Is Null THEN '<font color=blue>* No one</font>' ELSE  users.name END AS UserName, " .
-				"'Check In' " .
-				"FROM documents left join users " .
-				"on documents.checked_out_user_id = users.id " .
-				"WHERE documents.is_checked_out = 1";
+	$oPatternCustom = & new PatternCustom();
+	$aDocuments = Document::getList("is_checked_out = 1");
+	$sToRender .= renderHeading("Checked out Documents");	
+	$sToRender .= "<table><tr><th width=\"80\">Document</th><th>Checked Out By</th><th>&nbsp;</th>";
+	if (count($aDocuments) > 0) {
+		for ($i=0; $i<count($aDocuments); $i++) {
+			if ($aDocuments[$i]) {
+				$oUser = User::get($aDocuments[$i]->getCheckedOutUserID());
+				$sToRender .= "<tr><td>" . $aDocuments[$i]->getDisplayPath() . "</td>";
+				$sToRender .= "<td>" . $oUser->getName() . "</td>";
+				$sToRender .= "<td>" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), "Check In") . "</td>"; 
+			}
+		}
+	}  else {
+		$sToRender .= "<tr><td colspan=\"3\">There are no checked out document</td></tr>";
+	}
+	$sToRender .= "</table>";
 
-	    $aColumns = array("Name", "File", "UserName", "Check In");
-	    $aColumnNames = array("Name", "File", "Checked Out by", "");
-	    $aColumnTypes = array(1,1,1,3);
-	    $aDBColumnArray = array("DocId");
-	    $aQueryStringVariableNames = array("fDocID");
-	    	    
-	    $aHyperLinkURL = array(	3=> "$default->rootUrl/control.php?action=editDocCheckout");
-	    	    
-	    $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
-		$oSearchResults->setDisplayColumnHeadings(true);
-		$oSearchResults->setEmptyTableMessage("No checked out documents");
-	
-	    $oPatternCustom->addHtml($oSearchResults->render());	    
-	
-	} // end of if checksession
-	
+    $oPatternCustom->setHtml($sToRender);
+   	    
+	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");    	    
 	$main->setCentralPayload($oPatternCustom);
+	$main->setFormAction($_SERVER['PHP_SELF']);	
     $main->render();
 }
-?>
+?>
\ No newline at end of file