diff --git a/flatfilecms/templates/base.jinja2 b/flatfilecms/templates/base.jinja2
index b7a07f2..e4ab524 100644
--- a/flatfilecms/templates/base.jinja2
+++ b/flatfilecms/templates/base.jinja2
@@ -1,6 +1,6 @@
{%- import 'macros.jinja2' as macros -%}
-
+
{%- block head %}
{{title}}
@@ -10,8 +10,7 @@
- {%- if amphtml is defined %}
-
+ {%- if amphtml is defined %}
{%- endif %}
{%- if feed is defined %}
@@ -33,9 +32,9 @@
{%- if author and 'twitter' in author %}
{%- endif %}
- {%- if image %}
-
-
+ {%- if preview or image %}
+
+
{%- else %}
diff --git a/flatfilecms/templates/layout.jinja2 b/flatfilecms/templates/layout.jinja2
index af109cf..73b4c2f 100644
--- a/flatfilecms/templates/layout.jinja2
+++ b/flatfilecms/templates/layout.jinja2
@@ -14,6 +14,9 @@
{% block content %}
+ {% if summary %}
+ {{summary}}
+ {% endif %}
{% if content %}
{{content|markdown}}
{% endif %}