diff --git a/_includes/archive-single.html b/_includes/archive-single.html
index 7854c961bd43..29f365ecc46b 100644
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -17,14 +17,14 @@
{% endif %}
-
{% if author.bio %}
@@ -34,14 +34,14 @@
{% if author.links %}
{% for link in author.links %}
{% if link.label and link.url %}
- {{ link.label }}
+
{{ link.label }}
{% endif %}
{% endfor %}
{% endif %}
{% if author.uri %}
-
+
{{ site.data.ui-text[site.locale].website_label | default: "Website" }}
@@ -49,7 +49,7 @@
{% if author.email %}
-
+
{{ site.data.ui-text[site.locale].email_label | default: "Email" }}
@@ -58,7 +58,7 @@
{% if author.keybase %}
-
+
Keybase
@@ -66,7 +66,7 @@
{% if author.twitter %}
-
+
Twitter
@@ -74,7 +74,7 @@
{% if author.facebook %}
-
+
Facebook
@@ -82,7 +82,7 @@
{% if author.linkedin %}
-
+
LinkedIn
@@ -90,7 +90,7 @@
{% if author.xing %}
-
+
XING
@@ -98,7 +98,7 @@
{% if author.instagram %}
-
+
Instagram
@@ -106,7 +106,7 @@
{% if author.tumblr %}
-
+
Tumblr
@@ -114,7 +114,7 @@
{% if author.bitbucket %}
-
+
Bitbucket
@@ -122,7 +122,7 @@
{% if author.github %}
-
+
GitHub
@@ -130,7 +130,7 @@
{% if author.gitlab %}
-
+
GitLab
@@ -138,7 +138,7 @@
{% if author.stackoverflow %}
-
+
Stack Overflow
@@ -146,7 +146,7 @@
{% if author.lastfm %}
-
+
Last.fm
@@ -154,7 +154,7 @@
{% if author.dribbble %}
-
+
Dribbble
@@ -162,7 +162,7 @@
{% if author.pinterest %}
-
+
Pinterest
@@ -170,7 +170,7 @@
{% if author.foursquare %}
-
+
Foursquare
@@ -178,7 +178,7 @@
{% if author.steam %}
-
+
Steam
@@ -187,13 +187,13 @@
{% if author.youtube %}
{% if author.youtube contains "://" %}
-
+
YouTube
{% elsif author.youtube %}
-
+
YouTube
@@ -202,7 +202,7 @@
{% if author.soundcloud %}
-
+
SoundCloud
@@ -210,7 +210,7 @@
{% if author.weibo %}
-
+
Weibo
@@ -218,7 +218,7 @@
{% if author.flickr %}
-
+
Flickr
@@ -226,7 +226,7 @@
{% if author.codepen %}
-
+
CodePen
@@ -234,7 +234,7 @@
{% if author.vine %}
-
+
{{ site.data.ui-text[site.locale].email_label | default: "Email" }}
diff --git a/_includes/footer.html b/_includes/footer.html
index 2b2b7ee1e479..86c93e645bb6 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -7,7 +7,7 @@
{% if site.footer.links %}
{% for link in site.footer.links %}
{% if link.label and link.url %}
-
{{ link.label }}
+
{{ link.label }}
{% endif %}
{% endfor %}
{% endif %}
diff --git a/_includes/page__date.html b/_includes/page__date.html
index ec02005f1307..1d604a1a435a 100644
--- a/_includes/page__date.html
+++ b/_includes/page__date.html
@@ -1,6 +1,6 @@
{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
{% if page.last_modified_at %}
-
{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }} {{ page.last_modified_at | date: date_format }}
+
{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }} {{ page.last_modified_at | date: date_format }}
{% elsif page.date %}
{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }} {{ page.date | date: date_format }}
{% endif %}
\ No newline at end of file
diff --git a/_layouts/archive-taxonomy.html b/_layouts/archive-taxonomy.html
index 4e94867df655..1fb4953e6aeb 100644
--- a/_layouts/archive-taxonomy.html
+++ b/_layouts/archive-taxonomy.html
@@ -18,9 +18,9 @@
{% include sidebar.html %}
-
+
{% unless page.header.overlay_color or page.header.overlay_image %}
-
{{ page.title }}
+
{{ page.title }}
{% endunless %}
{% for post in page.posts %}
{% include archive-single.html %}
diff --git a/_layouts/archive.html b/_layouts/archive.html
index 83e109b58cb4..f406cbe08453 100644
--- a/_layouts/archive.html
+++ b/_layouts/archive.html
@@ -17,7 +17,7 @@
{% include sidebar.html %}
-
+
{% unless page.header.overlay_color or page.header.overlay_image %}
{{ page.title }}
{% endunless %}
diff --git a/_layouts/single.html b/_layouts/single.html
index 1e42e3f6b8a4..79c62b695c3f 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -21,7 +21,7 @@
{% include sidebar.html %}
-
+
{% if page.title %} {% endif %}
{% if page.excerpt %} {% endif %}
{% if page.date %} {% endif %}
@@ -31,7 +31,7 @@
{% unless page.header.overlay_color or page.header.overlay_image %}
{% endunless %}
-