diff --git a/ckanext/issues/auth.py b/ckanext/issues/auth.py
index 859244aa..e059223a 100644
--- a/ckanext/issues/auth.py
+++ b/ckanext/issues/auth.py
@@ -1,4 +1,3 @@
-from ckanext.issues.tests.logic.action.test_issue import dataset
 from ckan import model
 import ckan.plugins as p
 from ckanext.issues import model as issue_model
diff --git a/ckanext/issues/plugin.py b/ckanext/issues/plugin.py
index 5a491113..6d974a31 100644
--- a/ckanext/issues/plugin.py
+++ b/ckanext/issues/plugin.py
@@ -8,7 +8,7 @@
 from ckan.lib.plugins import DefaultTranslation
 from ckan.plugins import implements, toolkit
 from ckan.lib.helpers import ckan_version
-from ckanext.issues.logic.action.action import issue_search, issue_create, issue_delete, issue_comment_create, issue_show, issue_update, issue_comment_report, issue_comment_search, issue_report, issue_report_clear,     organization_users_autocomplete
+from ckanext.issues.logic.action.action import issue_search, issue_create, issue_delete, issue_comment_create, issue_show, issue_update, issue_comment_report, issue_report_show, issue_comment_search, issue_report, issue_report_clear,     organization_users_autocomplete
 
 from ckanext.issues.views.issues import issues
 from ckanext.issues.views.moderation import moderation
@@ -89,6 +89,7 @@ def get_blueprint(self):
     def get_actions(self):
         return {
             'issue_search': issue_search,
+            'issue_report_show': issue_report_show,
             'issue_delete': issue_delete,
             'issue_show': issue_show,
             'issue_create': issue_create,
diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html
index 6e70dec8..f51d9420 100644
--- a/ckanext/issues/templates/issues/email/new_comment.html
+++ b/ckanext/issues/templates/issues/email/new_comment.html
@@ -7,7 +7,7 @@
 
 > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.
+За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.
 
 Ви благодариме,
 
@@ -15,8 +15,8 @@
 
 --
 
-Проблем: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Податочен сет: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
+Проблем: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Податочен сет: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
 
 ---
 
@@ -28,7 +28,7 @@
 
 > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'.
+Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'.
 
 Faleminderit,
 
@@ -37,8 +37,8 @@
 --
 
 
-Problem: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
+Problem: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
 
 ---
 
@@ -51,7 +51,7 @@
 
 > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-In order to respond to the comment, please see the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.
+In order to respond to the comment, please see the issue at: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.
 
 Thank you,
 
@@ -59,5 +59,5 @@
 
 --
 
-Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
\ No newline at end of file
+Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html
index 98e4e61a..efce3c15 100644
--- a/ckanext/issues/templates/issues/email/new_issue.html
+++ b/ckanext/issues/templates/issues/email/new_issue.html
@@ -6,7 +6,7 @@
 > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-Ве молиме корегирајте го проблемот или додадете коментар за проблемот на следиот линк: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.
+Ве молиме корегирајте го проблемот или додадете коментар за проблемот на следиот линк: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.
 
 Ви благодариме,
 
@@ -14,8 +14,8 @@
 
 --
 
-Проблем: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Податочен сет: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
+Проблем: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Податочен сет: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
 Корисник: {{ user.fullname or user.name }}
 
 ---
@@ -25,13 +25,13 @@
 Përdoruesi {{site_title}} raporton një problem me një nga grupet e të dhënave në organizatën '{{recipient.organization_title}}', në të cilën jeni {{recipient.capacity}}
 
 Seti i të dhënave është: {{ dataset.title }}
-Problemi është: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
+Problemi është: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
 Përdorues: {{ user.fullname or user.name }}
 
 > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-Korrigjoni problemin ose shtoni një koment fillestar për çështjen këtu: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, klikoni butonin 'Mbyll problemin'.
+Korrigjoni problemin ose shtoni një koment fillestar për çështjen këtu: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, klikoni butonin 'Mbyll problemin'.
 
 Faleminderit,
 
@@ -39,8 +39,8 @@
 
 --
 
-Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
+Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
 User: {{ user.fullname or user.name }}
 
 ---
@@ -54,7 +54,7 @@
 > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }}
 
-Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.
+Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.
 
 Thank you,
 
@@ -62,6 +62,6 @@
 
 --
 
-Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
-Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}
-User: {{ user.fullname or user.name }}
\ No newline at end of file
+Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
+Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}
+User: {{ user.fullname or user.name }}
diff --git a/ckanext/issues/templates/issues/show.html b/ckanext/issues/templates/issues/show.html
index 994155d0..42728520 100644
--- a/ckanext/issues/templates/issues/show.html
+++ b/ckanext/issues/templates/issues/show.html
@@ -160,7 +160,57 @@
     </div>
 {% endmacro %}
 
