diff --git a/RIGS/models.py b/RIGS/models.py
index 824cb341..3fb482df 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -609,5 +609,9 @@ class RiskAssessment(models.Model):
 
     # Blimey that was a lot of options
 
+    @property
+    def activity_feed_string(self):
+        return str(self.event)
+
     def __str__(self):
-        return "%i: %s" % (self.pk, self.event)
+        return "%i - %s" % (self.pk, self.event)
diff --git a/assets/models.py b/assets/models.py
index 0d552791..a13a71d4 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -176,18 +176,14 @@ class Asset(models.Model, RevisionMixin):
                 errdict["csa"] = ["The CSA of a cable must be more than 0"]
             if not self.cable_type:
                 errdict["cable_type"] = ["A cable must have a type"]
-            # if not self.circuits or self.circuits <= 0:
-            #     errdict["circuits"] = ["There must be at least one circuit in a cable"]
-            # if not self.cores or self.cores <= 0:
-            #    errdict["cores"] = ["There must be at least one core in a cable"]
-            # if self.socket is None:
-            #     errdict["socket"] = ["A cable must have a socket"]
-            # if self.plug is None:
-            #    errdict["plug"] = ["A cable must have a plug"]
 
         if errdict != {}:  # If there was an error when validation
             raise ValidationError(errdict)
 
+    @property
+    def activity_feed_string(self):
+        return str(self)
+
 
 @receiver(pre_save, sender=Asset)
 def pre_save_asset(sender, instance, **kwargs):
diff --git a/versioning/templates/activity_feed_data.html b/versioning/templates/activity_feed_data.html
index 4ef9f8a0..6f7e0fad 100644
--- a/versioning/templates/activity_feed_data.html
+++ b/versioning/templates/activity_feed_data.html
@@ -6,48 +6,44 @@
 {% load to_class_name from filters %}
 
 {% block content %}
-    <div class="list-group-item">
-      <div class="media">
-        {% for version in object_list %}
-                {% if not version.withPrevious %}
-                  {% if not forloop.first %}
-                      </div> {#/.media-body#}
-                    </div> {#/.media#}
-                  </div>
-                  <div class="list-group-item">
-                    <div class="media">
-                  {% endif %}
-                      <div class="align-self-start mr-3">
-                        {% if version.revision.user %}
-                          <a href="{% url 'profile_detail' pk=version.revision.user.pk %}" class="modal-href">
-                            <img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" />
-                          </a>
-                        {% endif %}
-                      </div>
-                      <div class="media-body">
-                        <h5>
-                          {{ version.revision.user.name }}
-                          <span class="ml-3"><small>{{version.revision.date_created|naturaltime}}</small></span>
-                        </h5>
+<div class="list-group-item">
+    <div class="media">
+    {% for version in object_list %}
+            {% if not version.withPrevious %}
+                {% if not forloop.first %}
+                    </div> {#/.media-body#}
+                </div> {#/.media#}
+                </div>
+                <div class="list-group-item">
+                <div class="media">
                 {% endif %}
-                      <p>
-                      <small>
-                        {% if version.changes.old == None %}
-                          Created
-                        {% else %}
-                          Changed {% include 'version_changes.html' %} in
-                        {% endif %}
+                    <div class="align-self-start mr-3">
+                    {% if version.revision.user %}
+                        <a href="{% url 'profile_detail' pk=version.revision.user.pk %}" class="modal-href">
+                        <img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" />
+                        </a>
+                    {% endif %}
+                    </div>
+                    <div class="media-body">
+                    <h5>
+                        {{ version.revision.user.name }}
+                        <span class="ml-3"><small>{{version.revision.date_created|naturaltime}}</small></span>
+                    </h5>
+            {% endif %}
+                    <p>
+                    <small>
+                    {% if version.changes.old == None %}
+                        Created
+                    {% else %}
+                        Changed {% include 'version_changes.html' %} in
+                    {% endif %}
 
-                        {% include 'object_button.html' with object=version.changes.new %}
-                        {% if version.revision.comment %}
-                          ({{ version.revision.comment }})
-                        {% endif %}
-                      </small>
-                      </p>
+                    {% include 'partials/object_button.html' with object=version.changes.new %}
+                    </small>
+                    </p>
 
-        {% endfor %}
-        </div>
-      </div>
+    {% endfor %}
     </div>
-
+    </div>
+</div>
 {% endblock %}
diff --git a/versioning/templates/object_button.html b/versioning/templates/object_button.html
deleted file mode 100644
index b62f68f0..00000000
--- a/versioning/templates/object_button.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% load to_class_name from filters %}
-{# pass in variable "object" to this template #}
-
-{% if object.name %}
-    <a title="{% if  object.is_rig == False  %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{object.name}}'" href="{{ object.get_absolute_url }}">{% if  object.is_rig == False  %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{ object.activity_feed_string|default:object.name }}'</a>
-{% elif object.asset_id %}
-    <a href="{{ object.get_absolute_url }}">Asset | {{object.asset_id }} {{object.description }}</a>
-{% elif object.event %}
-    <a href="{{ object.get_absolute_url }}">{{object|to_class_name}} | {{object.event.name }}</a>
-{% endif %}
diff --git a/versioning/templates/partials/object_button.html b/versioning/templates/partials/object_button.html
new file mode 100644
index 00000000..6f8ac8c6
--- /dev/null
+++ b/versioning/templates/partials/object_button.html
@@ -0,0 +1,3 @@
+{% load to_class_name from filters %}
+{# pass in variable "object" to this template #}
+<a href="{{ object.get_absolute_url }}">{% if object.is_rig == False %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{% if object.activity_feed_string %}{{object.activity_feed_string}}{% else %}{{object.name}}{%endif%}'</a>