diff --git a/example/templates/index.html b/example/templates/index.html
index 361d4655..48612ccc 100644
--- a/example/templates/index.html
+++ b/example/templates/index.html
@@ -4,17 +4,19 @@ <h2>Overview</h2>
   {% if g.user %}
     <p>
       Hello {{ g.user.screen_name }}!  Wanna tweet something?
+    </p>
     <form action="{{ url_for('tweet') }}"  method=post>
       <p>
         <input type=text name=tweet size=40>
         <input type=submit value="Tweet!">
+      </p>
     </form>
     {% if tweets %}
     <h3>Your Timeline</h3>
     <ul>
     {% for tweet in tweets %}
       <li><a href="http://twitter.com/{{ tweet.user.screen_name
-        }}">{{ tweet.user.screen_name }}</a>: {{ tweet.text|urlize }}
+        }}">{{ tweet.user.screen_name }}</a>: {{ tweet.text|urlize }}</li>
     {% endfor %}
     </ul>
     {% endif %}
@@ -22,8 +24,10 @@ <h3>Your Timeline</h3>
     <p>
       Sign in to view your public timeline and to tweet from this
       example application.
+    </p>
     <p>
       <a href="{{ url_for('login') }}"><img src="{{
         url_for('static', filename='sign-in.png') }}" alt="sign in"></a>
+    </p>
   {% endif %}
 {% endblock %}
diff --git a/example/templates/layout.html b/example/templates/layout.html
index 6c9649d0..b27b3530 100644
--- a/example/templates/layout.html
+++ b/example/templates/layout.html
@@ -1,17 +1,22 @@
 <!doctype html>
+<head>
 <title>{% block title %}Welcome{% endblock %} | Flask OAuth Example</title>
 <link rel=stylesheet type=text/css href="{{ url_for('static',
   filename='style.css') }}">
+</head>
+<body>
 <h1>Flask OAuth Example</h1>
 <ul class=navigation>
-  <li><a href="{{ url_for('index') }}">overview</a>
+  <li><a href="{{ url_for('index') }}">overview</a></li>
   {% if g.user %}
-  <li><a href="{{ url_for('logout') }}">sign out [{{ g.user.screen_name}}]</a>
+  <li><a href="{{ url_for('logout') }}">sign out [{{ g.user.screen_name}}]</a></li>
   {% else %}
-  <li><a href="{{ url_for('login') }}">sign in</a>
+  <li><a href="{{ url_for('login') }}">sign in</a></li>
   {% endif %}
 </ul>
 {% for message in get_flashed_messages() %}
-  <p class=message>{{ message }}
+  <p class=message>{{ message }}</p>
 {% endfor %}
 {% block body %}{% endblock %}
+</body>
+</html>
