diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
index 84e9c9b..d6dd7b7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
@@ -12,9 +12,11 @@ $sectionName = "Administration";
 require_once(KT_DIR . "/presentation/webpageTemplate.inc");
 
 class KTDocumentFieldDispatcher extends KTStandardDispatcher {
+    var $bAutomaticTransaction = true;
+
     function do_main () {
         $oTemplating =& KTTemplating::getSingleton();
-        $oTemplate = $oTemplating->loadTemplate('ktcore/fields/list');
+        $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/listFieldsets');
         $oTemplate->setData(array(
             'fieldsets' => KTFieldset::getList(),
         ));
@@ -23,7 +25,7 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
 
     function do_edit() {
         $oTemplating =& KTTemplating::getSingleton();
-        $oTemplate = $oTemplating->loadTemplate('ktcore/fields/edit');
+        $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/editFieldset');
         $oFieldset =& KTFieldset::get($_REQUEST['fFieldsetId']);
         $oTemplate->setData(array(
             'oFieldset' => $oFieldset,
@@ -70,6 +72,29 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         exit(0);
     }
 
+    function do_editField() {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/editField');
+        $oFieldset =& KTFieldset::get($_REQUEST['fFieldsetId']);
+        $oField =& DocumentField::get($_REQUEST['fFieldId']);
+        $oTemplate->setData(array(
+            'oFieldset' => $oFieldset,
+            'oField' => $oField,
+        ));
+        return $oTemplate;
+    }
+
+    function do_addLookups() {
+        $oFieldset =& KTFieldset::get($_REQUEST['fFieldsetId']);
+        $oField =& DocumentField::get($_REQUEST['fFieldId']);
+        $oMetaData =& MetaData::createFromArray(array(
+            'name' => $_REQUEST['value'],
+            'docfieldid' => $oField->getId(),
+        ));
+        $this->successRedirectTo('editField', 'Lookup added', 'fFieldsetId=' . $oFieldset->getId() . '&fFieldId=' .  $oField->getId());
+        exit(0);
+    }
+
     function handleOutput($data) {
         global $main;
         $main->bFormDisabled = true;
diff --git a/templates/ktcore/metadata/edit.smarty b/templates/ktcore/metadata/edit.smarty
new file mode 100644
index 0000000..6aada46
--- /dev/null
+++ b/templates/ktcore/metadata/edit.smarty
@@ -0,0 +1,59 @@
+<h1>Fieldset: {$oFieldset->getName()|escape}</h1>
+
+<h2>Fieldset properties</h2>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="editobject">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" value="{$oFieldset->getName()|escape}"></td>
+  </tr>
+  <tr>
+    <th>Namespace</th>
+    <td><input type="textbox" name="namespace" value="{$oFieldset->getNamespace()|escape}"></td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Change">
+</form>
+
+<h2>Fieldset members</h2>
+
+{if $oFieldset->getFields() }
+<h3>Existing members</h3>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<ul>
+{foreach from=$oFieldset->getFields() item=oField}
+  <li><label><input type="checkbox"
+name="fieldsetids[]"
+value="{$oField->getId()}">{$oField->getName()|escape}</label></li>
+{/foreach}
+</ul>
+<input type="submit" name="submit" value="Remove fields">
+</form>
+{/if}
+
+<h3>Add a new field</h3>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="newfield">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" />
+  </tr>
+  <tr>
+    <th>Type</th>
+    <td>
+<select name="type">
+<option value="normal">Normal</option>
+<option value="lookup">Lookup</option>
+<option value="tree">Tree</option>
+</select>
+    </td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Add field">
+</form>
diff --git a/templates/ktcore/metadata/editField.smarty b/templates/ktcore/metadata/editField.smarty
new file mode 100644
index 0000000..a776c86
--- /dev/null
+++ b/templates/ktcore/metadata/editField.smarty
@@ -0,0 +1,48 @@
+<h1>Field: {$oField->getName()|escape}</h1>
+
+<h2>Field properties</h2>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="fFieldId" value="{$oField->getId()}">
+<input type="hidden" name="action" value="editfieldobject">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" value="{$oField->getName()|escape}"></td>
+  </tr>
+  <tr>
+    <th>Type</th>
+    <td>{$oField->getType()|escape}</td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Change">
+</form>
+
+{if $oField->getHasLookup() and !$oField->getHasLookupTree()}
+{assign var="aMetadata" value=$oField->getValues()}
+{if $aMetadata}
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="fFieldId" value="{$oField->getId()}">
+<input type="hidden" name="action" value="removeLookups">
+<ul>
+{foreach from=$aMetadata item=oMetaData}
+  <li><label><input type="checkbox" name="metadata[]" value="{$oMetaData->getId()}">{$oMetaData->getName()|escape}</label>
+{/foreach}
+</ul>
+<input type="submit" name="submit" value="Remove">
+</form>
+{/if}
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="fFieldId" value="{$oField->getId()}">
+<input type="hidden" name="action" value="addLookups">
+<input type="textbox" name="value">
+<input type="submit" name="submit" value="Add">
+</form>
+{/if}
+
+{if $oField->getHasLookup() and $oField->getHasLookupTree()}
+Tree
+{/if}
diff --git a/templates/ktcore/metadata/editFieldset.smarty b/templates/ktcore/metadata/editFieldset.smarty
new file mode 100644
index 0000000..1009db8
--- /dev/null
+++ b/templates/ktcore/metadata/editFieldset.smarty
@@ -0,0 +1,61 @@
+<h1>Fieldset: {$oFieldset->getName()|escape}</h1>
+
+<h2>Fieldset properties</h2>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="editobject">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" value="{$oFieldset->getName()|escape}"></td>
+  </tr>
+  <tr>
+    <th>Namespace</th>
+    <td><input type="textbox" name="namespace" value="{$oFieldset->getNamespace()|escape}"></td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Change">
+</form>
+
+<h2>Fieldset members</h2>
+
+{if $oFieldset->getFields() }
+<h3>Existing members</h3>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<ul>
+{foreach from=$oFieldset->getFields() item=oField}
+  <li><input type="checkbox" name="fieldsetids[]"
+value="{$oField->getId()}">
+<a
+href="{$smarty.server.PHP_SELF}?action=editField&fFieldId={$oField->getId()}&fFieldsetId={$oFieldset->getId()}">{$oField->getName()|escape}</a>
+</li>
+{/foreach}
+</ul>
+<input type="submit" name="submit" value="Remove fields">
+</form>
+{/if}
+
+<h3>Add a new field</h3>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="newfield">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" />
+  </tr>
+  <tr>
+    <th>Type</th>
+    <td>
+<select name="type">
+<option value="normal">Normal</option>
+<option value="lookup">Lookup</option>
+<option value="tree">Tree</option>
+</select>
+    </td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Add field">
+</form>
diff --git a/templates/ktcore/metadata/listFieldsets.smarty b/templates/ktcore/metadata/listFieldsets.smarty
new file mode 100644
index 0000000..247cbd1
--- /dev/null
+++ b/templates/ktcore/metadata/listFieldsets.smarty
@@ -0,0 +1,47 @@
+<h1>Document Fields</h1>
+
+{ if $fieldsets}
+<h2>Existing generic document fields</h2>
+
+<table class="pretty" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Generic</th>
+      <th>Fields</th>
+    </tr>
+  </thead>
+  <tbody>
+{foreach from=$fieldsets item=oFieldset}
+    <tr>
+      <td>
+        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}"> { $oFieldset->getName() }
+        </a>
+      </td>
+      <td>
+{if $oFieldset->getIsGeneric()}
+	Yes
+{else}
+	No
+{/if}
+      </td>
+      <td>
+<ul>
+{foreach from=$oFieldset->getFields() item=oField}
+  <li>{$oField->getName()}</li>
+{/foreach}
+</ul>
+      </td>
+    </tr>
+  </tbody>
+{/foreach}
+</table>
+{/if}
+
+<h2>Create a new document field set</h2>
+
+<form method="POST">
+<input type="hidden" name="action" value="new">
+<input type="textbox" name="name">
+<input type="submit" name="submit" value="Create">
+</form>