diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentUI.inc
new file mode 100644
index 0000000..9c54882
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentUI.inc
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * $Id$
+ *
+ * HTML information for document stuff.
+ *
+ * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package presentation.lookAndFeel.knowledgeTree.documentmanagement
+ */
+
+/**
+ * Prompts the user for a check in comment and revision type
+ *
+ * @param object the document we're checking in
+ */
+function renderCheckInPage($oDocument) {
+	global $default;
+	
+	$sToRender  = "<table>\n";
+	$sToRender .= "<tr><td>Select the file to check in:</td></tr>\n";
+	$sToRender .= "<tr><td><input type=\"file\" name=\"fFile\">";
+    /*
+	$sToRender .= "<tr><td><input type=\"file\" name=\"browse\" style=\"display:none\">";
+    $sToRender .= "<input type=\"text\" name=\"fFile\"\>\n";
+    $sToRender .= "<a href=\"#\" onClick=\"document.MainForm.browse.click();document.MainForm.fFile.value=document.MainForm.browse.value;return false;\">";
+    $sToRender .= "<img src=\"$default->graphicsUrl/widgets/browse.gif\" alt=\"browse\" border=\"0\"></a>\n";
+    */
+    $sToRender .= "</td></tr>\n";
+    $sToRender .= "</table>\n";
+    
+	$sToRender .= "<table>\n";  
+	$sToRender .= "<tr><td>Enter a check in comment for '" . $oDocument->getName() . "'</td></tr>\n";
+	$sToRender .= "<tr/>\n";
+	$sToRender .= "<tr><td><input type=\"text\" name=\"fCheckInComment\" size=\"30\"/></td></tr>\n";
+    $sToRender .= "<input type=\"hidden\" name=\"fForStore\" value=\"1\"/>\n";
+    $sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/>\n";     
+    // if collaboration has started then revisions are minor
+    if (DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) {
+        $sToRender .= "<input type=\"hidden\" name=\"fCheckInType\" value=\"minor\"/>\n";
+    // else there is no collaboration, revisions are major (or override?)        
+    } else {
+        $sToRender .= "<input type=\"hidden\" name=\"fCheckInType\" value=\"major\"/>\n";
+    }
+
+    /*
+    $sToRender .= "<tr><td>\n";
+    $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"minor\" checked /> Minor Revision\n";    
+    $sToRender .= "</tr></td>\n";
+    $sToRender .= "<tr><td>\n";
+    $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\"/> Major Revision\n";
+    $sToRender .= "</tr></td>\n";
+    */
+    $sToRender .= "</table>\n";
+    
+    $sToRender .= "<table>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "<td><input type=\"image\" border=\"0\" src =\"$default->graphicsUrl/widgets/checkin.gif\" value=\"Submit\" onClick=\"if (validRequired(document.MainForm.fFile, 'Check-In File') && validRequired(document.MainForm.fCheckInComment, 'Check-In Comment')) { return confirm('Are you sure you want to overwrite " . $oDocument->getName() . " with ' + document.MainForm.fFile.value + '?'); } else return false;\"/>\n";
+	$sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n";	    
+	$sToRender .= "</tr>\n";
+	$sToRender .= "</table>\n";
+
+	/*
+	$sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
+	$sToRender .= "function validateCheckIn() {\n";
+	$sToRender .= "alert('blah'); return false;\n";
+	$sToRender .= "  if (validRequired(document.MainForm.fFile, 'Check-In File') && validRequired(document.MainForm.fCheckInComment, 'Check-In Comment')) {\n";
+	$sToRender .= "    var directoryTokensArray=document.MainForm.fComment.split('\');\n";
+	$sToRender .= "    if (directoryTokensArray.length == 0) {\n";
+	$sToRender .= "      directoryTokensArray = document.MainForm.fComment.split('/');\n";
+	$sToRender .= "    }\n";
+    //$sToRender .= "alert('filename=' + directoryTokensArray[directoryTokensArray.length-1]);\n";	
+	$sToRender .= "    if ('" . $oDocument->getFileName() . "' <> directoryTokensArray[directoryTokensArray.length-1]) {\n";
+    $sToRender .= "      alert('Please check in the same file, you attempted to check in ' + document.MainForm.fComment + '!');\n";
+    $sToRender .= "      return false;\n";
+	$sToRender .= "    } else {\n";    
+	$sToRender .= "      return confirm('Are you sure you want to overwrite " . $oDocument->getName() . " with ' + document.MainForm.fFile.value + '?');\n";
+	$sToRender .= "    }\n";
+	$sToRender .= "  } else {\n";
+	$sToRender .= "    return false;\n";
+	$sToRender .= "  }\n";
+	$sToRender .= "}\n";	
+	$sToRender .= "//-->\n</script>\n\n";
+	*/
+	return $sToRender;
+}
+
+/**
+ * Displays the document view page with additional input controls
+ * for checking in the document
+ *
+ * @param object the document to view and check out
+ */
+function getCheckInPage($oDocument) {
+    return getPage($oDocument, false, renderCheckInPage($oDocument));
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
new file mode 100644
index 0000000..5b0ee6e
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * $Id$
+ *
+ * HTML information for document stuff.
+ *
+ * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ *
+ * @version $Revision$
+ * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package presentation.lookAndFeel.knowledgeTree.documentmanagement
+ */
+
+/**
+ * Prompts the user for a checkout comment
+ *
+ * @param object the document we're checking out
+ */
+function renderCheckOutPage($oDocument) {
+	global $default;
+	
+	$sToRender  = "<table>\n";
+	$sToRender .= "<tr><td>Enter a check out comment for '" . $oDocument->getName() . "'</td></tr>\n";
+	$sToRender .= "<tr/>\n";
+	$sToRender .= "<tr><td><input type=\"text\" name=\"fCheckOutComment\" size=\"30\"/></td></tr>\n";
+    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n";
+    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/></td></tr>\n";
+	$sToRender .= "<tr>\n";
+	$sToRender .= "</tr>\n";
+	$sToRender .= "<tr>\n";
+    $sToRender .= "<td><input type=\"image\" border=\"0\" src =\"$default->graphicsUrl/widgets/checkout.gif\" value=\"Submit\"/>\n";
+	$sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n";	    
+	$sToRender .= "</tr>\n";
+	$sToRender .= "</table>\n";
+	
+	return $sToRender;    
+}
+
+/**
+ * Displays the document view page with additional input controls
+ * for checking out the document
+ *
+ * @param object the document to view and check out
+ */
+function getCheckOutPage($oDocument, $bCheckedOut = false) {
+    global $default;
+    
+    if ($bCheckedOut) {
+    	$sToRender .= "<table>";
+        $sToRender .= "<tr><td>You have now checked out this document. No one else can make updates to the document while you have it checked out. Click the Download button to get the latest version of the file. Please check it back in, as soon as you finish working on it.</td></tr>\n";
+        $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "&fForDownload=1\"><img src=\"$default->graphicsUrl/widgets/download.gif\" border=\"0\" /></a>\n";    
+        $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\" /></a></td>\n";
+        $sToRender .= "</table>";        
+    } else {
+        $sToRender .= renderCheckOutPage($oDocument);
+    }
+
+    return getPage($oDocument, false, $sToRender);
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
index 5f86a4c..da6480d 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
@@ -78,90 +78,6 @@ function displayDocumentLink($oDocument, $bDisplayFullPath = false) {
                         $sIconPath . "&nbsp;" . $sLinkText);
 }
 
-/**
- * Prompts the user for a check in comment and revision type
- *
- * @param object the document we're checking in
- */
-function renderCheckInPage($oDocument) {
-	global $default;
-	
-	$sToRender  = "<table>\n";
-	$sToRender .= "<tr><td>Select the file to check in:</td></tr>\n";
-	$sToRender .= "<tr><td><input type=\"file\" name=\"fFile\">";
-    /*
-	$sToRender .= "<tr><td><input type=\"file\" name=\"browse\" style=\"display:none\">";
-    $sToRender .= "<input type=\"text\" name=\"fFile\"\>\n";
-    $sToRender .= "<a href=\"#\" onClick=\"document.MainForm.browse.click();document.MainForm.fFile.value=document.MainForm.browse.value;return false;\">";
-    $sToRender .= "<img src=\"$default->graphicsUrl/widgets/browse.gif\" alt=\"browse\" border=\"0\"></a>\n";
-    */
-    $sToRender .= "</td></tr>\n";
-    $sToRender .= "</table>\n";
-    
-	$sToRender .= "<table>\n";  
-	$sToRender .= "<tr><td>Enter a check in comment for '" . $oDocument->getName() . "'</td></tr>\n";
-	$sToRender .= "<tr/>\n";
-	$sToRender .= "<tr><td><input type=\"text\" name=\"fCheckInComment\" size=\"30\"/></td></tr>\n";
-    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n";
-    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/></td></tr>\n";    
-    $sToRender .= "<tr><td>\n";
-  
-    // if collaboration has started then revisions are minor
-    if (DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) {
-        $sToRender .= "<input type=\"hidden\" name=\"fCheckInType\" value=\"minor\"/>\n";
-    // else there is no collaboration, revisions are major (or override?)        
-    } else {
-        $sToRender .= "<input type=\"hidden\" name=\"fCheckInType\" value=\"major\"/>\n";
-    }
-    $sToRender .= "</tr></td>\n";
-    /*
-    $sToRender .= "<tr><td>\n";
-    $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"minor\" checked /> Minor Revision\n";    
-    $sToRender .= "</tr></td>\n";
-    $sToRender .= "<tr><td>\n";
-    $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\"/> Major Revision\n";
-    $sToRender .= "</tr></td>\n";
-    */
-    $sToRender .= "</table>\n";
-    
-    $sToRender .= "<table>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><input type=\"image\" border=\"0\" src =\"$default->graphicsUrl/widgets/checkin.gif\" value=\"Submit\" onClick=\"if (validRequired(document.MainForm.fFile, 'Check-In File') && validRequired(document.MainForm.fCheckInComment, 'Check-In Comment')) { return confirm('Are you sure you want to overwrite " . $oDocument->getName() . " with ' + document.MainForm.fFile.value + '?'); } else return false;\"/>\n";
-	$sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n";	    
-	$sToRender .= "</tr>\n";
-	$sToRender .= "</table>\n";
-	
-	return $sToRender;
-}
-
-
-/**
- * Prompts the user for a checkout comment
- *
- * @param object the document we're checking out
- */
-function renderCheckOutPage($oDocument) {
-	global $default;
-	
-	$sToRender  = "<table>\n";
-	$sToRender .= "<tr><td>Enter a check out comment for '" . $oDocument->getName() . "'</td></tr>\n";
-	$sToRender .= "<tr/>\n";
-	$sToRender .= "<tr><td><input type=\"text\" name=\"fCheckOutComment\" size=\"30\"/></td></tr>\n";
-    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n";
-    $sToRender .= "<tr><td><input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/></td></tr>\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= "<tr>\n";
-    $sToRender .= "<td><input type=\"image\" border=\"0\" src =\"$default->graphicsUrl/widgets/checkout.gif\" value=\"Submit\" onClick=\"return validRequired(document.MainForm.fCheckOutComment, 'Check-Out Comment');\" />\n";
-	$sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td>\n";	    
-	$sToRender .= "</tr>\n";
-	$sToRender .= "</table>\n";
-	
-	return $sToRender;    
-}
-
 function renderErrorPage($sErrorMessage, $iDocumentID = -1) {
     global $default;
     return "<p class=\"errorText\">$sErrorMessage</p>\n" .