diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/history.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/history.html
index dffcb89..e8a3209 100644
--- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/history.html
+++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/includes/history.html
@@ -9,7 +9,7 @@
             {% else %}
                 <span class="deleted">-</span>
             {% endif %}
-            <a href="{{ action.get_admin_url }}">{{ action }}</a>
+            {{ action }}
         </li>
         {% endfor %}
     </ol>
diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html
index fc20094..d78a58a 100644
--- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html
+++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_update_form.html
@@ -9,7 +9,7 @@
 {% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action_name }} {{ model_name }}{% endblocktrans %}{% endblock page_title %}
 
 {% block page_title_link %}
-<a href="#" class="btn btn-info">History</a>
+    <a href="{% url view|admin2_urlname:"history" pk=object.pk %}" class="btn btn-info">History</a>
 {% endblock page_title_link %}
 
 {% block breadcrumbs %}
@@ -41,14 +41,14 @@
 {% block content %}
 
     <form method="post">
-       
+
       {% if view.model_admin.save_on_top %}
         {% include "djadmin2theme_default/includes/save_buttons.html" %}
       {% endif %}
 
 <div class="row-fluid"><!-- begin main form row -->
     <div class="span12">
-        
+
       <div class="change_form">
         {% csrf_token %}
         {{ form|crispy }}
@@ -63,11 +63,11 @@
 
   </div>
 </div><!-- end main form row -->
-      
+
       {% if view.model_admin.save_on_bottom %}
         {% include "djadmin2theme_default/includes/save_buttons.html" %}
       {% endif %}
-      
+
 </form>