-{% block primary_content %}
+{% block secondary_content %}
+<div class="module module-narrow module-shallow">
+  <div class="module context-info">
+    <div class="module-content">
+      <h1 class="heading">{{ dataset.name }}</h1>
+      <div class="nums" />
+    </div>
+  </div>
+  <h2 class="module-heading">
+    <i class="fa fa-user"></i>
+    {{ _('Assignee') }}
+  </h2>
+  <div id='ckanext-issues-assignee' class="module-content">
+    {% if issue.assignee %}
+      {{ h.gravatar((issue.assignee.email_hash), size=22) }}
+      {{ issue.assignee.name }}
+    {% elif issue.assignee_id %}
+      {{ _('This issue has been assigned to an administrator for the publisher') }}
+    {% else %}
+      {{ _('No one') }}
+    {% endif %}
+  </div>
+  {% block assignee_form %}
+    {% if is_publisher %}
+    <h2 class="module-heading">
+      <i class="fa fa-edit"></i>
+      {{ _('Change Assignee') }}
+    </h2>
+    <form id='ckanext-issues-assign' class="dataset-form form-horizontal add-member-form" method='post' action="{{ h.url_for('issues.assign', issue_number=issue.number, dataset_id=dataset.id) }}">
+        <div class="controls">
+          <input id="assignee" type="text" name="assignee" placeholder="{{ _('Username') }}"
+          value="" class="control-medium" data-module="autocomplete-action-api"
+          {% if dataset['owner_org'] %}
+          data-module-source="/api/3/action/organization_users_autocomplete?organization_id={{ dataset['owner_org']}}&q=?">
+          {% else %}
+          data-module-source="/api/3/action/user_autocomplete?q=?">
+          {% endif %}
+        </div>
+        <div>
+          <button class="btn btn-sm btn-success" type="submit" name="assign">
+            {{ _('Assign') }}
+          </button>
+        </div>
+      </form>
+     {% endif %}
+  {% endblock %}
+</div>
+</div>
+{% endblock %}
+
+{% block primary_content_inner %}
   <section class="module issue-show">
     <div class="module-content">
       <div class="issue-header">
@@ -238,51 +288,4 @@ <h1 class="page-heading">
   </section>
 {% endblock %}
 
-{% block secondary_content %}
-<div class="module module-narrow module-shallow">
-  <div class="module context-info">
-    <div class="module-content">
-      <h1 class="heading">{{ dataset.name }}</h1>
-      <div class="nums" />
-    </div>
-  </div>
-  <h2 class="module-heading">
-    <i class="fa fa-user"></i>
-    {{ _('Assignee') }}
-  </h2>
-  <div id='ckanext-issues-assignee' class="module-content">
-    {% if issue.assignee %}
-      {{ h.gravatar((issue.assignee.email_hash), size=22) }}
-      {{ issue.assignee.name }}
-    {% elif issue.assignee_id %}
-      {{ _('This issue has been assigned to an administrator for the publisher') }}
-    {% else %}
-      {{ _('No one') }}
-    {% endif %}
-  </div>
-  {% block assignee_form %}
-    {% if is_publisher %}
-    <h2 class="module-heading">
-      <i class="fa fa-edit"></i>
-      {{ _('Change Assignee') }}
-    </h2>
-    <form id='ckanext-issues-assign' class="dataset-form form-horizontal add-member-form" method='post' action="{{ h.url_for('issues.assign', issue_number=issue.number, dataset_id=dataset.id) }}">
-        <div class="controls">
-          <input id="assignee" type="text" name="assignee" placeholder="{{ _('Username') }}"
-          value="" class="control-medium" data-module="autocomplete-action-api"
-          {% if dataset['owner_org'] %}
-          data-module-source="/api/3/action/organization_users_autocomplete?organization_id={{ dataset['owner_org']}}&q=?">
-          {% else %}
-          data-module-source="/api/3/action/user_autocomplete?q=?">
-          {% endif %}
-        </div>
-        <div>
-          <button class="btn btn-sm btn-success" type="submit" name="assign">
-            {{ _('Assign') }}
-          </button>
-        </div>
-      </form>
-     {% endif %}
-  {% endblock %}
-{% endblock %}
-n
\ No newline at end of file
+
diff --git a/dev-requirements.txt b/dev-requirements.txt
index d06448ec..23793b8b 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,3 +1,4 @@
 beautifulsoup4
 lxml
 pytest-ckan
+mock
\ No newline at end of file