diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
index a1d6f3a..ee7df1a 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
@@ -8,16 +8,27 @@ require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php');
 
 require_once(KT_LIB_DIR . '/visualpatterns/PatternMetaData.inc');
 
+class KTSimplePage {
+    function requireJSResource() {
+    }
+}
+
 class GetTypeMetadataFieldsDispatcher extends KTDispatcher {
     function do_main() {
+        $this->oPage = new KTSimplePage;
         return $this->getTypeMetadataFieldsets ($_REQUEST['fDocumentTypeID']);
     }
 
     function getTypeMetadataFieldsets ($iDocumentTypeID) {
+        $fieldsets = array();
+        $fieldsetDisplayReg =& KTFieldsetDisplayRegistry::getSingleton();
+        $activesets = KTFieldset::getForDocumentType($iDocumentTypeID);
+        foreach ($activesets as $oFieldset) {
+            $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace());
+            array_push($fieldsets, new $displayClass($oFieldset));
+        }
         $aTemplateData = array(
-            'caption' => _('Type specific meta data'),
-            'empty_message' => _("No Type Specific Meta Data"),
-            'fieldsets' => KTFieldSet::getForDocumentType($iDocumentTypeID),
+            'fieldsets' => $fieldsets,
         );
         $oTemplating = KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate("ktcore/metadata/editable_metadata_fieldsets");
diff --git a/templates/ktcore/metadata/editable_metadata_fieldsets.smarty b/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
index cd8e582..46e9f85 100644
--- a/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
+++ b/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
@@ -1,94 +1,3 @@
-{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Base.js")}
-{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
-{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
-{$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DateTime.js")}
-{$context->oPage->requireJSResource("resources/js/taillog.js")}
-{$context->oPage->requireJSResource("resources/js/conditional_usage.js")}
-
-{literal}
-<style>
-
-.kt_treenodes {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    border: 0;
-    text-align: left !important;
-}
-
-.leafnode {font-weight: bold; }
-
-.kt_treenodes ul {
-    list-style: none;
-    text-align: left;
-}
-.kt_treenodes li.treenode > a.pathnode {
-   background: transparent url(/graphics/plus.png) center left no-repeat;
-   padding-left: 15px;
-}
-
-.kt_treenodes li.treenode.active > a.pathnode {
-   background: transparent url(/graphics/minus.png) center left no-repeat;
-}
-
-.kt_treenodes li.active > ul {
-    display: block;
-}
-
-.kt_treenodes li ul {
-    display: none;
-}
-
-</style>
-{/literal}
-
-{if !$metadata_prefix}
-  {assign var="metadata_prefix" value="emd"}
-{/if}
-
-{if $caption}
-  <p>{$caption}</p>
-{/if}
-
 {foreach from=$fieldsets item=oFieldset}
-{if $oFieldset->getIsConditional()}
-<fieldset class="conditional_metadata">
-<input type="hidden" class="fixed" name="fieldset" value="{$oFieldset->getId()}" />
-{else}
-<fieldset>
-{/if}
-  <legend><span title="Fieldset: {$oFieldset->getId()}">{$oFieldset->getName()}</span></legend>
-
-  <table class="prettysw" cellpadding="0" cellspacing="0">
-   <tbody class="conditional_target">
-  {if !$oFieldset->getIsConditional()}
-    { foreach item=oField from=$oFieldset->getFields() }
-      <tr>
-        <th>{$oField->getName()}</th>
-        <td>
-  
-    {php}
-    $oField = $this->_tpl_vars['oField'];
-    $sPrefix = $this->_tpl_vars['metadata_prefix'];
-    $sValue = $this->_tpl_vars['values'][$oField->getID()];
-    $this->assign('pattern',
-    	new PatternMetadata($oField->getName(), $sPrefix .  $oField->getID(), $sValue));
-    {/php}
-    {$pattern->render()}
-  
-        </td>
-      </tr>
-    { /foreach }
-  {/if}
-   </tbody>
-  </table>
-</fieldset>
-{foreachelse}
-No fields found
+    {$oFieldset->renderEdit($document_data)}
 {/foreach}
-
-<!--
-<table id="brad-log">
-<tbody><tr><td>asdf</td></tr></tbody>
-</table>
--->