diff --git a/views/basetemplates.py b/views/basetemplates.py
index c825185c17fe5728cdaaa8bdbb2e9eef97017387_dmlld3MvYmFzZXRlbXBsYXRlcy5weQ==..c89950b2fef7072e775a7ca6f189718436a5bc89_dmlld3MvYmFzZXRlbXBsYXRlcy5weQ== 100644
--- a/views/basetemplates.py
+++ b/views/basetemplates.py
@@ -181,7 +181,7 @@
 
 basecomponents.ApplLogo.context = 'header-logo'
 # use basecomponents.ApplicationName.visible = False
-basecomponents.ApplicationName.context = 'header-logo'
+basecomponents.ApplicationName.context = 'header-left'
 basecomponents.ApplLogo.order = 1
 basecomponents.ApplicationName.order = 10
 basecomponents.CookieLoginComponent.order = 10
@@ -190,10 +190,6 @@
 SearchBox.context = 'header-right'
 SearchBox.layout_id = 'simple-layout'
 
-basetemplates.HTMLPageHeader.headers_classes = {
-     'header-left':'navbar-left',
-     'header-right':'navbar-right',
-    }
 
 @monkeypatch(basetemplates.HTMLPageHeader)
 def call(self, view, **kwargs):
@@ -208,9 +204,14 @@
                                               context=context)
 
 basetemplates.HTMLPageHeader.get_components = get_components
-basetemplates.HTMLPageHeader.css = {'header-navbar' : 'navbar-default',
-                                    'breadcrumbs'   : 'cw-breadcrumbs-default'}
+basetemplates.HTMLPageHeader.css = {
+    'navbar-extra':  'navbar-default',
+    'breadcrumbs':   'cw-breadcrumbs-default',
+    'container-cls': basetemplates.TheMainTemplate.twbs_container_cls,
+    'header-left':   '',
+    'header-right':  'navbar-right',
+}
 
 @monkeypatch(basetemplates.HTMLPageHeader)
 def main_header(self, view):
     w = self.w
@@ -213,9 +214,7 @@
 
 @monkeypatch(basetemplates.HTMLPageHeader)
 def main_header(self, view):
     w = self.w
-    title = self._cw.property_value('ui.site-title')
-    w(u'<header class="navbar %s" role="banner">' %
-      self.css.get('header-navbar', 'header-navbar'))
-    w(u'<nav>')
+    w(u'<nav class="navbar %s" role="banner">' % self.css['navbar-extra'])
+    w(u'<div class="%s">' % self.css['container-cls'])
     self.dispaly_navbar_header(w, view)
@@ -221,3 +220,4 @@
     self.dispaly_navbar_header(w, view)
+    w(u'<div id="tools-group" class="collapse navbar-collapse">')
     self.display_header_components(w, view, 'header-left')
     self.display_header_components(w, view, 'header-right')
@@ -222,6 +222,6 @@
     self.display_header_components(w, view, 'header-left')
     self.display_header_components(w, view, 'header-right')
-    w(u'</nav></header>')
+    w(u'</div></div></nav>')
 
 def dispaly_navbar_header(self, w, view):
     w(u'''<div class="navbar-header">
@@ -242,11 +242,9 @@
 def display_header_components(self, w, view, context):
     components = self.get_components(view, context=context)
     if components:
-        w(u'<div id="tools-group" class="collapse navbar-collapse">')
-        w(u'<ul class="nav navbar-nav %s">' % \
-          self.headers_classes[context])
+        w(u'<ul class="nav navbar-nav %s">' % self.css[context])
         for component in components:
             w(u'<li>')
             component.render(w=w)
             w(u'</li>')
         w(u'</ul>')
@@ -248,9 +246,8 @@
         for component in components:
             w(u'<li>')
             component.render(w=w)
             w(u'</li>')
         w(u'</ul>')
-        w(u'</div>')
 
 basetemplates.HTMLPageHeader.display_header_components = display_header_components