diff --git a/.travis.yml b/.travis.yml
index 0cd945d3..26b5c81d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,6 @@ before_script:
 branches:
   only:
     - master
-cache:
-  directories:
-    - ~/.npm
-    - ~/.cache
-    - $GOPATH/pkg/mod
-    - $GOPATH/src/github.com/statping/statping/frontend/node_modules
 env:
   global:
     - "PATH=$HOME/.local/bin:$PATH"
diff --git a/frontend/src/components/Service/ServiceFailures.vue b/frontend/src/components/Service/ServiceFailures.vue
index 53ee9434..d9c5d54e 100644
--- a/frontend/src/components/Service/ServiceFailures.vue
+++ b/frontend/src/components/Service/ServiceFailures.vue
@@ -9,7 +9,7 @@
             <p class="mb-1">{{failure.issue}}</p>
         </div>
 
-        <nav v-if="total > 4" aria-label="page navigation example">
+        <nav v-if="total > 4" class="mt-3">
             <ul class="pagination justify-content-center">
                 <li class="page-item" :class="{'disabled': page===1}">
                     <a @click.prevent="gotoPage(page-1)" :disabled="page===1" class="page-link" href="#" aria-label="Previous">
@@ -17,7 +17,7 @@
                         <span class="sr-only">Previous</span>
                     </a>
                 </li>
-                <li v-for="n in Math.floor(total / limit)" class="page-item" :class="{'active': page === n}">
+                <li v-for="n in maxPages" class="page-item" :class="{'active': page === n}">
                     <a @click.prevent="gotoPage(n)" class="page-link" href="#">{{n}}</a>
                 </li>
                 <li class="page-item" :class="{'disabled': page===Math.floor(total / limit)}">
@@ -53,6 +53,19 @@ export default {
             page: 1
         }
     },
+    computed: {
+      pages() {
+          return Math.floor(this.total / this.limit)
+      },
+        maxPages() {
+          const p = Math.floor(this.total / this.limit)
+          if (p > 16) {
+              return 16
+            } else {
+              return p
+          }
+        }
+    },
     async mounted () {
         await this.gotoPage(1)
     },