diff --git a/themes/default/static/css/main.css b/themes/default/static/css/main.css
index 32c5edd..0fb3abf 100644
--- a/themes/default/static/css/main.css
+++ b/themes/default/static/css/main.css
@@ -103,6 +103,11 @@ hr{
 	margin:3em auto;
 }
 
+img{
+	width: calc(100% + 6em);
+	margin: 1em 0 1em -3em;
+}
+
 .lastupdate{
 	font-size: smaller;
 	margin:4em 0;
diff --git a/themes/default/templates/article.html b/themes/default/templates/article.html
index 2562384..16d691a 100644
--- a/themes/default/templates/article.html
+++ b/themes/default/templates/article.html
@@ -4,49 +4,66 @@
 {% block title %}{{ SITENAME }} - {{ article.title|striptags  }}{% endblock %}
 
 {% block head %}
-  {{ super() }}
+	{{ super() }}
 
-  {% import 'translations.html' as translations with context %}
-  {% if translations.entry_hreflang(article) %}
-    {{ translations.entry_hreflang(article) }}
-  {% endif %}
+	{% import 'translations.html' as translations with context %}
+	{% if translations.entry_hreflang(article) %}
+		{{ translations.entry_hreflang(article) }}
+	{% endif %}
 
-  {% if article.description %}
-    <meta name="description" content="{{article.description}}" />
-  {% endif %}
+	{% if article.description %}
+		<meta name="description" content="{{article.description}}" />
+	{% endif %}
 
-  {% for tag in article.tags %}
-    <meta name="tags" content="{{tag}}" />
-  {% endfor %}
+	{% for tag in article.tags %}
+		<meta name="tags" content="{{tag}}" />
+	{% endfor %}
 
 {% endblock %}
 
 {% block content %}
 <section id="content" class="body">
-  <header>
-    <h2 class="entry-title">
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+	<header>
+		<h2 class="entry-title">
+			<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
  {% import 'translations.html' as translations with context %}
  {{ translations.translations_for(article) }}
-  </header>
-  <footer class="post-info">
-    {% if article.category %}
-    <div class="category">
-        Part of: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-    </div>
-    {% endif %}
-    {% if article.tags %}
-    <div class="tags">
-        Tags:
-        {% for tag in article.tags %}
-            <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
-        {% endfor %}
-    </div>
-    {% endif %}
-  </footer>
-  <div class="entry-content">
-    {{ article.content }}
-  </div>
+	</header>
+	<footer class="post-info">
+		{% if article.category %}
+		<div class="category">
+			Part of: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+		</div>
+		{% endif %}
+		{% if article.tags %}
+		<div class="tags">
+			Tags:
+			{% for tag in article.tags %}
+				<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
+			{% endfor %}
+		</div>
+		{% endif %}
+	</footer>
+	<div class="entry-content">
+		{{ article.content }}
+	</div>
+
+	<ul>
+	{% if article.prev_article_in_category %}
+		<li>
+			<a href="{{ SITEURL }}/{{ article.prev_article_in_category.url}}">
+				{{ article.prev_article_in_category.title }}
+			</a>
+		</li>
+	{% endif %}
+	{% if article.next_article_in_category %}
+		<li>
+			<a href="{{ SITEURL }}/{{ article.next_article_in_category.url}}">
+				{{ article.next_article_in_category.title }}
+			</a>
+		</li>
+	{% endif %}
+	</ul>
+
 </section>
 {% endblock %}
diff --git a/themes/default/templates/index.html b/themes/default/templates/index.html
index 4042725..eb1e663 100644
--- a/themes/default/templates/index.html
+++ b/themes/default/templates/index.html
@@ -12,9 +12,4 @@
 		<footer class="post-info"></footer>
 	</article></li>
 {% endfor %}
-
-<!-- {% if articles_page.has_other_pages() %} -->
-	<!-- {% include 'pagination.html' %} -->
-<!-- {% endif %} -->
-
 {% endblock content %}