Index: branches/LCSv1/views/layout.html
===================================================================
--- branches/LCSv1/views/layout.html	(revision 607)
+++ branches/LCSv1/views/layout.html	(revision 608)
@@ -14,5 +14,5 @@
           user-scalable = yes allows the user to zoom in -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{=response.title or request.application}}</title>
+    <title>{{=response.title or request.application}} {{=request.function}}</title>
     <!-- http://dev.w3.org/html5/markup/meta.name.html -->
     <meta name="application-name" content="{{=request.application}}">
@@ -36,7 +36,12 @@
   <body>
     <div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div>
+      
+      <!-- Don't show the banner and navbar on the login page -->
+     {{if (request.function != "index"):}}
+     <!-- LCS banner ===================================== -->
       <div class="container" id="banner">
           <div class = "toplinks" style = "float:right">
-<a href="help.html">Help</a>&nbsp;&nbsp;&nbsp;<a href="index.html">Logout</a>
+              <a href="help.html" style="text-decoration:underline">Help</a>&nbsp;&nbsp;&nbsp;
+              <a href="index.html" style="text-decoration:underline">Logout</a>
           </div>
           <div class="lcslogo">
@@ -46,19 +51,15 @@
           </div>
       </div>
-    </div>
-    <!-- Navbar ======================================= -->
-    <div role="navigation" class="navtabs" style="margin-top: 3%;">
-      <div class="tabrow">       
-          {{for _item in response.menu or []:}}
-          {{if len(_item)<4 or not _item[3]:}}
-            <a class="tabBtn" href="{{=_item[2]}}">{{=_item[0]}}</a>
-          {{else:}}
-            <a class="tabBtn" href="{{=_item[2]}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{=_item[0]}}</a>
-          {{pass}}
-          {{pass}}
+    <!-- LCS navbar ===================================== -->
+     <div role="navigation" class="navtabs">
+      <div class="tabrow">
+      <!-- Display the menu choices as tabs with the current page highlighted -->
+     {{for _item in response.menu or []:}}
+            <a class="tabBtn {{if _item[2].endswith(request.function):}}selectedTab{{pass}}" href="{{=_item[2]}}">{{=_item[0]}}</a>
+     {{pass}}
       </div>
       <hr class="tabBar">
     </div>
-
+    {{pass}}
     <!-- Masthead ===================================== -->
     {{block header}}
