diff --git a/layouts/events/list.html b/layouts/events/list.html
index dfe8d418c73f..900ca056e90c 100644
--- a/layouts/events/list.html
+++ b/layouts/events/list.html
@@ -38,17 +38,17 @@
             {{ if and .Params.main.tags $listed }}
                 {{ if .Params.main.tags.topics }}
                     {{ range  $topic := .Params.main.tags.topics }}
-                        {{ $filterTopics = $filterTopics | append $topic }}                                
+                        {{ $filterTopics = $filterTopics | append $topic }}
                     {{ end }}
                 {{ end }}
                 {{ if .Params.main.tags.languages }}
                     {{ range  $lang := .Params.main.tags.languages }}
-                        {{ $filterLangs = $filterLangs | append $lang }}                                
+                        {{ $filterLangs = $filterLangs | append $lang }}
                     {{ end }}
                 {{ end }}
                 {{ if .Params.main.tags.clouds }}
                     {{ range  $cloud := .Params.main.tags.clouds }}
-                        {{ $filterClouds = $filterClouds | append $cloud }}                                
+                        {{ $filterClouds = $filterClouds | append $cloud }}
                     {{ end }}
                 {{ end }}
             {{ end }}
@@ -74,17 +74,17 @@
             {{ if .Params.main.tags }}
                 {{ if .Params.main.tags.topics }}
                     {{ range  $topic := .Params.main.tags.topics }}
-                        {{ $filterTopics = $filterTopics | append $topic }}                                
+                        {{ $filterTopics = $filterTopics | append $topic }}
                     {{ end }}
                 {{ end }}
                 {{ if .Params.main.tags.languages }}
                     {{ range  $lang := .Params.main.tags.languages }}
-                        {{ $filterLangs = $filterLangs | append $lang }}                                
+                        {{ $filterLangs = $filterLangs | append $lang }}
                     {{ end }}
                 {{ end }}
                 {{ if .Params.main.tags.clouds }}
                     {{ range  $cloud := .Params.main.tags.clouds }}
-                        {{ $filterClouds = $filterClouds | append $cloud }}                                
+                        {{ $filterClouds = $filterClouds | append $cloud }}
                     {{ end }}
                 {{ end }}
             {{ end }}
@@ -95,7 +95,6 @@
         {{ end }}
     {{ end }}
 
-
     <div class="pulumi-event-list-container mt-5">
         <div class="container mx-auto pt-10">
             <!-- These hidden elements help select the children elements so we can use CSS -->
@@ -203,13 +202,13 @@
                         {{ if $tags }}
                             {{ $filters = $filters | append (lower $tags.level) }}
                             {{ range  $topic := $tags.topics }}
