azkaban-uncached

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 891f19c..ee4bea2 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -113,25 +113,16 @@
 
 	## Tabs and buttons.
 
-			<div class="row" id="headertabs">
-				<div class="col-lg-8">
-					<ul class="nav nav-pills">
+					<ul class="nav nav-tabs" id="headertabs">
 						<li id="graphViewLink"><a href="#graph">Graph</a></li>
 						<li id="jobslistViewLink"><a href="#jobslist">Job List</a></li>
 						<li id="flowLogViewLink"><a href="#log">Flow Log</a></li>
+						<li class="nav-button pull-right"><button type="button" id="pausebtn" class="btn btn-primary">Pause</button></li>
+						<li class="nav-button pull-right"><button type="button" id="resumebtn" class="btn btn-primary">Resume</button></li>
+						<li class="nav-button pull-right"><button type="button" id="cancelbtn" class="btn btn-danger">Cancel</button></li>
+						<li class="nav-button pull-right"><button type="button" id="retrybtn" class="btn btn-success">Retry Failed</button></li>
+						<li class="nav-button pull-right"><button type="button" id="executebtn" class="btn btn-success">Prepare Execution</button></li>
 					</ul>
-				</div>
-				<div class="col-lg-4">
-					<div class="pull-right">
-						<button type="button" id="pausebtn" class="btn btn-primary">Pause</button>
-						<button type="button" id="resumebtn" class="btn btn-primary">Resume</button>
-						<button type="button" id="cancelbtn" class="btn btn-danger">Cancel</button>
-						<button type="button" id="retrybtn" class="btn btn-success">Retry Failed</button>
-						<button type="button" id="executebtn" class="btn btn-success">Prepare Execution</button>
-					</div>
-					<div class="clearfix"></div>
-				</div>
-			</div>
 
 	## Graph View
 

diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 8755b86..2d86c5a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -56,7 +56,7 @@
 ## Page Content
 
 		<div class="container">
-      <ul class="nav nav-pills" id="header-tabs">
+      <ul class="nav nav-tabs" id="header-tabs">
         <li id="currently-running-view-link"><a href="#currently-running">Currently Running</a></li>
         <li id="recently-finished-view-link"><a href="#recently-finished">Recently Finished</a></li>
       </ul>

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 3e54270..a24f4dd 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -105,7 +105,7 @@
         <li class="active"><strong>Flow</strong> $flowid</li>
       </ol>
 
-			<ul class="nav nav-pills" id="headertabs">
+			<ul class="nav nav-tabs" id="headertabs">
 				<li id="graphViewLink"><a href="#graph">Graph</a></li>
 				<li id="executionsViewLink"><a href="#executions">Executions</a></li>
 				<li id="summaryViewLink"><a href="#summary">Summary</a></li>

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index c6399f4..8977276 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -66,7 +66,16 @@
 
 		<div class="az-page-header">
 			<div class="container">
-				<h1><a href="${context}/executor?execid=${execid}&job=${jobid}">Job Execution <small>$jobid</small></a></h1>
+				<div class="row">
+					<div class="col-lg-6">
+						<h1><a href="${context}/executor?execid=${execid}&job=${jobid}">Job Execution <small>$jobid</small></a></h1>
+					</div>
+					<div class="col-lg-6">
+						<div class="pull-right az-page-header-form">
+							<a href="${context}/manager?project=${projectName}&flow=${flowid}&job=$jobid" class="btn btn-default">Job Properties</a>
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
 	
@@ -80,21 +89,11 @@
         <li class="active"><strong>Job</strong> $jobid</li>
 			</ol>
 			
-      <div class="row">
-				<div class="col-lg-8">
-					<ul class="nav nav-pills" id="headertabs">
-            <li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
-            <li id="jobLogViewLink"><a href="#joblog">Log</a></li>
-            <li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
-					</ul>
-				</div>
-				<div class="col-lg-4">
-					<div class="pull-right">
-            <a href="${context}/manager?project=${projectName}&flow=${flowid}&job=$jobid" class="btn btn-default">Job Properties</a>
-					</div>
-					<div class="clearfix"></div>
-				</div>
-			</div>
+			<ul class="nav nav-tabs" id="headertabs">
+				<li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
+				<li id="jobLogViewLink"><a href="#joblog">Log</a></li>
+				<li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
+			</ul>
 
 	## Log content.
 

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobnav.vm b/src/java/azkaban/webapp/servlet/velocity/jobnav.vm
index bb27f16..70f974e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobnav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobnav.vm
@@ -14,7 +14,7 @@
  * the License.
 *#
 	
-					<ul class="nav nav-pills">
+					<ul class="nav nav-tabs">
 						<li#if($job_page == 'properties') class="active"#end><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job</a></li>
 						<li#if($job_page == 'history') class="active"#end><a id="jobs-logs-btn" href="${context}/manager?project=${project.name}&job=$jobid&history">History</a></li>
 					</ul>

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectnav.vm b/src/java/azkaban/webapp/servlet/velocity/projectnav.vm
index 01952bf..c19a6ab 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectnav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectnav.vm
@@ -14,7 +14,7 @@
  * the License.
 *#
 
-					<ul class="nav nav-pills">
+					<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)

diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index cd5ca51..f1afe32 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -428,3 +428,9 @@ td {
     }
   }
 }
+
+.nav {
+	.nav-button {
+		margin-left: 5px;
+	}
+}