diff --git a/css/bootstrap/zerobin.css b/css/bootstrap/zerobin.css
index 114b1ad..8d3a916 100644
--- a/css/bootstrap/zerobin.css
+++ b/css/bootstrap/zerobin.css
@@ -2,7 +2,11 @@
 
 
 body {
-	padding: 70px 0 30px 0;
+	padding: 0 0 30px;
+}
+
+body.navbar-spacing {
+	padding-top: 70px;
 }
 
 .navbar-nav {
diff --git a/tpl/bootstrap-compact.html b/tpl/bootstrap-compact.html
index e049aaa..b8c82b5 100644
--- a/tpl/bootstrap-compact.html
+++ b/tpl/bootstrap-compact.html
@@ -24,7 +24,7 @@
 		<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
 		<![endif]-->
 	</head>
-	<body role="document">
+	<body role="document" class="navbar-spacing">
 		<nav class="navbar navbar-default navbar-fixed-top">
 			<div class="container">
 				<div class="navbar-header">
diff --git a/tpl/bootstrap.html b/tpl/bootstrap.html
index 974bb4f..1603e76 100644
--- a/tpl/bootstrap.html
+++ b/tpl/bootstrap.html
@@ -25,7 +25,7 @@
 		<![endif]-->
 	</head>
 	<body role="document">
-		<nav class="navbar navbar-default navbar-fixed-top">
+		<nav class="navbar navbar-default">
 			<div class="container">
 				<div class="navbar-header">
 					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -60,27 +60,22 @@
 								<li><a href="#" onclick="$('#pasteExpiration').val('{$key}');$('#pasteExpirationDisplay').text('{$value}');return false;">{$value}</a></li>{/loop}
 							</ul>
 						</li>
-						<li class="dropdown">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Options')"} <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li>
-									<div id="burnafterreadingoption" class="navbar-text checkbox hidden">
-										<label>
-											<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
-											{function="t('Burn after reading')"}
-										</label>
-									</div>
-								</li>{if="$DISCUSSION"}
-								<li>
-									<div id="opendisc" class="navbar-text checkbox hidden">
-										<label>
-											<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="$OPENDISCUSSION"} checked="checked"{/if} />
-											{function="t('Open discussion')"}
-										</label>
-									</div>
-								</li>{/if}
-							</ul>
-						</li>{if="$PASSWORD"}
+						<li>
+							<div id="burnafterreadingoption" class="navbar-text checkbox hidden">
+								<label>
+									<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
+									{function="t('Burn after reading')"}
+								</label>
+							</div>
+						</li>{if="$DISCUSSION"}
+						<li>
+							<div id="opendisc" class="navbar-text checkbox hidden">
+								<label>
+									<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="$OPENDISCUSSION"} checked="checked"{/if} />
+									{function="t('Open discussion')"}
+							 	</label>
+							</div>
+						</li>{/if}{if="$PASSWORD"}
 						<li>
 							<div id="password" class="navbar-form hidden">
 								<input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/>
