diff --git a/RIGS/templates/activity_feed.html b/RIGS/templates/activity_feed.html
index 5ec7ad1a..83a0c81e 100644
--- a/RIGS/templates/activity_feed.html
+++ b/RIGS/templates/activity_feed.html
@@ -9,14 +9,13 @@
     })
 </script>
 <script>
-	$(function () {
-  $('[data-toggle="popover"]').popover().click(function(){
-    if($(this).attr('href')){
-      window.location.href = $(this).attr('href');
-    }
-  });
-  //moment().twitter();
-})
+  $(function () {
+        $('[data-toggle="popover"]').popover().click(function(){
+        if($(this).attr('href')){
+          window.location.href = $(this).attr('href');
+        }
+    });
+  })
   $(document).ready(function() {
     $(function () {
         $( "#activity" ).hide();
@@ -24,15 +23,10 @@
           $('#activity_loading').slideUp('slow',function(){
               $('#activity').slideDown('slow');
           });
-
-          $('#activity [data-toggle="popover"]').popover();
-
-          /*$('.date').each(function (index, dateElem) {
-            var $dateElem = $(dateElem);
-            var formatted = moment($dateElem.attr('data-date')).twitterLong();
-            $dateElem.text(formatted);
-          });*/
-
+          var whiteList = $.fn.tooltip.Constructor.Default.whiteList
+          whiteList.ins = []
+          whiteList.del = []
+          $('#activity [data-toggle="popover"]').popover({whiteList: whiteList});
         });
     });
   });
diff --git a/RIGS/templates/version_changes.html b/RIGS/templates/version_changes.html
index 8fc83f66..c40af3ef 100644
--- a/RIGS/templates/version_changes.html
+++ b/RIGS/templates/version_changes.html
@@ -1,9 +1,9 @@
 {% if version.changes.item_changes or version.changes.field_changes or version.changes.old == None %}
     {% for change in version.changes.field_changes %}
-    	<a tabindex="0" title="Changes to {{ change.field.verbose_name }}" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}{% include "version_changes_change.html" %}{% endspaceless %}'>{{ change.field.verbose_name }}</a>
+    	<a tabindex="0" title="Changes to {{ change.field.verbose_name }}" type="button" class="badge badge-secondary" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}{% include "version_changes_change.html" %}{% endspaceless %}'>{{ change.field.verbose_name }}</a>
     {% endfor %}
     {% for itemChange in version.changes.item_changes %}
-        <a tabindex="0" title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
+        <a tabindex="0" title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="badge badge-secondary" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
             <ul class="list-group">
             {% for change in itemChange.field_changes %}
                   <li class="list-group-item">
diff --git a/RIGS/templates/version_changes_change.html b/RIGS/templates/version_changes_change.html
index 6d247014..c5bd54d6 100644
--- a/RIGS/templates/version_changes_change.html
+++ b/RIGS/templates/version_changes_change.html
@@ -9,7 +9,7 @@
             <span class="dont-break-out">{{diff.text|linebreaksbr}}</span>
         {% endif %}
     {% endfor %}
-    {% else %}
+{% else %}
     {% if change.old %}
         <del{% if change.long %} class="overflow-ellipsis"{% endif %}>
             {% if change.linebreaks %}