diff --git a/plugins/ktcore/admin/unitManagement.php b/plugins/ktcore/admin/unitManagement.php
index 249b88a..33c0315 100755
--- a/plugins/ktcore/admin/unitManagement.php
+++ b/plugins/ktcore/admin/unitManagement.php
@@ -94,58 +94,48 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
         $_REQUEST['fFolderId'] = $iFolderId;
         $oFolder = $this->oValidator->validateFolder($_REQUEST['fFolderId']);
 
-        $collection = new DocumentCollection();
-        $collection->addColumn(new KTUnitTitleColumn($sName));
-        $qObj = new FolderBrowseQuery($oFolder->getId());
-        $collection->setQueryObject($qObj);
-        $batchPage = (int) KTUtil::arrayGet($_REQUEST, "page", 0);
-        $batchSize = 20;
-        $collection->empty_message = _kt('No folders available in this location.');
-        $resultURL = KTUtil::addQueryString($_SERVER['PHP_SELF'], sprintf("action=addUnit2&unit_name=%s&fFolderId=%d", $sName, $oFolder->getId()));
-        $collection->setBatching($resultURL, $batchPage, $batchSize);
 
-        // ordering. (direction and column)
-        $displayOrder = KTUtil::arrayGet($_REQUEST, 'sort_order', "asc");
-        if ($displayOrder !== "asc") { $displayOrder = "desc"; }
-        $displayControl = KTUtil::arrayGet($_REQUEST, 'sort_on', "title");
 
-        $collection->setSorting($displayControl, $displayOrder);
+        // Setup the collection for move display.
+        $collection = new AdvancedCollection();
 
-        $collection->getResults();
+        $oCR =& KTColumnRegistry::getSingleton();
+        $col = $oCR->getColumn('ktcore.columns.title');
+        $col->setOptions(array('qs_params'=>array('fFolderId'=>$oFolder->getId())));
+        $collection->addColumn($col);
 
-        $aBreadcrumbs = array();
-        $folder_path_names = $oFolder->getPathArray();
-        $folder_path_ids = explode(',', $oFolder->getParentFolderIds());
-        $folder_path_ids[] = $oFolder->getId();
-        if ($folder_path_ids[0] == 0) {
-            array_shift($folder_path_ids);
-            array_shift($folder_path_names);
-        }
+        $qObj = new FolderBrowseQuery($oFolder->getId());
+        $collection->setQueryObject($qObj);
 
-        foreach (range(0, count($folder_path_ids) - 1) as $index) {
-            $id = $folder_path_ids[$index];
-            $url = KTUtil::addQueryString($_SERVER['PHP_SELF'], sprintf("action=addUnit2&unit_name=%s&fFolderId=%d", $sName, $id));
-            $aBreadcrumbs[] = array("url" => $url, "name" => $folder_path_names[$index]);
-        }
+        $collection->empty_message = _kt('No folders available in this location.');
+        $aOptions = $collection->getEnvironOptions();
+        $collection->setOptions($aOptions);
+
+        $oWF =& KTWidgetFactory::getSingleton();
+        $oWidget = $oWF->get('ktcore.widgets.collection',
+                             array('label' => _kt('Target Folder'),
+                                   'description' => _kt('<p>The folder given below is where the unit folder will be created. Use the folder collection and path below to browse to the folder you wish to create the unit folder into.</p><p>The unit administrators have additional rights within that portion of the document management system.
+</p>'),
+                                   'required' => true,
+                                   'name' => 'browse',
+                                   'folder_id' => $oFolder->getId(),
+                                   'collection' => $collection));
+                                                       
+        
 
         $add_fields = array();
         $add_fields[] =  new KTStaticTextWidget(_kt('Unit Name'), _kt('A short name for the unit.  e.g. <strong>Accounting</strong>.'), 'unit_name', $sName, $this->oPage, true);
 
-		$isValid = true;
-		if (KTFolderUtil::exists($oFolder, $sName)) {
-			$isValid = false; // can't add a unit folder with the same name.
-		}
+        $add_fields[] = $oWidget;
 
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate("ktcore/principals/addunit2");
         $aTemplateData = array(
             "context" => $this,
             "add_fields" => $add_fields,
-            "collection" => $collection,
-            "collection_breadcrumbs" => $aBreadcrumbs,
+            "unit_name" => $sName,
             "folder" => $oFolder,
             "name" => $sName,
-			"is_valid" => $isValid,
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -161,9 +151,9 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
             'message' => _kt('No name given'),
         );
         $sName = $this->oValidator->validateString($_REQUEST['unit_name'], $aOptions);
-		$aOptions['message'] = _kt('A unit with that name already exists.');
-		$sName = $this->oValidator->validateDuplicateName('Unit', $sName, $aOptions);
-
+        $aOptions['message'] = _kt('A unit with that name already exists.');
+        $sName = $this->oValidator->validateDuplicateName('Unit', $sName, $aOptions);
+                
         $oFolder = KTFolderUtil::add($oParentFolder, $sName, $this->oUser);
         $aOptions = array(
             'redirect_to' => array('addUnit2', sprintf('fFolderId=%d&unit_name=%s', $oParentFolder->getId(), $sName)),
diff --git a/templates/ktcore/principals/addunit2.smarty b/templates/ktcore/principals/addunit2.smarty
index 1dda048..e4ce203 100644
--- a/templates/ktcore/principals/addunit2.smarty
+++ b/templates/ktcore/principals/addunit2.smarty
@@ -13,32 +13,9 @@ your unit folder.{/i18n}</p>
         {$oWidget->render()}
       {/foreach}
 
-<div class="field ">
-<label for="fFolderId">{i18n}Target folder{/i18n}</label>
-<p class="descriptiveText">{i18n}The folder given below is where the
-unit folder will be created.  Use the folder collection and path below
-to browse to the folder you wish to create the unit folder into.{/i18n}</p>
-
-<p class="descriptiveText">{i18n}The unit administrators have additional
-rights within that portion of the document management system.{/i18n}</p>
-
-<input type="hidden" name="fFolderId" value="{$folder->getId()}" />
-{foreach from=$collection_breadcrumbs item=breadcrumb name=bc}
-<a href="{$breadcrumb.url}">{$breadcrumb.name}</a>
-{if !$smarty.foreach.bc.last}
-&raquo;
-{/if}
-{/foreach}
-{$collection->render()}
-</div>
 
       <div class="form_actions">
-         {if $is_valid}
          <input type="submit" value="{i18n}create unit{/i18n}" />
-         {else}
-         <p class="descriptiveText">{i18n}A folder with this name already exists in this location.  Please select
-         another folder before creating the unit.{/i18n}</p>
-         {/if}
          <input type="submit" name="kt_cancel[]" value="{i18n}Cancel{/i18n}" />
       </div>
    </fieldset>