diff --git a/view/template/content/faq-post.php b/view/template/content/faq-post.php
index b9e703e6..7129dafa 100644
--- a/view/template/content/faq-post.php
+++ b/view/template/content/faq-post.php
@@ -1,18 +1,21 @@
-<?php Response::setMetaDescription($post->getTitle()) ?>
 <?php Response::addMetaImages($post->getImageUrls()) ?>
+<?php Response::setMetaDescription(htmlspecialchars($post->getContentText(20, true))) ?>
 <?php NavActions::setNavUri('/learn') ?>
 
 <main class="ancillary">
   <section class="hero hero--half-height">
     <div class="inner-wrap inner-wrap--center-hero">
-      <h1>Frequently Asked Questions</h1>
+      <h1><?php echo htmlentities($post->getTitle()) ?></h1>
     </div>
   </section>
 
   <section>
     <div class="inner-wrap">
-      <h2><?php echo htmlentities($post->getTitle()) ?></h2>
-      <p><a href="/faq">« {{page.faq.back}}</a></p>
+        <section>
+          <small class="meta">
+              <a href="/faq">« {{page.faq.back}}</a>
+          </small>
+        </section>
       <?php echo $post->getContentHtml() ?>
     </div>
   </section>
diff --git a/view/template/content/news-post.php b/view/template/content/news-post.php
index 3a64c207..a9856664 100644
--- a/view/template/content/news-post.php
+++ b/view/template/content/news-post.php
@@ -1,4 +1,4 @@
-<?php Response::setMetaDescription($post->getTitle()) ?>
+<?php Response::setMetaDescription(htmlspecialchars($post->getContentText(20, true))) ?>
 <?php Response::addMetaImages($post->getImageUrls()) ?>
 <?php NavActions::setNavUri('/news') ?>