diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index cb5eac81..0983721b 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -153,12 +153,18 @@ LOGGING = {
 }
 
 # Tests lock up SQLite otherwise
-if DEBUG or STAGING or CI:
+if STAGING or CI:
     CACHES = {
         'default': {
             'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
         }
     }
+elif DEBUG:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.dummy.DummyCache'
+        }
+    }
 else:
     CACHES = {
         'default': {
diff --git a/versioning/templates/activity_feed_data.html b/versioning/templates/activity_feed_data.html
index b427329d..c2afe35f 100644
--- a/versioning/templates/activity_feed_data.html
+++ b/versioning/templates/activity_feed_data.html
@@ -35,17 +35,13 @@
                     </h5>
             {% endif %}
                     <p>
-                    <small>
                     {% if version.changes.old == None %}
                         Created
                     {% else %}
                         Changed {% include 'partials/version_changes.html' %} in
                     {% endif %}
-
                     {% include 'partials/object_button.html' with object=version.changes.new %}
-                    </small>
                     </p>
-
     {% endfor %}
     </div>
     </div>
diff --git a/versioning/templates/partials/activity_table_body.html b/versioning/templates/partials/activity_table_body.html
index 891d57c6..c1394d3a 100644
--- a/versioning/templates/partials/activity_table_body.html
+++ b/versioning/templates/partials/activity_table_body.html
@@ -20,6 +20,8 @@
             <td>
               {% if version.changes.old == None %}
                 Created {{version.changes.new|to_class_name}}
+              {% elif version.changes.new == None %}
+                Deleted {{version.changes.old|to_class_name}}
               {% else %}
                 {% include 'partials/version_changes.html' %}
               {% endif %}
diff --git a/versioning/versioning.py b/versioning/versioning.py
index dead9a71..ba918027 100644
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -114,7 +114,6 @@ class ModelComparison(object):
                 if oldValue != newValue and not bothBlank:
                     comparison = FieldComparison(field, oldValue, newValue)
                     changes.append(comparison)
-
         return changes
 
     @cached_property
@@ -143,17 +142,6 @@ class ModelComparison(object):
                 except KeyError:  # there's no matching old version, so add this item to the dictionary by itself
                     compare = ModelComparison(new=version._object_version.object, **comparisonParams)
 
-                if compare.new:
-                    if(hasattr(compare.new, 'activity_feed_string')):
-                        compare.name = compare.new.activity_feed_string
-                    else:
-                        compare.name = str(compare.new)
-                else:
-                    if(hasattr(compare.old, 'activity_feed_string')):
-                        compare.name = compare.old.activity_feed_string
-                    else:
-                        compare.name = str(compare.old)
-
                 item_dict[version.object_id] = compare  # update the dictionary with the changes
 
             changes = []
@@ -163,6 +151,19 @@ class ModelComparison(object):
 
             return changes
 
+    @cached_property
+    def name(self):
+        if self.new:
+            if(hasattr(self.new, 'activity_feed_string')):
+                return self.new.activity_feed_string
+            else:
+                return str(compare.new)
+        else:
+            if(hasattr(self.old, 'activity_feed_string')):
+                return self.old.activity_feed_string
+            elif str(self.old):
+                return str(self.old)
+
     @cached_property
     def items_changed(self):
         return self.item_changes is not None and len(self.item_changes) > 0