diff --git a/templates/article.html b/templates/article.html
index 72c5755..e1a787d 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -81,6 +81,11 @@
       {% endfor %}
       </address></p>
       {% endif %}
+      <p class="pentry">Published: <time class="published" datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time></p>
+      {% if article.modified %}
+      <p class="pentry">Updated: <time class="modified" datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></p>
+      {% endif %}
+
 
       {% if SOCIAL_SHARE is sameas true %}
       <p class="share">Share this article on: 
@@ -121,10 +126,6 @@
       {% endif %}
 
       <footer id="post-info">
-        <p class="pentry">Published: <time class="published" datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time></p>
-        {% if article.modified %}
-        <p class="pentry">Updated: <time class="modified" datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></p>
-        {% endif %}
         {% if article.category %}
         <div class="category">
             Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
@@ -168,7 +169,7 @@
       
       <section id="article-footer">
         {% if article.photo_image %}
-        <a href="{{ SITEURL }}/{{ article.photo_image[1] }}"><img style="display: block; margin: 0 auto 0 0;" src="{{ SITEURL }}/{{ article.photo_image[1] }}" /></a>
+        <a href="{{ SITEURL }}/{{ article.photo_image[1] }}"><img style="display: block; margin: 0 auto 0 0;" src="{{ SITEURL }}/{{ article.photo_image[2] }}" /></a>
         {% endif %}
         {% if ARTICLE_FOOTER == true %}
           {% include 'include/article_footer.html' %}
diff --git a/templates/base.html b/templates/base.html
index de199fd..86d38a9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -105,33 +105,6 @@
   <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/util.js"></script>
   <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/main.js"></script>
 
-  {% if (article and article.photo_gallery) or (articles_page and articles_page.object_list[0].photo_gallery) %}
-  <!-- jQuery 1.7.2+ or Zepto.js 1.0+ -->
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-
-  <!-- Magnific Popup core JS file -->
-  <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/magnific-popup.js"></script>
-  <script>
-    $('.gallery').magnificPopup({
-  	delegate: 'a',
-  	type: 'image',
-  	gallery: {
-  		enabled: true,
-  		navigateByImgClick: true,
-  		preload: [1,2]
-  	},
-	image: {
-		titleSrc: function(item) {
-			if (item.el.attr('caption') && item.el.attr('exif')) {
-				return (item.el.attr('caption').replace(/\\n/g, '<br />') +
-					'<small>' + item.el.attr('title') + ' - ' + item.el.attr('exif') + '</small>');
-			}
-  		return item.el.attr('title') + '<small>' + item.el.attr('exif') + '</small>';
-  	} }
-  });
-  </script>
-  {% endif %}
-
 {% if IMAGETRACKINGCODE %}
 {{ IMAGETRACKINGCODE }}
 {% endif %}