diff --git a/_includes/disqus.html b/_includes/disqus.html
index 1335846..f4b049a 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -3,10 +3,12 @@
     <script type="text/javascript">
         var disqus_shortname = '{{ site.disqus }}';
         var disqus_identifier = '{{ page.id }}';
-        var disqus_title = '{{ page.title|replace:"'":"\\'" }}';
+        var disqus_title = '{{ page.title | replace:"'":"\\'" }}';
         var disqus_url = '{{ site.absolute }}{{ page.url }}';
         (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            var dsq = document.createElement('script');
+            dsq.type = 'text/javascript';
+            dsq.async = true;
             dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
             (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
diff --git a/_includes/gallery.html b/_includes/gallery.html
index ad2fa93..79a80ab 100644
--- a/_includes/gallery.html
+++ b/_includes/gallery.html
@@ -1,6 +1,13 @@
-{% assign photos=site.data.gallery[include.gallery].photos | sort:'date' %}
-<div style="line-height:0; padding:4px 0 0 1px;">
+{% assign gallery=site.data.gallery[include.gallery] %}
+{% assign photos=gallery.photos | sort:'date' %}
+<div style="text-align: center;">
+{% if include.no-link == null %}
+<a href="/{{ site.baseurl }}/gallery/{{ include.gallery }}/">[ gallery ]</a><br />
+{% endif %}
 {% for photo in photos %}
     <a href="/{{ site.baseurl }}/{{ photo.url }}" style="display: inline-block; margin: 3px; text-decoration: none;"><img alt="Photo: {{ photo.title }}" height="96" src="{{ site.asset_prefix }}/gallery/{{ include.gallery }}/{{ photo.name | remove:'.md' }}~96x96.jpg" title="{{ photo.title }}" width="96" style="padding: 1px;" /></a>
 {% endfor %}
-</div>
\ No newline at end of file
+</div>
+{% if include.no-link %}
+    <a href="/{{ site.baseurl }}/gallery/{{ include.gallery }}/">[ gallery ]</a>
+{% endif %}
\ No newline at end of file
diff --git a/_layouts/gallery-list.html b/_layouts/gallery-list.html
index 9c0c7e9..2efde7a 100644
--- a/_layouts/gallery-list.html
+++ b/_layouts/gallery-list.html
@@ -10,12 +10,12 @@ layout: default
 <section>
 {% for gallery in page.galleries %}
     {% if gallery.ignore == null %}
-    {% if gallery.highlight %}
-        {% assign highlight=gallery.highlight %}
-    {% else %}
-        {% assign photo=gallery.photos | first %}
-        {% assign highlight=photo.name %}
-    {% endif %}
+        {% if gallery.highlight %}
+            {% assign highlight=gallery.highlight %}
+        {% else %}
+            {% assign photo=gallery.photos | first %}
+            {% assign highlight=photo.name %}
+        {% endif %}
     <div style="display: inline-block; height: 274px; margin: 8px 10px 0 0; text-align: center; width: 200px;">
         <a href="/{{ site.baseurl }}/gallery/{{ gallery.gallery }}/" style="text-decoration:none;">
         <img alt="{{ gallery.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ gallery.gallery }}/{{ highlight }}~200x200.jpg" title="{{ gallery.title }}" width="200" style="border-radius:4px;" />
diff --git a/_layouts/post.html b/_layouts/post.html
index 4b2c6ef..3030eb4 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -17,7 +17,7 @@
             <small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
         </h1>
         {% if page.end_date %}
-            <span class="date-range">&#x1f557; {{ page.date|date:"%d/%m/%Y" }} - {{ page.end_date|date:"%d/%m/%Y" }}</span>
+            <span class="date-range">&#x1f557; {{ page.date | date:"%d/%m/%Y" }} - {{ page.end_date | date:"%d/%m/%Y" }}</span>
         {% endif %}
     </header>
     <section class="post-content" itemprop="articleBody">