diff --git a/source/_includes/custom/header.html b/source/_includes/custom/header.html
new file mode 100644
index 0000000..35f9c05
--- /dev/null
+++ b/source/_includes/custom/header.html
@@ -0,0 +1,6 @@
+<hgroup>
+  <h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
+  {% if site.subtitle %}
+    <h2>{{ site.subtitle }}</h2>
+  {% endif %}
+</hgroup>
diff --git a/source/_includes/header.html b/source/_includes/header.html
index 35f9c05..524de65 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -1,6 +1 @@
-<hgroup>
-  <h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
-  {% if site.subtitle %}
-    <h2>{{ site.subtitle }}</h2>
-  {% endif %}
-</hgroup>
+{% include custom/header.html %}
diff --git a/source/atom.xml b/source/atom.xml
index 3b4e661..693f397 100644
--- a/source/atom.xml
+++ b/source/atom.xml
@@ -4,7 +4,7 @@ layout: nil
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-  <title>{{ site.blog_title }}</title>
+  <title>{{ site.title }}</title>
   <link href="{{ site.url }}/atom.xml" rel="self"/>
   <link href="{{ site.url }}/"/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
@@ -16,13 +16,13 @@ layout: nil
     {% endif %}
   </author>
 
-  {% for post in site.posts %}
+  {% for post in site.posts limit: 20 %}
   <entry>
     <title>{{ post.title }}</title>
     <link href="{{ site.url }}{{ post.url }}"/>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
     <id>{{ site.url }}{{ post.id }}</id>
-    <content type="html">{{ post.content | full_urls: site.url | xml_escape }}</content>
+    <content type="html">{{ post.content | expand_urls: site.url | xml_escape }}</content>
   </entry>
   {% endfor %}
 </feed>