diff --git a/website/index.css b/website/index.css
index c3a7697b..ffe1c9a3 100644
--- a/website/index.css
+++ b/website/index.css
@@ -94,16 +94,11 @@ code {
 }
 
 #downloadInfo {
-	display: block;
-	position: absolute;
-	left: 50%;
-	top: 35px;
 	font-size: 16px;
-	margin-left: -400px;
 }
 
 #downloadInfo p {
-	margin: 12px;
+	padding: 12px;
 }
 
 .downloadActions {
diff --git a/website/index.html b/website/index.html
index c4f85a39..ef6299b4 100644
--- a/website/index.html
+++ b/website/index.html
@@ -11,15 +11,15 @@
 	<!--[if lt IE 7]><script type="text/javascript" src="logi/iepngfix_tilebg.js"></script><![endif]--> 
 </head><body>
 	<a id="forkMe" href="http://github.com/rzwitserloot/lombok"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
-	<div id="downloadInfo" class="buttonBar" style="display: none;">
-		<span></span>
-		<div class="downloadActions">
-			<a class="backToBar" href="http://projectlombok.googlecode.com/files/lombok.jar">Okay, download <strong>lombok</strong></a>
-			<a href="#" class="backToBar">No, don't</a>
-		</div>
-	</div>
 	<div class="meat">
 		<h1>Project Lombok</h1>
+		<div id="downloadInfo" class="buttonBar" style="display: none;">
+			<span></span>
+			<div class="downloadActions">
+				<a class="backToBar" href="http://projectlombok.googlecode.com/files/lombok.jar">Okay, download <strong>lombok</strong></a>
+				<a href="#" class="backToBar">No, don't</a>
+			</div>
+		</div>
 		<div id="buttonBar" class="buttonBar">
 			<a class="button" href="http://wiki.github.com/rzwitserloot/lombok/features">
 				<img src="icon_overview.png" />
diff --git a/website/index.js b/website/index.js
index ee36dd3c..8bff4155 100644
--- a/website/index.js
+++ b/website/index.js
@@ -11,7 +11,7 @@ function fixDownloadLink() {
 	});
 	
 	$(".backToBar").click(function(event) {
-		$("#downloadInfo").hide();
+		toggleButtonBar(true);
 	});
 }
 
@@ -31,11 +31,21 @@ function showDownloadInfo() {
 				html = html.substring(0, pos);
 				var p = $("<p>").html(html).append($("#downloadInfo .downloadActions"));
 				$("#downloadInfo span:first-child").replaceWith(p);
-				$("#downloadInfo").show();
+				toggleButtonBar(false);
 			}
 		});
+	} else {
+		toggleButtonBar(false);
+	}
+}
+
+function toggleButtonBar(showOriginal) {
+	if ( showOriginal ) {
+		$("#downloadInfo").hide();
+		$("#buttonBar").show();
 	} else {
 		$("#downloadInfo").show();
+		$("#buttonBar").hide();
 	}
 }