diff --git a/app/views/branded/layouts/_branding.html.erb b/app/views/branded/layouts/_branding.html.erb
index de9f779..b3b8cdb 100644
--- a/app/views/branded/layouts/_branding.html.erb
+++ b/app/views/branded/layouts/_branding.html.erb
@@ -101,6 +101,11 @@
                   <%= link_to(_('Usage'), usage_index_path) %>
                 </li>
               <% end %>
+              <% if current_user.can_super_admin? %>
+                <li <%= 'class=active' if isActivePage(super_admin_notifications_path) %>>
+                  <%= link_to _('Notifications'), super_admin_notifications_path %>
+                </li>
+              <% end %>
             </ul>
           </li>
         <% end %> <!-- if org admin -->
diff --git a/app/views/branded/layouts/application.html.erb b/app/views/branded/layouts/application.html.erb
index c213800..ed08fa9 100644
--- a/app/views/branded/layouts/application.html.erb
+++ b/app/views/branded/layouts/application.html.erb
@@ -4,7 +4,7 @@
     <title>
       <%= _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %>
     </title>
-      <%= favicon_link_tag "favicon.png" %>
+      <%= favicon_link_tag "favicon.ico" %>
     <!--[ if lte IE 9]>
       <script src="https://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
          <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.3.0/respond.js"></script>
@@ -35,7 +35,7 @@
 
     <%= stylesheet_link_tag fingerprinted_asset('application') %>
     <%= javascript_include_tag fingerprinted_asset('vendor') %>
-    <%= javascript_include_tag fingerprinted_asset('application') %> 
+    <%= javascript_include_tag fingerprinted_asset('application') %>
     <%= csrf_meta_tags %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -63,6 +63,7 @@
           <span class="aria-only"><%= has_alert ? _('Error:') : _('Notice:') %></span>
           <span><%= raw (has_alert ? alert : notice) %></span>
         </div>
+        <%= render "layouts/notifications", notifications: Notification.active_per_user(current_user) %>
         <%= yield %>
       </main>
 
@@ -70,10 +71,8 @@
       <footer >
         <%= render "layouts/footer" %>
       </footer>
-      <!-- piwik rendering -->
-      <%= render "layouts/piwik" %>
-      
-    <% 
+
+    <%
     constants_json = {
       PASSWORD_MIN_LENGTH: 8,
       PASSWORD_MAX_LENGTH: 128,
@@ -94,7 +93,7 @@
       SHOW_PASSWORD_MESSAGE: _('Show password'),
       SHOW_SELECT_ORG_MESSAGE: _('Select an organisation from the list.'),
       SHOW_OTHER_ORG_MESSAGE: _('My organisation isn\'t listed'),
- 
+
       PLAN_VISIBILITY_WHEN_TEST: _('N/A'),
       PLAN_VISIBILITY_WHEN_NOT_TEST: _('Private'),
       PLAN_VISIBILITY_WHEN_NOT_TEST_TOOLTIP: _('Private: restricted to me and people I invite.'),
@@ -103,7 +102,11 @@
       SHIBBOLETH_DISCOVERY_SERVICE_SHOW_LIST: _('See the full list of partner institutions.'),
 
       NO_TEMPLATE_FOUND_ERROR: _('Unable to find a suitable template for the research organisation and funder you selected.'),
-      NEW_PLAN_DISABLED_TOOLTIP: _('Please select a research organisation and funder to continue.')
+      NEW_PLAN_DISABLED_TOOLTIP: _('Please select a research organisation and funder to continue.'),
+
+      AJAX_LOADING: _('Loading ...'),
+      AJAX_UNABLE_TO_LOAD_TEMPLATE_SECTION: _('Unable to load the section\'s content at this time.'),
+      AJAX_UNABLE_TO_LOAD_TEMPLATE_SECTION_QUESTION: _('Unable to load the question\'s content at this time.')
     }.to_json
     %>