diff --git a/scribeengine/controllers/admin.py b/scribeengine/controllers/admin.py
index ff599d7..975e545 100644
--- a/scribeengine/controllers/admin.py
+++ b/scribeengine/controllers/admin.py
@@ -165,5 +165,6 @@ class AdminController(BaseController):
     def logout(self):
         del session[u'REMOTE_USER']
         session.save()
+        h.flash.set_message(u'You have logged out successfully.', u'success')
         h.redirect_to('/')
 
diff --git a/scribeengine/public/styles/style.css b/scribeengine/public/styles/style.css
index 0b0f76f..d6fbe3d 100644
--- a/scribeengine/public/styles/style.css
+++ b/scribeengine/public/styles/style.css
@@ -418,8 +418,7 @@ fieldset {
 }
 
 #message {
-    margin-top: 1.8em;
-    /*padding: 0.3em 0.5em;*/
+    margin-bottom: 1.8em;
 }
 
 #message p {
diff --git a/scribeengine/templates/admin/login.mako b/scribeengine/templates/admin/login.mako
index 2817dfc..6ef1e70 100644
--- a/scribeengine/templates/admin/login.mako
+++ b/scribeengine/templates/admin/login.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
+        <%include file="/flash.mako"/>
         <div class="post">
             <h2 class="title">Log in</h2>
-            <%include file="/flash.mako"/>
             <%include file="/errors.mako"/>
             <form id="post-new" action="${h.url_for(controller='admin', action='login')}" method="post">
               <fieldset>
diff --git a/scribeengine/templates/admin/register.mako b/scribeengine/templates/admin/register.mako
index 503b474..b54f0bc 100644
--- a/scribeengine/templates/admin/register.mako
+++ b/scribeengine/templates/admin/register.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
+        <%include file="/flash.mako"/>
         <div class="post">
             <h2 class="title">Register</h2>
-            <%include file="/flash.mako"/>
             <%include file="/errors.mako"/>
             <form id="post-new" action="${h.url_for(controller='admin', action='register')}" method="post">
               <fieldset>
diff --git a/scribeengine/templates/blog/teaser.mako b/scribeengine/templates/blog/teaser.mako
index 13e84c6..3b347e4 100644
--- a/scribeengine/templates/blog/teaser.mako
+++ b/scribeengine/templates/blog/teaser.mako
@@ -1,5 +1,4 @@
         <div class="post">
-            <%include file="/flash.mako"/>
             <h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2>
             <div class="entry">
                 ${h.literal(post.body)}
diff --git a/scribeengine/templates/blog/view.mako b/scribeengine/templates/blog/view.mako
index b88ef62..ae83e33 100644
--- a/scribeengine/templates/blog/view.mako
+++ b/scribeengine/templates/blog/view.mako
@@ -1,8 +1,8 @@
 <%inherit file="/base.mako"/>
+        <%include file="/flash.mako"/>
         <div class="post">
             <h2 class="title">${c.post.title}</h2>
             <div class="info">Posted by ${c.post.user.nick} on ${c.post.created.strftime('%B %d, %Y')}</div>
-            <%include file="/flash.mako"/>
             <div class="entry">
                 ${h.literal(c.post.body)}
             </div>
diff --git a/scribeengine/templates/post/edit.mako b/scribeengine/templates/post/edit.mako
index 1477181..44006f1 100644
--- a/scribeengine/templates/post/edit.mako
+++ b/scribeengine/templates/post/edit.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
+        <%include file="/flash.mako"/>
         <div class="post">
             <h2 class="title">Edit Post: ${c.post.title}</h2>
-            <%include file="/flash.mako"/>
             <%include file="/errors.mako"/>
             <form id="post-new" action="${h.url_for(controller='post',action='edit', id=c.post.id)}" method="post">
               <fieldset>
diff --git a/scribeengine/templates/post/new.mako b/scribeengine/templates/post/new.mako
index 521a125..cca1e4e 100644
--- a/scribeengine/templates/post/new.mako
+++ b/scribeengine/templates/post/new.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
+        <%include file="/flash.mako"/>
         <div class="post">
             <h2 class="title">New Post</h2>
-            <%include file="/flash.mako"/>
             <%include file="/errors.mako"/>
             <form id="post-new" action="${h.url_for('/post/edit')}" method="post">
               <fieldset>