Index: components/catalogue/html/view.html
===================================================================
--- components/catalogue/html/view.html	(revision 9317)
+++ components/catalogue/html/view.html	(working copy)
@@ -39,31 +39,28 @@
         <div class="flc-catalogue-container fl-catalogue">
             
             <!-- Navigation Bar and Header -->
-            <div class="flc-navigationBar fl-navbar fl-table">
-                <div class="fl-table-row">
-                    <!-- Back button -->
-                    <div class="fl-table-cell">
-                        <a rsf:id="scr=null" class="flc-navigationBar-back fl-button" href="#">
-                            <img class="fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/back.png" alt="Go back"/>
-                        </a>
-                    </div>
-                    <!-- Home button -->
-                    <div class="fl-table-cell">
-                        <a rsf:id="scr=null" class="flc-navigationBar-home fl-button" href="#">
-                            <img class="fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/home.png" alt="Go home"/>
-                        </a>
-                    </div>
-                    <!-- Page header -->
-                    <h1 class="flc-catalogue-title fl-table-cell">Catalogue for This Exhibition</h1>
-                    
-                    <!-- Toggle button -->
-                    <div class="fl-table-cell">
-                        <a rsf:id="scr=null" class="flc-navigationBar-toggle fl-button" href="#">
-                            <img class="flc-navigationBar-toggle-grid fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/toggle-grid.png" alt="Switch to grid layout"/>
-                            <img class="flc-navigationBar-toggle-list fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/toggle-list.png" alt="Switch to list layout"/>
-                        </a>
-                    </div>
+            <div class="flc-navigationBar fl-navbar fl-col-mixed">
+                <!-- Back button -->
+                <div class="fl-col-fixed fl-force-left">
+                    <a rsf:id="scr=null" class="flc-navigationBar-back fl-button fl-backButton" href="#">
+                        <img class="fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/back.png" alt="Go back"/>
+                    </a>
                 </div>
+                <!-- Home button -->
+                <div class="fl-col-fixed fl-force-left">
+                    <a rsf:id="scr=null" class="flc-navigationBar-home fl-button" href="#">
+                        <img class="fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/home.png" alt="Go home"/>
+                    </a>
+                </div>
+                <!-- Toggle button -->
+                <div class="fl-col-fixed fl-force-right">
+                    <a rsf:id="scr=null" class="flc-navigationBar-toggle fl-button" href="#">
+                        <img class="flc-navigationBar-toggle-grid fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/toggle-grid.png" alt="Switch to grid layout"/>
+                        <img class="flc-navigationBar-toggle-list fl-button-inner fl-button-icon" src="../../../../fluid-engage-core/shared/images/toggle-list.png" alt="Switch to list layout"/>
+                    </a>
+                </div>
+                <!-- Page header -->
+                <h1 class="flc-catalogue-title fl-navbar-title fl-col-flex">Catalogue for This Exhibition</h1>
             </div>
  
             <div class="fl-catalogue-linkToArtifactsHeader fl-list-menu">
Index: components/navigationBar/css/NavigationBar.css
===================================================================
--- components/navigationBar/css/NavigationBar.css	(revision 9317)
+++ components/navigationBar/css/NavigationBar.css	(working copy)
@@ -1,3 +1,23 @@
+.fl-navbar.fl-col-mixed {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-width: 0px;
+}
+
+.fl-navbar.fl-col-mixed .fl-col-fixed {
+    width:35px;
+    padding-left: 5px;
+    padding-right: 5px;
+}
+.fl-navbar.fl-col-mixed .fl-col-flex {
+    margin-left: 0px;
+}
+.fl-navbar .fl-navbar-title {
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    width: auto;
+}
 .fl-navbar .fl-button {
     margin-right: 5px;
 }
@@ -2,4 +22,10 @@
 
+.fl-navbar .fl-button.fl-backButton {
+    vertical-align: middle;
+    display: table-cell;
+    padding: 0;
+}
+
 .fl-navbar .fl-button-inner.fl-button-icon {
-    padding: 2px;
+    padding: 0;
 }