diff --git a/error_tracker/django/templates/base.html b/error_tracker/django/templates/error_tracker/base.html
similarity index 100%
rename from error_tracker/django/templates/base.html
rename to error_tracker/django/templates/error_tracker/base.html
diff --git a/error_tracker/django/templates/detail.html b/error_tracker/django/templates/error_tracker/detail.html
similarity index 89%
rename from error_tracker/django/templates/detail.html
rename to error_tracker/django/templates/error_tracker/detail.html
index f961d37..2e3811a 100755
--- a/error_tracker/django/templates/detail.html
+++ b/error_tracker/django/templates/error_tracker/detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'error_tracker/base.html' %}
 {% load error_tracker %}
 {% block content_block %}
     <style>
@@ -30,7 +30,7 @@ <h2 class="text-center"><a href="{% url 'view_errors' %}">Errors Seen</a></h2>
             <div><strong>Request data: </strong>{{ obj.request_data }}</div>
             <hr/>
             <div><strong>Exception detail: </strong><br/>
-                {{ obj.traceback|replace_new_line_with_br|safe }}</div>
+                {{ obj.traceback|escape|replace_new_line_with_br|safe }}</div>
         </div>
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/error_tracker/django/templates/list.html b/error_tracker/django/templates/error_tracker/list.html
similarity index 97%
rename from error_tracker/django/templates/list.html
rename to error_tracker/django/templates/error_tracker/list.html
index faac0cf..73be054 100755
--- a/error_tracker/django/templates/list.html
+++ b/error_tracker/django/templates/error_tracker/list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'error_tracker/base.html' %}
 {% block content_block %}
     {% if error %}
         <h1 class="text-center alert alert-danger">{{ error }}</h1>
diff --git a/error_tracker/django/utils.py b/error_tracker/django/utils.py
index cd1388c..0ca167d 100644
--- a/error_tracker/django/utils.py
+++ b/error_tracker/django/utils.py
@@ -96,8 +96,8 @@ def notify(self, request, exception,
 class DefaultDjangoViewPermission(ViewPermissionMixin):
 
     def __call__(self, request):
-        if hasattr(request.user, "is_admin"):
-            return request.user.is_admin()
+        if hasattr(request.user, "is_superuser"):
+            return request.user.is_superuser
         return False
 
 
diff --git a/error_tracker/django/views.py b/error_tracker/django/views.py
index 9da2296..73b8c7a 100644
--- a/error_tracker/django/views.py
+++ b/error_tracker/django/views.py
@@ -45,7 +45,7 @@ def view_list(request):
     prev_url = reverse('view_errors') + "?page=" + str(errors.prev_num) \
         if errors.has_prev else None
 
-    return render(request, template_name='list.html',
+    return render(request, template_name='error_tracker/list.html',
                   context=dict(error=error, title=title, errors=errors,
                                next_url=next_url, prev_url=prev_url))
 
@@ -77,5 +77,5 @@ def detail(request, rhash):
     if obj is None:
         raise Http404
     title = "%s : %s" % (obj.method, obj.path)
-    return render(request, template_name='detail.html',
+    return render(request, template_name='error_tracker/detail.html',
                   context=dict(error=error, title=title, obj=obj))
diff --git a/error_tracker/flask/templates/base.html b/error_tracker/flask/templates/error_tracker/base.html
similarity index 100%
rename from error_tracker/flask/templates/base.html
rename to error_tracker/flask/templates/error_tracker/base.html
diff --git a/error_tracker/flask/templates/detail.html b/error_tracker/flask/templates/error_tracker/detail.html
similarity index 94%
rename from error_tracker/flask/templates/detail.html
rename to error_tracker/flask/templates/error_tracker/detail.html
index 8ebbeac..856fb1c 100755
--- a/error_tracker/flask/templates/detail.html
+++ b/error_tracker/flask/templates/error_tracker/detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'error_tracker/base.html' %}
 {% block content_block %}
 	<style>
 		hr {
diff --git a/error_tracker/flask/templates/list.html b/error_tracker/flask/templates/error_tracker/list.html
similarity index 97%
rename from error_tracker/flask/templates/list.html
rename to error_tracker/flask/templates/error_tracker/list.html
index c37ea69..1ba3258 100755
--- a/error_tracker/flask/templates/list.html
+++ b/error_tracker/flask/templates/error_tracker/list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'error_tracker/base.html' %}
 {% block content_block %}
     {% if error %}
         <h1 class="text-center alert alert-danger">{{ error }}</h1>
diff --git a/error_tracker/flask/view.py b/error_tracker/flask/view.py
index a1f980b..2bcb3c2 100644
--- a/error_tracker/flask/view.py
+++ b/error_tracker/flask/view.py
@@ -36,7 +36,7 @@ def view_list():
                 if errors.has_next else None
             prev_url = url_for('app_error.view_list', page=errors.prev_num) \
                 if errors.has_prev else None
-            return render_template('list.html', error=error, title=title, errors=errors,
+            return render_template('error_tracker/list.html', error=error, title=title, errors=errors,
                                    next_url=next_url, prev_url=prev_url)
 
         @blueprint.route('/<string:rhash>')
@@ -54,7 +54,7 @@ def view_detail(rhash):
                 abort(404)
             title = "%s : %s" % (obj.method, obj.path)
 
-            return render_template('detail.html', error=error, title=title, obj=obj)
+            return render_template('error_tracker/detail.html', error=error, title=title, obj=obj)
 
         @blueprint.route('/delete/<string:rhash>')
         def view_delete(rhash):