azkaban-uncached

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index b257f98..9e09961 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -85,14 +85,19 @@
 						<li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
 						<li><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
 					</ol>
+				
+	## Tabs
+
+					<ul class="nav nav-tabs">
+						<li class="active"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job</a></li>
+						<li><a id="jobs-logs-btn" href="${context}/manager?project=${project.name}&job=$jobid&history">History</a></li>
+					</ul>
 
 	## Job details table
-	
 
 					<div class="panel panel-default">
 						<div class="panel-heading">
 							<div class="pull-right">
-								<a id="jobs-logs-btn" class="btn btn-xs btn-default" href="${context}/manager?project=${project.name}&job=$jobid&history">Job History</a>
 								<button id="edit-job-btn" class="btn btn-xs btn-primary" onclick='jobEditView.show("${project.name}", "${flowid}", "${jobid}")'>Job Edit</button>
 							</div>
 							Job Properties

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index ab892ff..9b9e747 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -56,7 +56,7 @@
 			<div class="alert alert-success">$success_message</div>
 	#end
 
-## Alert message
+	## Alert message
 
 			<div class="alert alert-dismissable alert-messaging" id="messaging">
 				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
@@ -70,6 +70,16 @@
 
 			<div class="row">
 				<div class="col-lg-8">
+	
+	## Breadcrumb
+
+					<ol class="breadcrumb">
+						<li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+					</ol>
+
+	#set ($project_page = "permissions")
+	#parse ("azkaban/webapp/servlet/velocity/projectnav.vm")
+
 					<div class="panel panel-default">
 						<div class="panel-heading">
 							Permissions
@@ -226,7 +236,6 @@
 					</div><!-- /panel -->
 				</div><!-- /col-lg-8 -->
 				<div class="col-lg-4">
-	#set ($project_page = "permissions")
 	#parse ("azkaban/webapp/servlet/velocity/projectsidebar.vm")
 				</div><!-- /col-lg-4 -->
 			</div><!-- /row -->

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index b27e695..1bf473a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -58,17 +58,27 @@
 			<div class="alert alert-success">$success_message</div>
 	#end
 
-## Page header.
+	## Page header.
 
 			<div class="page-header">
 				<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
 				<p>$project.description</p>
 			</div>
 
-## Page content.
+	## Page content.
 
 			<div class="row">
 				<div class="col-lg-8">
+	
+	## Breadcrumb
+
+					<ol class="breadcrumb">
+						<li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+					</ol>
+
+	#set ($project_page = "logs")
+	#parse ("azkaban/webapp/servlet/velocity/projectnav.vm")
+
 					<div class="panel panel-default" id="flow-tabs">
 						<div class="panel-heading">
 							<div class="pull-right" id="project-options">
@@ -81,7 +91,6 @@
 					</div>
 				</div>
 				<div class="col-lg-4">
-	#set ($project_page = "logs")
 	#parse ("azkaban/webapp/servlet/velocity/projectsidebar.vm")
 				</div>
 			</div>

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectnav.vm b/src/java/azkaban/webapp/servlet/velocity/projectnav.vm
new file mode 100644
index 0000000..c19a6ab
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/projectnav.vm
@@ -0,0 +1,23 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+*#
+
+					<ul class="nav nav-tabs">
+						<li#if($project_page == 'flows') class="active"#end><a href="${context}/manager?project=${project.name}">Flows</a></li>
+						<li#if($project_page == 'permissions') class="active"#end><a id="project-permission-btn" href="${context}/manager?project=${project.name}&permissions">Permissions</a></li>
+	#if ($admin)
+						<li#if($project_page == 'logs') class="active"#end><a id="project-logs-btn" href="${context}/manager?project=${project.name}&logs">Project Logs</a></li>
+	#end
+					</ul>

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 8f01d24..b8695fb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -80,6 +80,16 @@
 
 			<div class="row">
 				<div class="col-lg-8">
+					
+	## Breadcrumb
+
+					<ol class="breadcrumb">
+						<li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+					</ol>
+
+	#set ($project_page = "flows")
+	#parse ("azkaban/webapp/servlet/velocity/projectnav.vm")
+
 					<div class="panel panel-default" id="flow-tabs">
 						<div class="panel-heading">
 							<div class="pull-right" id="project-options">
@@ -119,7 +129,6 @@
 				</div><!-- /col-lg-8 -->
 
 				<div class="col-lg-4">
-	#set ($project_page = "flows")
 	#parse ("azkaban/webapp/servlet/velocity/projectsidebar.vm")
 				</div><!-- /col-lg-4 -->
 			</div><!-- /row -->

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectsidebar.vm b/src/java/azkaban/webapp/servlet/velocity/projectsidebar.vm
index 247c617..20bb3bf 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectsidebar.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectsidebar.vm
@@ -25,13 +25,3 @@
 						<p><strong>Project admins:</strong> $admins</p>
 						<p><strong>Your Permissions:</strong> $userpermission.toString()</p>
 					</div>
-
-					<div class="well well-sm">
-						<ul class="nav nav-pills nav-stacked">
-							<li#if($project_page == 'flows') class="active"#end><a href="${context}/manager?project=${project.name}">Flows</a></li>
-							<li#if($project_page == 'permissions') class="active"#end><a id="project-permission-btn" href="${context}/manager?project=${project.name}&permissions">Permissions</a></li>
-	#if ($admin)
-							<li#if($project_page == 'logs') class="active"#end><a id="project-logs-btn" href="${context}/manager?project=${project.name}&logs">Project Logs</a></li>
-	#end
-						</ul>
-					</div>

diff --git a/src/web/css/bootstrap-azkaban.css b/src/web/css/bootstrap-azkaban.css
index c1719fa..d5b974b 100644
--- a/src/web/css/bootstrap-azkaban.css
+++ b/src/web/css/bootstrap-azkaban.css
@@ -5,3 +5,7 @@
 .alert-messaging {
 	display: none;
 }
+
+.nav-tabs {
+	margin-bottom: 15px;
+}