diff --git a/app/access-control/controllers/certificate-controller.html b/app/access-control/controllers/certificate-controller.html
index d2db65c..2166676 100644
--- a/app/access-control/controllers/certificate-controller.html
+++ b/app/access-control/controllers/certificate-controller.html
@@ -40,7 +40,7 @@
   <!-- TODO: Replace table with resusable table component -->
     <div class="section-content certificate__table">
       <div class="table__row-header">
-        <div class="row column">
+        <div class="row">
           <div class="certificate__type-header">
             Certificate
           </div>
@@ -57,6 +57,9 @@
           <div class="certificate__date-header">
             Valid until
           </div>
+          <div class="certificate__actions-header">
+            Actions
+          </div>
         </div>
       </div>
       <div ng-if="certificates.length < 1" class="empty__logs">
diff --git a/app/access-control/styles/certificate.scss b/app/access-control/styles/certificate.scss
index 2d882f4..cf3ab37 100644
--- a/app/access-control/styles/certificate.scss
+++ b/app/access-control/styles/certificate.scss
@@ -15,7 +15,7 @@
   }
   .certificate__type-header {
     @include mediaQuery(small) {
-      width: 20%;
+      width: 18%;
       background: transparent;
     }
     width: 100%;
@@ -26,14 +26,14 @@
     display: none;
     padding: 0.8em;
     @include mediaQuery(small) {
-      width: 20%;
+      width: 18%;
       display: block;
     }
   }
   .certificate__date-header {
     padding: 0.8em;
     @include mediaQuery(small) {
-      width: 12%;
+      width: 11%;
       display: block;
     }
     display: none;
@@ -46,13 +46,22 @@
     }
     display: none;
   }
+  .certificate__actions-header {
+    padding: 0.8em;
+    @include mediaQuery(small) {
+      width: auto;
+      padding-left: 30px;
+      display: block;
+    }
+    display: none;
+  }
   .certificate__type-cell {
     width: 100%;
     padding: 0.8em 0.8em 0.8em 1.5em;
     word-wrap: break-word;
     background: $background-02;
     @include mediaQuery(small) {
-      width: 20%;
+      width: 18%;
       background: transparent;
     }
   }
@@ -60,7 +69,7 @@
     padding: 0.8em;
     word-wrap: break-word;
     @include mediaQuery(small) {
-      width: 20%;
+      width: 18%;
     }
     width: 70%;
   }
@@ -69,7 +78,7 @@
     padding: 0.8em;
     word-wrap: break-word;
     @include mediaQuery(small) {
-      width: 12%;
+      width: 11%;
     }
   }
   .certificate__status-cell {
@@ -88,12 +97,19 @@
   }
   .certificate__buttons-cell {
     @include mediaQuery(small) {
-      width: 10%;
-      padding-top: 0.5em;
+      padding: 0.2em 0 0 2em;
+      .btn {
+        padding-left: 40px;
+        padding-right: 5px;
+      }
     }
-    width: 100%;
+    display:  block;
     text-align: right;
-    padding: 0 1.5em 0 0;
+    padding: 0.3em 0.8em 0.8em 1.0em;
+    .btn {
+      padding-left: 5px;
+      padding-right: 5px;
+    }
   }
   .certificate__title-inline {
     @include mediaQuery(small) {