diff --git a/exampleSite/content/test-product/_index.md b/exampleSite/content/test-product/_index.md
index fa48486f..fffc6afe 100644
--- a/exampleSite/content/test-product/_index.md
+++ b/exampleSite/content/test-product/_index.md
@@ -54,8 +54,6 @@ This is a compilation of all our shortcodes to show how they look, function, res
 
 {{<card-layout >}}
   {{<card-section title="NGINX" showAsCards="true" >}}
-    {{<card title="NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon-RGB.svg" >}}
-      Installing NGINX
-    {{</card >}}
+    {{<card title="NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon-RGB.svg" />}}
   {{</card-section >}}
 {{</card-layout >}}
diff --git a/layouts/shortcodes/card.html b/layouts/shortcodes/card.html
index ee92009a..aa7b07eb 100644
--- a/layouts/shortcodes/card.html
+++ b/layouts/shortcodes/card.html
@@ -17,22 +17,22 @@
 {{- $isLanding := cond (eq $isLandingParam "true") "true" "false" -}}
 
 {{- /* Set up the positioning */ -}}
-{{ $dataGrid := "" }}
-{{ if eq $isFullSize "true" }}
-  {{ $dataGrid = "wide"}}
-{{ else if (eq $isLanding "true") }}
-  {{ $dataGrid = "third"}}
-{{ else }}
-  {{ $dataGrid = "half"}}
-{{ end }}
+{{- $dataGrid := "" -}}
+{{- if eq $isFullSize "true" -}}
+  {{- $dataGrid = "wide" -}}
+{{- else if (eq $isLanding "true") -}}
+  {{- $dataGrid = "third" -}}
+{{- else -}}
+  {{- $dataGrid = "half" -}}
+{{- end -}}
 
 {{- /* Build the url */ -}}
-{{ $url := printf "%s%s" .Page.Permalink $titleUrl }}
-{{ if eq (substr $titleUrl 0 1) "/" }}
-  {{ $url = printf "%s%s" .Site.BaseURL (substr $titleUrl 1) }}
-{{ else if (strings.Contains $titleUrl "https") }}
-  {{ $url = $titleUrl }}
-{{ end }}
+{{- $url := printf "%s%s" .Page.Permalink $titleUrl -}}
+{{- if eq (substr $titleUrl 0 1) "/" -}}
+  {{- $url = printf "%s%s" .Site.BaseURL (substr $titleUrl 1) -}}
+{{- else if (strings.Contains $titleUrl "https") -}}
+  {{- $url = $titleUrl -}}
+{{- end -}}
 
 {{- /* Validate that the parent is card-section and under 3 cards */ -}}
 {{- if (eq .Parent.Name "card-section") -}}
@@ -50,7 +50,9 @@ <h2 class="card-title">{{- $title -}}</h2>
     {{- else -}}
       {{ errorf "Mainframe: Missing param 'title'" }}
     {{- end -}}
-    <div class="card-content">{{ .Inner }}</div>
+    {{- with .Inner -}}
+    <div class="card-content">{{ . }}</div>
+    {{- end -}}
   </div>
 </a>
 {{- else -}}