diff --git a/src/components/Base/Tooltip.vue b/src/components/Base/Tooltip.vue
index 3948e9b50e78f2a766215a2e01a0b1edd3e83425..7eba1b85545338eecb16d0f85beedbfe8d848514 100644
--- a/src/components/Base/Tooltip.vue
+++ b/src/components/Base/Tooltip.vue
@@ -11,9 +11,8 @@
         v-on="on"
         v-if="text"
         :class="light ? 'text-light' : 'text'"
+        >{{ spaceBefore ? " " : "" }}{{ text }}{{ spaceAfter ? " " : "" }}</span
       >
-        {{ text }}
-      </span>
       <span v-bind="attrs" v-on="on" v-if="icon">
         <v-icon
           :x-small="iconSize === 'x-small'"
@@ -40,45 +39,53 @@ export default {
   props: {
     text: {
       type: String,
-      default: ""
+      default: "",
     },
     tooltip: {
       type: [String, Array],
-      default: ""
+      default: "",
     },
     icon: {
       type: String,
-      default: ""
+      default: "",
     },
     iconSize: {
       type: String,
-      default: "x-small"
+      default: "x-small",
     },
     iconColor: {
       type: String,
-      default: "white"
+      default: "white",
     },
     left: {
       type: Boolean,
-      default: false
+      default: false,
     },
     right: {
       type: Boolean,
-      default: false
+      default: false,
     },
     top: {
       type: Boolean,
-      default: false
+      default: false,
     },
     bottom: {
       type: Boolean,
-      default: false
+      default: false,
     },
     light: {
       type: Boolean,
-      default: false
-    }
-  }
+      default: false,
+    },
+    spaceBefore: {
+      type: Boolean,
+      default: true,
+    },
+    spaceAfter: {
+      type: Boolean,
+      default: true,
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/ServicesSummary.vue b/src/components/ServicesSummary.vue
index 74057e5339b4f1d6ed20b7db3e738ef22d6b6cbc..1ea5d6a45554afe5fb7b90ae4aef9d3c17750f99 100644
--- a/src/components/ServicesSummary.vue
+++ b/src/components/ServicesSummary.vue
@@ -11,16 +11,16 @@
         </v-flex>
         <v-flex lg2 md3 sm6 xs12>
           <LogoCard
-            :logoSource="pbLogo"
-            logoCardText="Get hands-on experience onboarding with ABMS ADCE Party Bus"
-            logoCardUrl="/products/abms-adce/"
+            :logoSource="bbLogo"
+            logoCardText="Deploy your own software factory with Big Bang"
+            logoCardUrl="/products/big-bang/"
           />
         </v-flex>
         <v-flex lg2 md3 sm6 xs12>
           <LogoCard
-            :logoSource="bbLogo"
-            logoCardText="Deploy your own software factory with Big Bang"
-            logoCardUrl="/products/big-bang/"
+            :logoSource="pbLogo"
+            logoCardText="Get hands-on experience onboarding with ABMS ADCE Party Bus"
+            logoCardUrl="/products/abms-adce/"
           />
         </v-flex>
         <v-flex lg2 md3 sm6 xs12>
diff --git a/src/views/ADCE.vue b/src/views/ADCE.vue
index 188015d1d2e3e045062a2e9fb447586f38f9ba21..58f39f3c428774cf9cb4e0f3245a0964e3900002 100644
--- a/src/views/ADCE.vue
+++ b/src/views/ADCE.vue
@@ -53,7 +53,11 @@
           Get hands-on experience and training with our rapid workshop to stand
           up a hello world pipeline with a templated app through Party Bus -
           <Tooltip text="ABMS" tooltip="Advanced Battle Management System" />
-          <Tooltip text="ADCE" tooltip="All Domain Common Environment" />.
+          <Tooltip
+            text="ADCE"
+            tooltip="All Domain Common Environment"
+            :spaceAfter="false"
+          />.
         </p>
       </div>
     </v-container>
@@ -109,6 +113,7 @@
                 text="ADCE"
                 tooltip="All Domain Common Environment"
                 light
+                :spaceAfter="false"
               />.
             </p>
             <div class="row">