diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index 812b6de44b..b63fad7a7a 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -11,7 +11,6 @@ from navigation.api import (register_links, register_top_menu,
 from main.api import register_diagnostic, register_maintenance_links
 from history.api import register_history_type
 from history.permissions import PERMISSION_HISTORY_VIEW
-from metadata.api import get_metadata_string
 from project_setup.api import register_setup
 from acls.api import class_permissions
 
@@ -122,11 +121,11 @@ document_type_filename_edit = {'text': _(u'edit'), 'view': 'document_type_filena
 document_type_filename_delete = {'text': _(u'delete'), 'view': 'document_type_filename_delete', 'args': 'filename.id', 'famfam': 'database_delete', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 
 # Register document type links
-register_links(DocumentType, [document_type_document_list, document_type_filename_list, document_type_edit, document_type_delete])
+register_links(DocumentType, [document_type_edit, document_type_delete, document_type_document_list, document_type_filename_list])
 register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete])
 
 register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu')
-register_links([DocumentType], [document_type_filename_create], menu_name='sidebar')
+register_links([DocumentTypeFilename, 'document_type_filename_list', 'document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
 
 # Register document links
 register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations, document_create_siblings])
@@ -167,9 +166,6 @@ register_model_list_columns(Document, [
         {'name':_(u'thumbnail'), 'attribute':
             encapsulate(lambda x: document_thumbnail(x))
         },
-        {'name':_(u'metadata'), 'attribute':
-            encapsulate(lambda x: get_metadata_string(x))
-        },
     ])
 
 register_top_menu(
diff --git a/apps/metadata/__init__.py b/apps/metadata/__init__.py
index b60de4f884..192ca36f74 100644
--- a/apps/metadata/__init__.py
+++ b/apps/metadata/__init__.py
@@ -3,11 +3,12 @@ from __future__ import absolute_import
 from django.utils.translation import ugettext_lazy as _
 
 from navigation.api import (register_links, register_multi_item_links,
-    register_sidebar_template)
+    register_sidebar_template, register_model_list_columns)
 from documents.models import Document, DocumentType
 from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
 from project_setup.api import register_setup
 from acls.api import class_permissions
+from common.utils import encapsulate
 
 from .models import MetadataType, MetadataSet
 from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
@@ -17,6 +18,7 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
     PERMISSION_METADATA_TYPE_VIEW, PERMISSION_METADATA_SET_EDIT,
     PERMISSION_METADATA_SET_CREATE, PERMISSION_METADATA_SET_DELETE,
     PERMISSION_METADATA_SET_VIEW)
+from .api import get_metadata_string
 
 metadata_edit = {'text': _(u'edit metadata'), 'view': 'metadata_edit', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_EDIT]}
 metadata_view = {'text': _(u'metadata'), 'view': 'metadata_view', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_VIEW], 'children_view_regex': ['metadata']}
@@ -65,3 +67,9 @@ class_permissions(Document, [
     PERMISSION_METADATA_DOCUMENT_REMOVE,
     PERMISSION_METADATA_DOCUMENT_VIEW,
 ])
+
+register_model_list_columns(Document, [
+        {'name':_(u'metadata'), 'attribute':
+            encapsulate(lambda x: get_metadata_string(x))
+        },
+    ])