azkaban-uncached

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index ad550a7..b1b93dc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -75,8 +75,7 @@
 			<div class="row">
 				<div class="col-lg-12">
 					<div class="panel panel-default">
-						<div class="panel-heading">History</div>
-						<div class="panel-body">
+						<div class="panel-heading">
 							<form id="search-form" method="get" class="form-inline" role="form">
 								<input type="hidden" name="search" value="true">
 								<div class="form-group">

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index bc15e11..690ca18 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -57,82 +57,85 @@
 
 ## Page Header and project search form.
 
-			<div class="row">
-				<div class="col-lg-6">
+			<div class="page-header">
 #if ($allProjects)
-					<h1>All Projects</h1>
-					<p>My Projects</p>
+				<h1>All Projects</h1>
+				<p>My Projects</p>
 #else
-					<h1>My Projects</h1>
-					<p>All Projects</p>
+				<h1>My Projects</h1>
+				<p>All Projects</p>
 #end
-				</div>
-				<div class="col-lg-4">	
-					<form id="search-form" method="get" class="form-inline" role="form">
-						<input type="hidden" value="doaction" value="search">
-#if ($allProjects)
-						<input type="hidden" name="all" value="true">				
-#end
-						<div class="input-group">
-							<input id="search-textbox" type="text" placeholder="Project name containing..." value=#if($search_term) ${search_term} #else "" #end class="form-control" name="searchterm">
-							<span class="input-group-btn">
-								<button class="btn btn-primary">Quick Search</button>
-							</span>
-						</div>
-					</form>
-				</div>
-				<div class="col-lg-2" id="create-project">
-#if (!$hideCreateProject)
-					<button type="button" id="create-project-btn" class="btn btn-success">Create Project</button>
-#end
-				</div>
 			</div>
-			<hr>
 
 ## Table of projects.
 
 			<div class="row">
 				<div class="col-lg-12">
-					<table class="table table-striped table-bordered" id="all-jobs">
-						<thead>
-							<tr>
-								<th class="tb-name">Name</th>
-								<th class="tb-up-date">Modified Date</th>
-								<th class="tb-owner">Modified By</th>
-							</tr>
-						</thead>
-						<tbody>
+					<div class="panel panel-default">
+						<div class="panel-heading">
+							<form id="search-form" method="get" class="form-inline" role="form">
+								<fieldset>
+									<input type="hidden" name="doaction" value="search">
+#if ($allProjects)
+									<input type="hidden" name="all" value="true">				
+#end
+									<div class="form-group col-md-10">
+										<div class="input-group">
+											<input id="search-textbox" type="text" placeholder="Project name containing..." value=#if($search_term) ${search_term} #else "" #end class="form-control" name="searchterm">
+											<span class="input-group-btn">
+												<button class="btn btn-primary">Quick Search</button>
+											</span>
+										</div>
+									</div>
+#if (!$hideCreateProject)
+									<div class="form-group col-md-2" id="create-project">
+										<button type="button" id="create-project-btn" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> Create Project</button>
+									</div>
+#end
+								</fieldset>
+							</form>
+						</div>
+						<table class="table table-striped table-bordered" id="all-jobs">
+							<thead>
+								<tr>
+									<th class="tb-name">Name</th>
+									<th class="tb-up-date">Modified Date</th>
+									<th class="tb-owner">Modified By</th>
+								</tr>
+							</thead>
+							<tbody>
 #if(!$projects.isEmpty())
 	#foreach($project in $projects)
-							<tr>
-								<td id="${project.name}" class="tb-name project-expand expanded">
-									<span class="glyphicon glyphicon-plus"></span>
-									<a href="${context}/manager?project=${project.name}">$project.name</a>
-								</td>
-								<td class="tb-up-date">$utils.formatDate($project.lastModifiedTimestamp)</td>
-								<td class="tb-owner">$project.lastModifiedUser</td>
-							</tr>
-							<tr class="childrow collapse" id="${project.name}-child">
-								<td colspan="3">
-									<table class="table table-bordered">
-										<thead>
-											<tr>
-												<th class="tb-name">Flows</th>
-											</tr>
-										</thead>
-										<tbody id="${project.name}-tbody">
-										</tbody>
-									</table>
-								</td>
-							</tr>
+								<tr>
+									<td id="${project.name}" class="tb-name project-expand expanded">
+										<span class="glyphicon glyphicon-plus"></span>
+										<a href="${context}/manager?project=${project.name}">$project.name</a>
+									</td>
+									<td class="tb-up-date">$utils.formatDate($project.lastModifiedTimestamp)</td>
+									<td class="tb-owner">$project.lastModifiedUser</td>
+								</tr>
+								<tr class="childrow collapse" id="${project.name}-child">
+									<td colspan="3">
+										<table class="table table-bordered">
+											<thead>
+												<tr>
+													<th class="tb-name">Flows</th>
+												</tr>
+											</thead>
+											<tbody id="${project.name}-tbody">
+											</tbody>
+										</table>
+									</td>
+								</tr>
 	#end
 #else
-							<tr>
-								<td colspan="3">No viewable projects found.</td>
-							</tr>
+								<tr>
+									<td colspan="3">No viewable projects found.</td>
+								</tr>
 #end
-						</tbody>
-					</table>
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>