diff --git a/app/assets/stylesheets/panamax/service_details.scss b/app/assets/stylesheets/panamax/service_details.scss
index 2028b9db..dfd661b1 100644
--- a/app/assets/stylesheets/panamax/service_details.scss
+++ b/app/assets/stylesheets/panamax/service_details.scss
@@ -140,26 +140,32 @@
   * {
     display: inline-block;
   }
-  h6 {
-    color: $dark_grey;
-    font-weight: bold;
-  }
-  span {
-    margin-right: 6px;
-  }
-  a {
-    padding-left: 10px;
-    border-left: 1px solid $dark_grey;
+
+  .image-details {
+    h6 {
+      color: $dark_grey;
+      font-weight: bold;
+      padding-bottom: 0;
+    }
+
+    span {
+      margin-right: 6px;
+    }
+
+    .docker-link {
+      padding-left: 10px;
+      border-left: 1px solid $dark_grey;
+    }
   }
 
-  a.documentation {
-    border: 0;
+  .documentation {
     padding: 0;
-    position: absolute;
-    bottom: 0;
     display: block;
-    text-decoration: underline;
-    font-size: 0.9em;
+
+    a {
+      text-decoration: underline;
+      font-size: 0.9em;
+    }
   }
 }
 
diff --git a/app/views/services/show.html.haml b/app/views/services/show.html.haml
index b017a724..c5aeb6b7 100644
--- a/app/views/services/show.html.haml
+++ b/app/views/services/show.html.haml
@@ -23,14 +23,16 @@
           %span.load-state= @service.load_state
 
   .base-image-detail
-    %h6 Base Image:
-    %span#image-name
-      = @service.base_image_name
-    %h6 Tag:
-    %span
-      = @service.image_tag_name
-    = link_to 'View on Docker Hub', @service.docker_index_url, { target: 'blank' }
-    =link_to('Documentation', '#', { class: 'documentation instructions-dialog', data: {'doc-url'=> documentation_app_path(@app.id)} })  if @app.documentation_to_html.present?
+    .image-details
+      %h6 Base Image:
+      %span#image-name
+        = @service.base_image_name
+      %h6 Tag:
+      %span
+        = @service.image_tag_name
+      = link_to 'View on Docker Hub', @service.docker_index_url, { class: 'docker-link', target: 'blank', data: { 'tracking-method' => 'click', 'tracking-action' => 'View on Docker Hub', 'tracking-category' => 'Outbound Link', 'tracking-label' => @service.docker_index_url }}
+    .documentation
+      = link_to('Documentation', '#', { class: 'instructions-dialog', data: {'doc-url'=> documentation_app_path(@app.id)} })  if @app.documentation_to_html.present?
 
   = form_for [@app, @service], html: { class: 'service-edit-form' } do |f|
     = render 'shared/errors', errors: f.object.errors