diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css
index 359dac659..dbd92dc09 100644
--- a/src/Orchard.Web/Themes/Classic/Styles/site.css
+++ b/src/Orchard.Web/Themes/Classic/Styles/site.css
@@ -298,7 +298,7 @@ span.message {
 	background:#e68585; /* red */
 	color:#fff;
 }
-.info.message {
+.inf.message {
     background:#e6f1c9; /* green*/
 	border:1px solid #d4deb9;
 	color:#062232;
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 4c67cfb98..f6906f7c5 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -356,21 +356,21 @@ form.link button:hover {
 	margin:10px 0 4px 0;
     padding:4px;
 }
-div.message {
+messages div.message {
     clear:both;
 }
 span.message {
     display:block;
 	margin:4px 0 4px 4px;
 }
-.message a {
+.messages a {
     font-weight:bold;
 }
-.confirmation.message {
+.message-Confirmation {
 	background:#D1F2A5; /* green */
 	border:1px solid #BCD994;
 }
-.warning.message {
+.message-Warning {
 	background:#fdf5bc; /* yellow */
 	border:1px solid #ffea9b;
 }
@@ -383,7 +383,7 @@ span.message {
 	background:#e68585; /* red */
 	color:#fff;
 }
-.info.message {
+.message-Information {
     background:#e6f1c9; /* green */
 	border:1px solid #cfe493;
 	color:#062232;
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
index 099298fa2..c535f6589 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -28,10 +28,10 @@
     <div id="navshortcut">
         <a href="#Menu-admin">
             @T("Skip to navigation")</a></div>
-    <div id="messages">
-        @Display(Model.Messages)
-    </div>
     <div id="main" role="main">
+        <div id="messages">
+            @Display(Model.Messages)
+        </div>
         @Display(Model.Content)</div>
     <div id="menu">
         @Display(Model.Navigation)</div>
diff --git a/src/Orchard/UI/Admin/Notification/NotificationFilter.cs b/src/Orchard/UI/Admin/Notification/NotificationFilter.cs
index bc006e9e7..d34a3a664 100644
--- a/src/Orchard/UI/Admin/Notification/NotificationFilter.cs
+++ b/src/Orchard/UI/Admin/Notification/NotificationFilter.cs
@@ -20,7 +20,7 @@ namespace Orchard.UI.Admin.Notification {
                 return;
 
             // if it's not a view result, a redirect for example
-            if (filterContext.Result is ViewResultBase)
+            if (!(filterContext.Result is ViewResultBase))
                 return;
             
             var messageEntries = _notificationManager.GetNotifications().ToList();
diff --git a/src/Orchard/UI/Notify/NotifyFilter.cs b/src/Orchard/UI/Notify/NotifyFilter.cs
index ea2cfc567..def04f846 100644
--- a/src/Orchard/UI/Notify/NotifyFilter.cs
+++ b/src/Orchard/UI/Notify/NotifyFilter.cs
@@ -85,7 +85,7 @@ namespace Orchard.UI.Notify {
             var shape = _shapeHelperFactory.CreateHelper();
             var messagesZone = _workContextAccessor.GetContext(filterContext).Page.Zones["Messages"];
             foreach(var messageEntry in messageEntries)
-                messagesZone.Add(shape.Message(messageEntry));
+                messagesZone = messagesZone.Add(shape.Message(messageEntry));
 
             //todo: (heskew) probably need to keep duplicate messages from being pushed into the zone like the previous behavior
             //baseViewModel.Messages = baseViewModel.Messages == null ? messageEntries .Messages.Union(messageEntries).ToList();