diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py
index 23dfa6c805..fbf4a8a372 100644
--- a/mayan/apps/checkouts/links.py
+++ b/mayan/apps/checkouts/links.py
@@ -45,5 +45,6 @@ link_checkout_info = Link(
     icon='fa fa-shopping-cart', permissions=(
         permission_document_checkin, permission_document_checkin_override,
         permission_document_checkout
-    ), text=_('Check in/out'), view='checkouts:checkout_info', args='object.pk'
+    ), text=_('Check in/out'), view='checkouts:checkout_info',
+    args='resolved_object.pk'
 )
diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py
index bf53b39a56..5e73468415 100644
--- a/mayan/apps/document_comments/links.py
+++ b/mayan/apps/document_comments/links.py
@@ -19,5 +19,6 @@ link_comment_delete = Link(
 )
 link_comments_for_document = Link(
     icon='fa fa-comment', permissions=(permission_comment_view,),
-    text=_('Comments'), view='comments:comments_for_document', args='object.pk'
+    text=_('Comments'), view='comments:comments_for_document',
+    args='resolved_object.pk'
 )
diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py
index 2bf89f7dbc..34079fe382 100644
--- a/mayan/apps/document_indexing/links.py
+++ b/mayan/apps/document_indexing/links.py
@@ -16,7 +16,7 @@ def is_not_root_node(context):
 
 link_document_index_list = Link(
     icon='fa fa-list-ul', text=_('Indexes'),
-    view='indexing:document_index_list', args='object.pk'
+    view='indexing:document_index_list', args='resolved_object.pk'
 )
 link_index_main_menu = Link(
     icon='fa fa-list-ul', text=_('Indexes'), view='indexing:index_list'
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index 73ef1bc865..d4d0907706 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -23,13 +23,11 @@ from .links import (
     link_document_version_signature_download,
     link_document_version_signature_list,
     link_document_version_signature_upload,
-    link_document_version_signature_verify
 )
 from .permissions import (
     permission_document_version_signature_delete,
     permission_document_version_signature_download,
     permission_document_version_signature_upload,
-    permission_document_version_signature_verify,
     permission_document_version_signature_view,
 )
 
@@ -75,7 +73,6 @@ class DocumentSignaturesApp(MayanAppConfig):
             model=Document, permissions=(
                 permission_document_version_signature_delete,
                 permission_document_version_signature_download,
-                permission_document_version_signature_verify,
                 permission_document_version_signature_view,
                 permission_document_version_signature_upload,
             )
@@ -143,7 +140,6 @@ class DocumentSignaturesApp(MayanAppConfig):
         menu_sidebar.bind_links(
             links=(
                 link_document_version_signature_upload,
-                link_document_version_signature_verify,
             ), sources=(DocumentVersion,)
         )
         post_delete.connect(
diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py
index fd5b8a6ef4..c49c85a120 100644
--- a/mayan/apps/document_signatures/links.py
+++ b/mayan/apps/document_signatures/links.py
@@ -9,8 +9,6 @@ from .permissions import (
     permission_document_version_signature_delete,
     permission_document_version_signature_download,
     permission_document_version_signature_upload,
-    permission_document_version_signature_verify,
-    permission_document_version_signature_view
 )
 
 
@@ -51,12 +49,7 @@ link_document_version_signature_download = Link(
 )
 link_document_version_signature_upload = Link(
     #permissions=(permission_document_version_signature_upload,),
-    text=_('Upload signature'), view='signatures:document_version_signature_upload',
-    args='resolved_object.pk'
-)
-link_document_version_signature_verify = Link(
-    icon='fa fa-certificate',
-    #permissions=(permission_document_version_signature_verify,),
-    text=_('Verify signatures'), view='signatures:document_verify',
+    text=_('Upload signature'),
+    view='signatures:document_version_signature_upload',
     args='resolved_object.pk'
 )
diff --git a/mayan/apps/document_signatures/permissions.py b/mayan/apps/document_signatures/permissions.py
index e973aac602..f81ad66806 100644
--- a/mayan/apps/document_signatures/permissions.py
+++ b/mayan/apps/document_signatures/permissions.py
@@ -12,10 +12,6 @@ permission_document_version_signature_view = namespace.add_permission(
     name='document_version_signature_view',
     label=_('View details of document signatures')
 )
-permission_document_version_signature_verify = namespace.add_permission(
-    name='document_version_signature_verify',
-    label=_('Verify document signatures')
-)
 permission_document_version_signature_delete = namespace.add_permission(
     name='document_version_signature_delete',
     label=_('Delete detached signatures')
diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py
index 061aa95e53..2b5d34ed13 100644
--- a/mayan/apps/document_signatures/urls.py
+++ b/mayan/apps/document_signatures/urls.py
@@ -24,10 +24,6 @@ urlpatterns = patterns(
         DocumentVersionSignatureListView.as_view(),
         name='document_version_signature_list'
     ),
-    url(
-        r'^documents/version/(?P<document_pk>\d+)/signature/verify/$',
-        'document_verify', name='document_version_signature_verify'
-    ),
     url(
         r'^documents/version/(?P<pk>\d+)/signature/upload/$',
         'document_version_signature_upload',
diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py
index b1c655dc1b..e3256661c5 100644
--- a/mayan/apps/document_signatures/views.py
+++ b/mayan/apps/document_signatures/views.py
@@ -26,7 +26,6 @@ from .forms import DetachedSignatureForm, DocumentVersionSignatureDetailForm
 from .models import DetachedSignature, SignatureBaseModel
 from .permissions import (
     permission_document_version_signature_view,
-    permission_document_version_signature_verify,
     permission_document_version_signature_upload,
     permission_document_version_signature_download,
     permission_document_version_signature_delete
diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py
index be928ac56d..f9a0e3bba3 100644
--- a/mayan/apps/document_states/links.py
+++ b/mayan/apps/document_states/links.py
@@ -13,7 +13,8 @@ from .permissions import (
 link_document_workflow_instance_list = Link(
     icon='fa fa-sitemap', permissions=(permission_workflow_view,),
     text=_('Workflows'),
-    view='document_states:document_workflow_instance_list', args='object.pk'
+    view='document_states:document_workflow_instance_list',
+    args='resolved_object.pk'
 )
 link_setup_workflow_create = Link(
     permissions=(permission_workflow_create,), text=_('Create workflow'),
diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py
index f1bb286c83..33ab42f630 100644
--- a/mayan/apps/documents/links.py
+++ b/mayan/apps/documents/links.py
@@ -18,7 +18,7 @@ from .settings import setting_zoom_max_level, setting_zoom_min_level
 
 
 def is_not_current_version(context):
-    return context['resolved_object'].document.latest_version.timestamp != context['resolved_object'].timestamp
+    return context['object'].document.latest_version.timestamp != context['object'].timestamp
 
 
 def is_first_page(context):
@@ -40,7 +40,8 @@ def is_min_zoom(context):
 # Facet
 link_document_preview = Link(
     icon='fa fa-eye', permissions=(permission_document_view,),
-    text=_('Preview'), view='documents:document_preview', args='resolved_object.id'
+    text=_('Preview'), view='documents:document_preview',
+    args='resolved_object.id'
 )
 link_document_properties = Link(
     icon='fa fa-info', permissions=(permission_document_view,),
@@ -50,7 +51,7 @@ link_document_properties = Link(
 link_document_version_list = Link(
     icon='fa fa-code-fork', permissions=(permission_document_view,),
     text=_('Versions'), view='documents:document_version_list',
-    args='object.pk'
+    args='resolved_object.pk'
 )
 link_document_pages = Link(
     icon='fa fa-files-o', permissions=(permission_document_view,),
@@ -65,11 +66,13 @@ link_document_clear_transformations = Link(
 )
 link_document_delete = Link(
     permissions=(permission_document_delete,), tags='dangerous',
-    text=_('Delete'), view='documents:document_delete', args='resolved_object.id'
+    text=_('Delete'), view='documents:document_delete',
+    args='resolved_object.id'
 )
 link_document_trash = Link(
     permissions=(permission_document_trash,), tags='dangerous',
-    text=_('Move to trash'), view='documents:document_trash', args='resolved_object.id'
+    text=_('Move to trash'), view='documents:document_trash',
+    args='resolved_object.id'
 )
 link_document_edit = Link(
     permissions=(permission_document_properties_edit,),
@@ -89,8 +92,9 @@ link_document_print = Link(
     view='documents:document_print', args='resolved_object.id'
 )
 link_document_update_page_count = Link(
-    permissions=(permission_document_tools,), text=_('Recalculate page count'),
-    view='documents:document_update_page_count', args='object.pk'
+    args='resolved_object.pk', permissions=(permission_document_tools,),
+    text=_('Recalculate page count'),
+    view='documents:document_update_page_count'
 )
 link_document_restore = Link(
     permissions=(permission_document_restore,), text=_('Restore'),
@@ -124,7 +128,7 @@ link_document_multiple_restore = Link(
     text=_('Restore'), view='documents:document_multiple_restore'
 )
 link_document_version_download = Link(
-    args='object.pk', permissions=(permission_document_download,),
+    args='resolved_object.pk', permissions=(permission_document_download,),
     text=_('Download version'), view='documents:document_version_download'
 )
 
diff --git a/mayan/apps/folders/links.py b/mayan/apps/folders/links.py
index ab8a3f95f6..ce0163cde9 100644
--- a/mayan/apps/folders/links.py
+++ b/mayan/apps/folders/links.py
@@ -13,7 +13,8 @@ from .permissions import (
 
 link_document_folder_list = Link(
     icon='fa fa-folder', permissions=(permission_document_view,),
-    text=_('Folders'), view='folders:document_folder_list', args='object.pk'
+    text=_('Folders'), view='folders:document_folder_list',
+    args='resolved_object.pk'
 )
 link_folder_add_document = Link(
     permissions=(permission_folder_add_document,), text=_('Add to a folder'),
diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py
index 2071f6b151..baf74586a5 100644
--- a/mayan/apps/linking/links.py
+++ b/mayan/apps/linking/links.py
@@ -52,7 +52,7 @@ link_smart_link_instance_view = Link(
 link_smart_link_instances_for_document = Link(
     icon='fa fa-link', permissions=(permission_document_view,),
     text=_('Smart links'), view='linking:smart_link_instances_for_document',
-    args='object.pk'
+    args='resolved_object.pk'
 )
 link_smart_link_list = Link(
     permissions=(permission_smart_link_create,), text=_('Smart links'),
diff --git a/mayan/apps/mailer/links.py b/mayan/apps/mailer/links.py
index ebafcd33f0..2909f83a10 100644
--- a/mayan/apps/mailer/links.py
+++ b/mayan/apps/mailer/links.py
@@ -10,12 +10,12 @@ from .permissions import (
 )
 
 link_send_document = Link(
-    permissions=(permission_mailing_send_document,), text=_('Email document'),
-    view='mailer:send_document', args='object.pk'
+    args='resolved_object.pk', permissions=(permission_mailing_send_document,),
+    text=_('Email document'), view='mailer:send_document'
 )
 link_send_document_link = Link(
-    permissions=(permission_mailing_link,), text=_('Email link'),
-    view='mailer:send_document_link', args='object.pk'
+    args='resolved_object.pk', permissions=(permission_mailing_link,),
+    text=_('Email link'), view='mailer:send_document_link'
 )
 link_document_mailing_error_log = Link(
     icon='fa fa-envelope', permissions=(permission_view_error_log,),
diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py
index 39412bbfcb..1750dcef35 100644
--- a/mayan/apps/metadata/links.py
+++ b/mayan/apps/metadata/links.py
@@ -36,7 +36,7 @@ link_metadata_remove = Link(
 )
 link_metadata_view = Link(
     icon='fa fa-pencil', permissions=(permission_metadata_document_view,),
-    text=_('Metadata'), view='metadata:metadata_view', args='object.pk'
+    text=_('Metadata'), view='metadata:metadata_view', args='resolved_object.pk'
 )
 link_setup_document_type_metadata = Link(
     permissions=(permission_document_type_edit,), text=_('Optional metadata'),
diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py
index bc4a935d81..70a827294d 100644
--- a/mayan/apps/ocr/links.py
+++ b/mayan/apps/ocr/links.py
@@ -14,8 +14,8 @@ link_document_content = Link(
     text=_('OCR'), view='ocr:document_content', args='resolved_object.id'
 )
 link_document_submit = Link(
-    permissions=(permission_ocr_document,), text=_('Submit for OCR'),
-    view='ocr:document_submit', args='object.id'
+    args='resolved_object.id', permissions=(permission_ocr_document,),
+    text=_('Submit for OCR'), view='ocr:document_submit'
 )
 link_document_submit_all = Link(
     icon='fa fa-font', permissions=(permission_ocr_document,),
diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py
index 0a3846bec5..926fada9ce 100644
--- a/mayan/apps/sources/links.py
+++ b/mayan/apps/sources/links.py
@@ -75,10 +75,9 @@ link_staging_file_delete = Link(
     args=('source.pk', 'object.encoded_filename',)
 )
 link_upload_version = Link(
-    condition=document_new_version_not_blocked,
+    args='resolved_object.pk', condition=document_new_version_not_blocked,
     permissions=(permission_document_new_version,),
     text=_('Upload new version'), view='sources:upload_version',
-    args='object.pk'
 )
 link_setup_source_logs = Link(
     text=_('Logs'), view='sources:setup_source_logs',
diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py
index 8627cca4d3..7acd009875 100644
--- a/mayan/apps/tags/links.py
+++ b/mayan/apps/tags/links.py
@@ -38,7 +38,7 @@ link_tag_edit = Link(
 )
 link_tag_document_list = Link(
     icon='fa fa-tag', permissions=(permission_tag_view,), text=_('Tags'),
-    view='tags:document_tags', args='object.pk'
+    view='tags:document_tags', args='resolved_object.pk'
 )
 link_tag_list = Link(icon='fa fa-tag', text=_('Tags'), view='tags:tag_list')
 link_tag_multiple_delete = Link(