4 files changed, 34 insertions, 9 deletions
diff --git a/application/views/file/nav_history.php b/application/views/file/nav_history.php
index bbb695fd6..1a3e55c0b 100644
--- a/application/views/file/nav_history.php
+++ b/application/views/file/nav_history.php
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs nav-history">
+<ul class="nav nav-tabs">
 <?php
 $nav = array(
 	"List" => "file/upload_history",
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 060cd25c3..253c0aa9e 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,5 +1,10 @@
-<?php include 'nav_history.php'; ?>
 <?php echo form_open("file/do_delete") ?>
+	<div class="nav-history">
+		<div class="container">
+			<input class="btn btn-danger pull-right" type="submit" value="Delete checked" name="process">
+		<?php include 'nav_history.php'; ?>
+		</div>
+	</div>
     <div class="table-responsive">
         <table id="upload_history" class="table table-striped tablesorter {sortlist: [[4,1]]}">
             <thead>
diff --git a/application/views/file/upload_history_thumbnails.php b/application/views/file/upload_history_thumbnails.php
index 04846e944..9fb9c5450 100644
--- a/application/views/file/upload_history_thumbnails.php
+++ b/application/views/file/upload_history_thumbnails.php
@@ -1,11 +1,15 @@
-<div class="pull-right">
-	<?php echo form_open("file/do_delete/", array("id" => "delete_form", "style" => "display: inline")); ?>
-		<button type="submit" class="btn btn-danger" id="delete_button" style="display: none">Delete selected</button>
-	</form>
-	<button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
-</div>
+<div class="nav-history">
+	<div class="container">
+		<div class="pull-right">
+			<?php echo form_open("file/do_delete/", array("id" => "delete_form", "style" => "display: inline")); ?>
+				<button type="submit" class="btn btn-danger" id="delete_button" style="display: none">Delete selected</button>
+			</form>
+			<button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
+		</div>
 
-<?php include 'nav_history.php'; ?>
+	<?php include 'nav_history.php'; ?>
+	</div>
+</div>
 <?php include 'fragments/thumbnail.php'; ?>
 
 <div class="row-fluid">
diff --git a/public_html/data/css/style.css b/public_html/data/css/style.css
index 2996ff3d5..48bebdb12 100644
--- a/public_html/data/css/style.css
+++ b/public_html/data/css/style.css
@@ -59,7 +59,17 @@
 }
 
 .nav-history {
+	height: 63px;
+}
+
+.nav-history .container {
+	padding-top: 20px;
 	margin-bottom: 1em;
+	position: fixed;
+	background: #fff;
+	left: 0;
+	right: 0;
+	margin-top: -19px;
 }
 
 .navbar-paste {
@@ -88,6 +98,12 @@
 	.navbar-fixed-top {
 		position: relative;
 	}
+	.nav-history .container {
+		position: relative;
+	}
+	.nav-history {
+		height: auto;
+	}
 }
 
 @media (min-width: 768px) {