-                                {{ $filters = $filters | append (lower (replace $topic " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $topic " " "-")) }}
                             {{ end }}
                             {{ range  $lang := $tags.languages }}
-                                {{ $filters = $filters | append (lower (replace $lang " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $lang " " "-")) }}
                             {{ end }}
                             {{ range  $cloud := $tags.clouds }}
-                                {{ $filters = $filters | append (lower (replace $cloud " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $cloud " " "-")) }}
                             {{ end }}
                         {{ end }}
 
@@ -221,9 +220,9 @@
                             <li  class="w-full m-0 px-4 py-6 lg:w-full group month-label {{ $filterMonth | lower }}" data-filters="upcoming">
                                 <span class="text-2xl"><i class="far fa-calendar mr-2"></i>{{ $upcomingMonthHeader }}</span>
                             </li>
-                        {{ end }}      
+                        {{ end }}
                     {{ end }}
-                    
+
                     {{ $tileOptions := (dict "pageContext" $pageContext "external" $external "filters" $filters "upcoming" "true" "link" $link "datetime" .date "displayDate" $displayDate "data" $data) }}
                     {{ partial "events/event-card.html" $tileOptions }}
                 {{ end }}
@@ -254,18 +253,18 @@
                         {{ if $data.Params.featured }}
                             {{ $filters = $filters | append "featured" }}
                         {{ end }}
-                        
+
                         <!-- add tags to the filters list -->
                         {{ if $tags }}
                             {{ $filters = $filters | append (lower $tags.level) }}
                             {{ range  $topic := $tags.topics }}
-                                {{ $filters = $filters | append (lower (replace $topic " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $topic " " "-")) }}
                             {{ end }}
                             {{ range  $lang := $tags.languages }}
-                                {{ $filters = $filters | append (lower (replace $lang " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $lang " " "-")) }}
                             {{ end }}
                             {{ range  $cloud := $tags.clouds }}
-                                {{ $filters = $filters | append (lower (replace $cloud " " "-")) }}                                
+                                {{ $filters = $filters | append (lower (replace $cloud " " "-")) }}
                             {{ end }}
                         {{ end }}
 
diff --git a/layouts/partials/events/event-card.html b/layouts/partials/events/event-card.html
index c75845464836..4569cf4ee3aa 100644
--- a/layouts/partials/events/event-card.html
+++ b/layouts/partials/events/event-card.html
@@ -11,7 +11,7 @@
         {{ $target = "" }}
     {{ end }}
 
-    <article class="card bg-white h-80 md:h-72 flex flex-col mx-2 md:mx-0 border border-gray-200 hover:border-gray-500">
+    <article class="card bg-white h-80 md:h-72 flex flex-col mx-2 md:mx-0 border border-gray-200 hover:border-gray-500 w-full">
         <a href="{{ $href }}" rel="{{ $relref }}" target="{{ $target }}" class="w-full h-full">
             <span class="block w-full h-full p-4 flex flex-col justify-between">
                 <span>
diff --git a/layouts/partials/template-partials/template-card.html b/layouts/partials/template-partials/template-card.html
index 1f49a99c4382..b5b5106c5fc9 100644
--- a/layouts/partials/template-partials/template-card.html
+++ b/layouts/partials/template-partials/template-card.html
@@ -42,7 +42,7 @@ <h3 class="card-title m-0">{{ $title }}</h3>
         {{ end }}
 
         {{ if $ctaText }}
-        <a href="{{ $ctaLink }}" class="btn-secondary-template-variant block text-center xl:text-left self-start w-full xl:w-auto">{{ $ctaText }}</a>
+        <a href="{{ $ctaLink }}" class="btn-secondary-template-variant block text-center w-full xl:w-auto">{{ $ctaText }}</a>
         {{ end }}
     </div>
 </div>
diff --git a/layouts/partials/template-partials/template-footer-cta.html b/layouts/partials/template-partials/template-footer-cta.html
index 82bda7113627..76996d49bc2e 100644
--- a/layouts/partials/template-partials/template-footer-cta.html
+++ b/layouts/partials/template-partials/template-footer-cta.html
@@ -18,16 +18,20 @@
 {{ $anchor := .anchor }}
 
 <section class="template-footer"{{ if $anchor }} id="{{ $anchor }}"{{ end }}>
-    <div class="flex flex-col xxl:flex-row items-start xxl:items-center justify-center lg:justify-between gap-6">
+    <div class="flex flex-col xxl:flex-row justify-center lg:justify-between gap-6">
         {{ if $title }}
-        <h2 class="template-footer-title text-left xxl:text-center">{{ $title }}</h2>
+        <h2 class="template-footer-title text-left md:text-center my-0 w-full max-w-xl xl:max-w-none mx-auto">{{ $title }}</h2>
         {{ end }}
-        <div class="flex flex-col lg:flex-row w-full xl:w-auto gap-4 items-center">
+        <div class="flex flex-col lg:flex-row w-full xl:w-auto gap-4 items-center md:justify-center">
             {{ if $ctaPrimaryText }}
-            <a href="{{ $ctaPrimaryLink }}" class="btn-primary text-center w-full lg:w-1/2 xl:w-auto">{{ $ctaPrimaryText }}</a>
+            <a href="{{ $ctaPrimaryLink }}" class="btn-primary text-center md:w-1/2 w-full lg:w-auto">
+                <span class="whitespace-nowrap">{{ $ctaPrimaryText }}</span>
+            </a>
             {{ end }}
             {{ if $ctaSecondaryText }}
-            <a href="{{ $ctaSecondaryLink }}" class="btn-secondary text-center w-full lg:w-1/2 xl:w-auto">{{ $ctaSecondaryText }}</a>
+            <a href="{{ $ctaSecondaryLink }}" class="btn-secondary text-center md:w-1/2 w-full lg:w-auto">
+                <span class="whitespace-nowrap">{{ $ctaSecondaryText }}</span>
+            </a>
             {{ end }}
         </div>
     </div>
diff --git a/layouts/partials/template-partials/template-location.html b/layouts/partials/template-partials/template-location.html
index 44a7a5e3d624..e215c18e47fd 100644
--- a/layouts/partials/template-partials/template-location.html
+++ b/layouts/partials/template-partials/template-location.html
@@ -50,7 +50,7 @@ <h2 class="location-title mt-0 mb-4">{{ $title }}</h2>
             </div>
             {{ end }}
             {{ if $ctaText }}
-            <a href="{{ $ctaLink }}" target="_blank" class="btn-primary-template-variant">{{ $ctaText }}</a>
+            <a href="{{ $ctaLink }}" target="_blank" class="btn-primary-template-variant block lg:inline-block text-center">{{ $ctaText }}</a>
             {{ end }}
         </div>
         <div class="w-full lg:w-1/2">
diff --git a/layouts/partials/template-partials/template-three-column.html b/layouts/partials/template-partials/template-three-column.html
index 0f6553a0433a..9fbf5e45bc1e 100644
--- a/layouts/partials/template-partials/template-three-column.html
+++ b/layouts/partials/template-partials/template-three-column.html
@@ -47,7 +47,7 @@ <h4 class="three-column-item-title mb-3 flex items-center">
             <p class="three-column-item-description mb-6">{{ .description | markdownify }}</p>
             {{ end }}
             {{ if .cta_text }}
-            <a href="{{ .cta_link }}" class="btn-secondary-template-variant block xl:inline-block text-center xl:text-left self-start w-full xl:w-auto">{{ .cta_text }}</a>
+            <a href="{{ .cta_link }}" class="btn-secondary-template-variant block xl:inline-block text-center w-full xl:w-auto">{{ .cta_text }}</a>
             {{ end }}
         </div>
         {{ end }}