diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
index 675944771..a435e3789 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
@@ -84,10 +84,6 @@ class ChangeLog
                                    $this->hasPermission($row['DYN_UID']), true);
             $limit-= $a;
             $index+= $a;
-            if ($limit < 0) {
-                $index+=1;
-                break;
-            }
         }
         return $index;
     }
diff --git a/workflow/engine/templates/cases/caseChangeLog.html b/workflow/engine/templates/cases/caseChangeLog.html
index dcc0a87f3..2ca2abb30 100644
--- a/workflow/engine/templates/cases/caseChangeLog.html
+++ b/workflow/engine/templates/cases/caseChangeLog.html
@@ -6,6 +6,13 @@
    body{
     color:black !important; 
   }
+  button.typeButton{
+      border-radius: 4px;
+      background-color: white;
+      border: 1px solid rgb(192, 192, 192);
+      font-size: 11px;
+      color: rgb(192, 192, 192);
+  }
 </style>
 <div id="processes-panel" width="80%" />
 
diff --git a/workflow/engine/templates/cases/caseChangeLog.js b/workflow/engine/templates/cases/caseChangeLog.js
index d1f4bbeb0..ebdf9e95c 100644
--- a/workflow/engine/templates/cases/caseChangeLog.js
+++ b/workflow/engine/templates/cases/caseChangeLog.js
@@ -64,9 +64,9 @@ Ext.onReady(function () {
                             sortable: false,
                             dataIndex: 'previousValue',
                             renderer: function (value, p, record) {
-                                return value +
-                                    ' <button disabled="disabled">'
-                                    + record.data.previousValueType + '</button>';
+                                return ' <button disabled="disabled" class="typeButton">'
+                                    + record.data.previousValueType
+                                    + '</button> ' + value;
                             }
                         },
                         {
@@ -75,9 +75,9 @@ Ext.onReady(function () {
                             sortable: false,
                             dataIndex: 'currentValue',
                             renderer: function (value, p, record) {
-                                return value +
-                                    ' <button disabled="disabled">'
-                                    + record.data.currentValueType + '</button>';
+                                return ' <button disabled="disabled" class="typeButton">'
+                                    + record.data.currentValueType
+                                    + '</button> ' + value;
                             }
                         },
                         {
@@ -88,15 +88,7 @@ Ext.onReady(function () {
                             hideable: true,
                             dataIndex: 'record'
                         }
-                    ]}),
-                "bbar": new Ext.PagingToolbar({
-                    pageSize: 15,
-                    store: store,
-                    displayInfo: true,
-                    displayMsg: '{0} - {1}',
-                    emptyMsg: "",
-                    items: []
-                })
+                    ]})
             })
 
         ]