diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
index 1beb8c3..c3067fe 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/coffee/framework.flash.coffee
@@ -1,19 +1,24 @@
 class Flash
 
-  add: (message, type) ->
+  add: (message, type, time) ->
     alertId = Date.now();
 
-    $('body').prepend(
-      '<div class="alert alert-' + type + ' alert-dismissible notification" role="alert" data-alert-id="' + alertId + '">' +
-        '  <div class="container">' +
-        '    <button type="button" class="close" data-dismiss="alert"' +
-        '       title="' + Locale.lbl('Close') + '">' + Locale.lbl('Close') +
-        '    </button>' +
-        '    ' + message +
-        '  </div>' +
+    $('.main-header').append(
+        '<div class="alert alert-' + type + ' alert-dismissible notification" role="status" data-alert-id="' + alertId + '">' +
+            '  <div class="container">' +
+            '    <a class="close" data-dismiss="alert" title="' + Locale.lbl('Close') + '">' +
+            '       <i class="fa fa-close"></i>' +
+            '       <span class="hide">' + Locale.lbl('Close') + '</span>' +
+            '    </a>' +
+            '    ' + message +
+            '  </div>' +
         '</div>'
     );
 
+    if time?
+      callback = => @remove(alertId)
+      setTimeout callback, time
+
     return alertId
 
   remove: (alertId) ->
diff --git a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
index 4f41deb..5bad715 100644
--- a/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
+++ b/src/SumoCoders/FrameworkCoreBundle/Resources/assets/sass/layouts/_header.scss
@@ -121,6 +121,10 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
+
+    .alert {
+      margin-bottom: 0;
+    }
   }
 
   .sub-nav {