diff --git a/Configuration/TypoScript/Setup/Config.typoscript b/Configuration/TypoScript/Setup/Config.typoscript
index e841843..a62e48a 100644
--- a/Configuration/TypoScript/Setup/Config.typoscript
+++ b/Configuration/TypoScript/Setup/Config.typoscript
@@ -1,6 +1,12 @@
 config {
+    headerComment = Created by Daniel Siepmann.
     absRefPrefix = auto
 
+    # Does not have any effect?
+    # intTarget = _top
+    # extTarget = _blank
+    # fileTarget = _blank
+
     spamProtectEmailAddresses = ascii
     spamProtectEmailAddresses_atSubst = | at |
 }
diff --git a/Resources/Private/Layouts/Page/BlogPost.html b/Resources/Private/Layouts/Page/BlogPost.html
index 0b2dd2a..f885483 100644
--- a/Resources/Private/Layouts/Page/BlogPost.html
+++ b/Resources/Private/Layouts/Page/BlogPost.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
     data-namespace-typo3-fluid="true">
 
-    {f:render(partial: 'Header', arguments: _all)}
+    {f:render(partial: 'Header', arguments: _all) -> f:spaceless()}
 
     <main>
         <header>
@@ -15,15 +15,15 @@
                 compatibleWith: compatibleWith,
                 topics: assignedTopics,
                 addLinks: 1
-            })}
+            }) -> f:spaceless()}
 
             <aside>
-                {f:render(section: 'Aside', arguments: _all)}
+                {f:render(section: 'Aside', arguments: _all) -> f:spaceless()}
             </aside>
 
             {f:render(section: 'Content', arguments: _all)}
         </article>
     </main>
 
-    {f:render(partial: 'Footer', arguments: _all)}
+    {f:render(partial: 'Footer', arguments: _all) -> f:spaceless()}
 </html>
diff --git a/Resources/Private/Layouts/Page/Default.html b/Resources/Private/Layouts/Page/Default.html
index 294d2b7..9ff58f3 100644
--- a/Resources/Private/Layouts/Page/Default.html
+++ b/Resources/Private/Layouts/Page/Default.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
     data-namespace-typo3-fluid="true">
 
-    {f:render(partial: 'Header', arguments: _all)}
+    {f:render(partial: 'Header', arguments: _all) -> f:spaceless()}
 
     <main>
         <header>
@@ -9,13 +9,13 @@
         </header>
 
         <section>
-            {f:render(section: 'Content', arguments: _all)}
+            {f:render(section: 'Content', arguments: _all) -> f:spaceless()}
         </section>
 
         <aside>
-            {f:render(section: 'Aside', arguments: _all)}
+            {f:render(section: 'Aside', arguments: _all) -> f:spaceless()}
         </aside>
     </main>
 
-    {f:render(partial: 'Footer', arguments: _all)}
+    {f:render(partial: 'Footer', arguments: _all) -> f:spaceless()}
 </html>
diff --git a/Resources/Private/Partials/BlogPostHeader.html b/Resources/Private/Partials/BlogPostHeader.html
index 268034f..90e3bba 100644
--- a/Resources/Private/Partials/BlogPostHeader.html
+++ b/Resources/Private/Partials/BlogPostHeader.html
@@ -28,30 +28,29 @@
 
     <f:section name="TopicList">
         <f:if condition="{topics}">
-            <p>{headline}
-                <f:for each="{topics}" as="topic" iteration="i">
-                    <f:render section="TopicLink"
-                        contentAs="content"
-                        arguments="{
-                            addLinks: addLinks,
-                            topicUid: topic.data.uid
-                        }"
-                    >
-                        {topic.data.title}{f:if(condition: '!{i.isLast}', then: ',')}
-                    </f:render>
-                </f:for>
-            </p>
+            <p>{headline} <f:for each="{topics}" as="topic" iteration="i"><f:spaceless>
+                <f:render section="Topic"
+                    contentAs="content"
+                    arguments="{
+                        addLinks: addLinks,
+                        topicUid: topic.data.uid
+                    }"
+                >
+                    {topic.data.title}{f:if(condition: '!{i.isLast}', then: ',')}
+                </f:render>
+            </f:spaceless></f:for></p>
         </f:if>
     </f:section>
 
-    <f:section name="TopicLink">
-        <f:if condition="{addLinks}">
-            <f:then>
-                <a href="{f:uri.page(pageUid: 11, additionalParams: {topic: topicUid})}">{content -> f:spaceless()}</a>
-            </f:then>
-            <f:else>
-                {content}
-            </f:else>
-        </f:if>
+    <f:section name="Topic">
+        {f:if(
+            condition: addLinks,
+            then: "{f:render(section: 'LinkedTopic', arguments: _all)}",
+            else: content
+        )}
+    </f:section>
+
+    <f:section name="LinkedTopic">
+        <a href="{f:uri.page(pageUid: 11, additionalParams: {topic: topicUid})}">{content -> f:spaceless()}</a>
     </f:section>
 </html>
