diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
index 2e148078..e569ce8e 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
@@ -293,7 +293,31 @@ table.classHierarchy {
     margin-right: 0px;
 }
 
-
 section#container div {
     width: auto;
 }
+
+#flash-message {
+    border: 1px dotted #E2C822;
+    background-color: #FFF9D7;
+    padding: .5em;
+    margin-bottom: 10px;
+}
+#welcome-message {
+    border: 1px dotted #E2C822;
+    background-color: #FFF9D7;
+    padding: .25em;
+    margin-bottom: 8px;
+}
+#flash-msg-container,
+#welcome-msg-container {
+    width: 600px;
+    height:34px;
+    position: absolute;
+    z-index: 99;
+    margin-left: auto;
+    margin-right: auto;
+    left: 0;
+    right: 0;
+    top: 0;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl
index ccbcd9dd..85ecd808 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl
@@ -1,15 +1,15 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <#if flash?has_content>
-    <div id="wrapper-content" role="main" class="container">
-        <#if flash?starts_with(i18n().menu_welcomestart) >
-            <section  id="welcome-msg-container" role="container">
-                <section  id="welcome-message" role="alert">${flash}</section>
-            </section>
-        <#else>
+    <#if flash?starts_with(i18n().menu_welcomestart) >
+        <section id="welcome-msg-container" role="container">
+            <section  id="welcome-message" role="alert">${flash}</section>
+        </section>
+    <#else>
+        <section id="flash-msg-container" role="container">
             <section id="flash-message" role="alert">
                 ${flash}
             </section>
-        </#if>
-    </div>
+        </section>
+    </#if>
 </#if>
diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css
index 75ff6b39..c7f4478f 100644
--- a/webapp/src/main/webapp/themes/wilma/css/wilma.css
+++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css
@@ -737,6 +737,7 @@ p.password-note {
     padding: .25em;
     margin-bottom: 8px;
 }
+#flash-msg-container,
 #welcome-msg-container {
     margin-bottom: 8px;
     margin-top: -10px;
diff --git a/webapp/src/main/webapp/themes/wilma/templates/menu.ftl b/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
index 1dcfe08b..a507737f 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/menu.ftl
@@ -19,8 +19,8 @@
                 <section  id="welcome-message" role="alert">${flash}</section>
             </section>
         <#else>
-            <section id="flash-message" role="alert">
-                ${flash}
+            <section  id="flash-msg-container" role="container">
+                <section id="flash-message" role="alert">${flash}</section>
             </section>
         </#if>
     </#if>