diff --git a/templates/article.html b/templates/article.html
index ba676b5..7ea831a 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -12,22 +12,29 @@
{% endif %}
{% if article.description %}
-
+
{% endif %}
{% for tag in article.tags %}
-
+
{% endfor %}
+
+
+ {% if SOCIAL_TWIITER %}
+
+ {% endif %}
+
+
+
+
{% if article.photo_image %}
- {% endif %}
-
-
-
+ {% endif %}
+
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index e3330ef..449dc0a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,42 +1,40 @@
- {% block head %}
- {% block title %}{{ SITENAME }}{% endblock title %}
-
-
-
- {% if (article and article.photo_gallery) or (articles_page and articles_page.object_list[0].photo_gallery) %}
-
- {% endif %}
-
- {% if FEED_ALL_ATOM %}
-
- {% endif %}
- {% if FEED_ALL_RSS %}
-
- {% endif %}
- {% if FEED_ATOM %}
-
- {% endif %}
- {% if FEED_RSS %}
-
- {% endif %}
- {% if CATEGORY_FEED_ATOM and category %}
-
- {% endif %}
- {% if CATEGORY_FEED_RSS and category %}
-
- {% endif %}
- {% if TAG_FEED_ATOM and tag %}
-
- {% endif %}
- {% if TAG_FEED_RSS and tag %}
-
- {% endif %}
+{% block head %}
+ {% block title %}{{ SITENAME }}{% endblock title %}
+
+
+
+{% if (article and article.photo_gallery) or (articles_page and articles_page.object_list[0].photo_gallery) %}
+
+{% endif %}
+
+{% if FEED_ALL_ATOM %}
+
+{% endif %}
+{% if FEED_ALL_RSS %}
+
+{% endif %}
+{% if FEED_ATOM %}
+
+{% endif %}
+{% if FEED_RSS %}
+
+{% endif %}
+{% if CATEGORY_FEED_ATOM and category %}
+
+{% endif %}
+{% if CATEGORY_FEED_RSS and category %}
+
+{% endif %}
+{% if TAG_FEED_ATOM and tag %}
+
+{% endif %}
+{% if TAG_FEED_RSS and tag %}
+
+{% endif %}
- {% endblock head %}
-
-
+{% endblock head %}
@@ -69,11 +67,11 @@
{{ SITENAME }}{% if SITESUBTITLE %} {{ SITESUBTITLE }}{% endif %}
- {% if SOCIAL_TWIITER_LINK %}
- - Twitter
+ {% if SOCIAL_TWIITER %}
+ - Twitter
{% endif %}
- {% if SOCIAL_GITHUB_LINK %}
- - Github
+ {% if SOCIAL_GITHUB %}
+ - Github
{% endif %}
{% if FEED_ALL_ATOM %}
- atom feed