diff --git a/core/themes/bartik/templates/block--system-page-messages.html.twig b/core/themes/bartik/templates/block--system-page-messages.html.twig
deleted file mode 100644
index 8e2e08b..0000000
--- a/core/themes/bartik/templates/block--system-page-messages.html.twig
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Bartik's theme implementation for status messages.
- *
- * Displays status, error, and warning messages, grouped by type.
- *
- * An invisible heading identifies the messages for assistive technology.
- * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
- * for info.
- *
- * Add an ARIA label to the contentinfo area so that assistive technology
- * user agents will better describe this landmark.
- *
- * Available variables:
- * - message_list: List of messages to be displayed, grouped by type.
- * - status_headings: List of all status types.
- * - display: (optional) May have a value of 'status' or 'error' when only
- * displaying messages of that specific type.
- *
- * @see template_preprocess_status_messages()
- *
- * @ingroup themeable
- */
-#}
-{% block content %}
-
- {% for type, messages in message_list %}
-
- {% if type == 'error' %}
-
- {% endif %}
- {% if status_headings[type] %}
-
{{ status_headings[type] }}
- {% endif %}
- {% if messages|length > 1 %}
-
- {% for message in messages %}
- - {{ message }}
- {% endfor %}
-
- {% else %}
- {{ messages.0 }}
- {% endif %}
- {% if type == 'error' %}
-
- {% endif %}
-
- {% endfor %}
-
-{% endblock %}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 8c739bb..b8883cc 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -131,9 +131,7 @@
{% if messages %}
-
+ {{ messages }}
{% endif %}
{% if page.featured %}
diff --git a/core/themes/bartik/templates/status-messages.html.twig b/core/themes/bartik/templates/status-messages.html.twig
new file mode 100644
index 0000000..f375c12
--- /dev/null
+++ b/core/themes/bartik/templates/status-messages.html.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * @file
+ * Default theme implementation for status messages.
+ *
+ * Displays status, error, and warning messages, grouped by type.
+ *
+ * An invisible heading identifies the messages for assistive technology.
+ * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
+ * for info.
+ *
+ * Add an ARIA label to the contentinfo area so that assistive technology
+ * user agents will better describe this landmark.
+ *
+ * Available variables:
+ * - message_list: List of messages to be displayed, grouped by type.
+ * - status_headings: List of all status types.
+ * - display: (optional) May have a value of 'status' or 'error' when only
+ * displaying messages of that specific type.
+ *
+ * @see template_preprocess_status_messages()
+ *
+ * @ingroup themeable
+ */
+#}
+
+{% for type, messages in message_list %}
+
+ {% if type == 'error' %}
+
+ {% endif %}
+ {% if status_headings[type] %}
+
{{ status_headings[type] }}
+ {% endif %}
+ {% if messages|length > 1 %}
+
+ {% for message in messages %}
+ - {{ message }}
+ {% endfor %}
+
+ {% else %}
+ {{ messages.0 }}
+ {% endif %}
+ {% if type == 'error' %}
+
+ {% endif %}
+
+{% endfor %}
+