diff --git a/assets/css/_page/_home.scss b/assets/css/_page/_home.scss
index 9a7e1f58..7b460108 100644
--- a/assets/css/_page/_home.scss
+++ b/assets/css/_page/_home.scss
@@ -29,7 +29,10 @@
       font-size: 1.25rem;
       font-weight: bold;
       margin: 0;
-      padding: 0.5rem;
+
+      &:not(:empty) {
+        padding: 0.5rem;
+      }
     }
 
     .home-subtitle {
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 22d14e6b..3708212f 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -18,7 +18,7 @@
   {{- end -}}
 
   {{- /* Title */ -}}
-  <h1 class="single-title" itemprop="name headline">
+  <h2 class="single-title" itemprop="name headline">
     {{ $repost := $params.repost | default dict }}
     {{- with $repost -}}
       {{- if eq .Enable true -}}
@@ -28,7 +28,7 @@
       {{- end -}}
     {{- end -}}
     <a href="{{ .RelPermalink }}">{{ .Title }}</a>
-  </h1>
+  </h2>
 
   {{- /* Meta */ -}}
   <div class="post-meta">
diff --git a/layouts/partials/home/profile.html b/layouts/partials/home/profile.html
index e56af6ca..d7dcf4ae 100644
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -36,14 +36,14 @@
     </div>
   {{- end -}}
 
-  {{- with $profile.title -}}
-    <h1 class="home-title">
+  <h1 class="home-title">
+    {{- with $profile.title -}}
       {{- . | safeHTML -}}
-    </h1>
-  {{- end -}}
+    {{- end -}}
+  </h1>
 
   {{- with $profile.subtitle -}}
-    <h2 class="home-subtitle">
+    <p class="home-subtitle">
       {{- if $profile.typeit -}}
         {{- $id := dict "Content" . "Scratch" $.Scratch "Id" "typeit-profile-subtitle" | partial "function/id.html" -}}
         <span class="d-none">{{ . }}</span>
@@ -52,7 +52,7 @@
       {{- else -}}
         {{- . -}}
       {{- end -}}
-    </h2>
+    </p>
   {{- end -}}
 
   {{- if $profile.social -}}