diff --git a/_data/ui-text.yml b/_data/ui-text.yml
index 549540e6..c56689b6 100644
--- a/_data/ui-text.yml
+++ b/_data/ui-text.yml
@@ -15,7 +15,7 @@ en: &DEFAULT_EN
   less_than                  : "less than"
   minute_read                : "minute read"
   share_on_label             : "Share on"
-  meta_label                 :
+  meta_label                 : "Metadata"
   tags_label                 : "Tags:"
   categories_label           : "Categories:"
   date_label                 : "Updated:"
diff --git a/_includes/comments.html b/_includes/comments.html
index 1e545213..d9e8c46b 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -1,32 +1,28 @@
-<section class="page__comments">
-  <h2>Comments by <a href="https://staticman.net/">Staticman</a> and <a href="https://identosphere.net">Identosphere</a></h2>
+<div class="page__comments">
+  <center><h2>Comments by <a href="https://staticman.net/">Staticman</a> and <a href="https://identosphere.net">Identosphere</a></h2></center>
   <center><a href="https://identosphere.net"><img src="/images/team-identosphere.png" alt="Team Identosphere" /></a></center>
-  <center><h3>Subscribe to our newsletter for weekly identity updates!!</h3></center>
+  <center><h3>Subscribe Free for Weekly Identity Updates!!</h3></center>
   
+  <center><p><u>Only Email Required</u>. Will not spam you, or share info with spammers!</p></center>
+
   <form class="identosphere" method="POST" action="https://identosphere.net/staticman/v2/entry/identosphere/identosphere-landing/master/subscribe">
     <input name="options[redirect]" type="hidden" value="https://identosphere.net">
     <input name="options[slug]" type="hidden" value="didecentral">
-    <input name="fields[name]" type="text" placeholder="Name">
+    <input name="fields[name]" type="text" placeholder="Name (optional)">
     <input name="fields[email]" type="email" placeholder="Email">
-    <input name="fields[message]" type="text" placeholder="Areas of Interest">
+    <input name="fields[message]" type="text" placeholder="Areas of Interest (optional)">
   
     <center><button type="submit">Subscribe</button></center>
   </form>
-</section>
-<div class="page__comments">
-  {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %}
   {% case site.comments.provider %}
-    {% when "discourse" %}
-      <h4 class="page__comments-title">{{ comments_label }}</h4>
-      <section id="discourse-comments"></section>
     {% when "staticman_v2" %}
       <section id="static-comments">
         {% if site.repository and site.staticman.branch %}
           <!-- Start static comments -->
           <div class="js-comments">
             {% if site.data.comments[page.slug] %}
-              <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
-              {% assign comments = site.data.comments[page.slug] | sort %}
+              <h3>Leave a comment and\or info you think should be on this page</h3>
+            {% assign comments = site.data.comments[page.slug] | sort %}
 
               {% for comment in comments %}
                 {% assign email = comment[1].email %}
diff --git a/_includes/social-share.html b/_includes/social-share.html
index 642a0872..dd20cb09 100644
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@@ -1,7 +1,5 @@
-<section class="page__share">
 <h3>Social Share</h3>
 <a href="https://twitter.com/intent/tweet?{% if site.twitter.username %}via={{ site.twitter.username | url_encode }}&{% endif %}text={{ page.title | url_encode }}%20{{ page.url | absolute_url | url_encode }}" class="btn btn--twitter" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="Share on Twitter"><i class="fab fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
 <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}" class="btn btn--facebook" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="Share on Facebook"><i class="fab fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
 <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}" class="btn btn--linkedin" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="Share on LinkedIn"><i class="fab fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
 <a href="https://www.reddit.com/submit?url={{ page.url | absolute_url | url_encode }}&title={{ page.title | url_encode }}" class="btn btn--reddit" title="Share on Reddit"><i class="fab fa-fw fa-reddit" aria-hidden="true"></i><span> Reddit</span></a>
-</section>
diff --git a/_includes/tag-list.html b/_includes/tag-list.html
index e4f38443..e0d02bfa 100644
--- a/_includes/tag-list.html
+++ b/_includes/tag-list.html
@@ -1,5 +1,3 @@
-<h3><a href="https://github.com/Decentralized-ID/decentralized-id.github.io/blob/master/{{ page.path }}" class="edit">Edit this page <i class="fa fa-pencil"></i></a></h3>
-
 {% case site.tag_archive.type %}
   {% when "liquid" %}
     {% assign path_type = "#" %}
diff --git a/_layouts/single.html b/_layouts/single.html
index 0e33311b..6e16cfc1 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -45,10 +45,10 @@ layout: default
         {{ content }}
         {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
       </section>
-      {% if page.share %}{% include social-share.html %}{% endif %}
       <footer class="page__meta">
+        <hr/>
         {% if site.data.ui-text[site.locale].meta_label %}
-          <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
+          <h3>{{ site.data.ui-text[site.locale].meta_label }}</h3>
         {% endif %}
         {% include page__taxonomy.html %}
         {% if page.last_modified_at %}
@@ -56,13 +56,14 @@ layout: default
         {% elsif page.date %}
           <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
         {% endif %}
+        <h3><a href="https://github.com/Decentralized-ID/decentralized-id.github.io/blob/master/{{ page.path }}" class="edit">Edit this page <i class="fa fa-pencil"></i></a></h3>
+        {% if page.share %}{% include social-share.html %}{% endif %}
+        <hr/>        
       </footer>
-
     </div>
     {% if site.comments.provider and page.comments %}
       {% include comments.html %}
     {% endif %}
-    </section>
   </article>
 
   {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
diff --git a/images/team-identosphere.png b/images/team-identosphere.png
index d242ec69..9e66be7d 100644
Binary files a/images/team-identosphere.png and b/images/team-identosphere.png differ