diff --git a/app/templates/base.html b/app/templates/base.html
index 1081215..7855ad9 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -13,6 +13,12 @@
             <a href="/login">Login</a>
         </div>
         <hr>
+        {% with messages = get_flashed_messages() %}
+        {% if messages %}
+        <ul>
+            {% for message in messages %}
+            <li>{{ message }}</li>
+            {% endfor %}
         {% block content %}{% endblock %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/templates/index.html b/app/templates/index.html
index e5db648..8a7c7cd 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -1,15 +1,10 @@
-<html>
-    <head>
-        {% if title %}
-        <title>{{ title }} - Microblog</title>
-        {% else %}
-        <title>Welcome to Microblog</title>
-        {% endif %}
-    </head>
-    <body>
-        <h1>Hello, {{ user.username }}!</h1>
-        {% for post in posts %}
-        <div><p>{{ post.author.username }} says: <b>{{ post.body }}</b></p></div>
+{% extends "base.html" %}
+
+{% block content %}
+<body>
+    <h1>Hello, {{ user.username }}!</h1>
+    {% for post in posts %}
+    <div><p>{{ post.author.username }} says: <b>{{ post.body }}</b></p></div>
         {% endfor %}
-    </body>
-</html>
\ No newline at end of file
+</body>
+{% endblock %}
\ No newline at end of file
