diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-home.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-home.css
index 8cc8d0d4..4ade672a 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/page-home.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-home.css
@@ -166,3 +166,10 @@ div#adjImgHeight {
     text-align:center;
     margin-top:100px;
 }
+div.faculty-home {
+    padding-top: 20px;
+}
+.faculty-home,
+.research-count {
+    background-color: #fff;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css
index 5b02fb12..9cf12731 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-login.css
@@ -122,19 +122,15 @@ p.password-note {
     border: 1px dotted #E2C822;
     background-color: #FFF9D7;
     padding: .5em;
+    margin-top: 10px;
     margin-bottom: 10px;
 }
 #welcome-message {
     border: 1px dotted #E2C822;
     background-color: #FFF9D7;
-    padding: .25em;
-    margin-bottom: 8px;
-}
-#welcome-msg-container {
-    margin-bottom: 8px;
-    margin-top: -10px;
-    margin-right:-10px;
-    height:34px;
+    padding: .5em;
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 p.external-auth {
     margin: 0 auto;
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
index d31ec0dc..81ac0025 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
@@ -31,6 +31,7 @@
 			<#include "identity.ftl">
 		</header>
         <#include "menu.ftl">
+        <#include "message.ftl">
         <div class="row hero">
             <div class="theme-showcase">
                 <div class="col-md-12">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
index d7b20c8e..571a7c94 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
@@ -13,6 +13,7 @@
 			<#include "identity.ftl">
 		</header>
         <#include "menu.ftl">
+		<#include "message.ftl">
 
 		<div id="wrapper-content" role="main" class="container">        
 			<#if flash?has_content>
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
index 9ba97d2e..41a3bea9 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
@@ -1,3 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <div id="nav">
     <div class="container">
         <nav class="navbar navbar-default">
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
new file mode 100644
index 00000000..ccbcd9dd
--- /dev/null
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl
@@ -0,0 +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>
+            <section id="flash-message" role="alert">
+                ${flash}
+            </section>
+        </#if>
+    </div>
+</#if>