diff --git a/2016/index.html b/2016/index.html
index 18d62f7..c4915fd 100644
--- a/2016/index.html
+++ b/2016/index.html
@@ -306,10 +306,7 @@ <h1>Get your ticket</h1>
 									</div>
 			</div>
 			<div class="row">
-				<div class="col-md-12">
-					<!--http://eventbrite.com/tickets-external?eid=19275761321&amp;ref=etckt-->
-					<iframe src="../hackhpi_assets/tickets-external" frameborder="0" height="540" width="100%" vspace="0" hspace="0" marginheight="5" marginwidth="5" scrolling="auto" allowtransparency="true" style="height: 540px!important; width:100%;"></iframe>
-				</div>
+				<p class="text-center">The ticket sale is closed now.</p>
 			</div>
 		</div>
 	</section><section class="container-fluid bg-grey" id="get-in-touch">
diff --git a/hackhpi_assets/style.css b/hackhpi_assets/style.css
index 16815e6..a14a323 100644
--- a/hackhpi_assets/style.css
+++ b/hackhpi_assets/style.css
@@ -316,6 +316,10 @@ section > .container {
 	position: relative;
 }
 
+section#location > .container {
+	display: table;
+}
+
 section h1 {
 	margin:0px 0px 30px;
 }
@@ -363,7 +367,6 @@ section table thead {
 	padding-top:40px;
 }
 
-
 section .row + .row,
 section .row > div > * + *,
 .location-card p + p {
diff --git a/index.html b/index.html
index 6971dad..571669d 100644
--- a/index.html
+++ b/index.html
@@ -59,8 +59,8 @@
 				<li><a class="scroll-link" data-target="schedule" href="#schedule">Schedule</a></li>
 				<li><a class="scroll-link" data-target="location" href="#location">Venue</a></li>
 				<li><a class="scroll-link" data-target="faq" href="#faq">FAQ</a></li>
-				<li><a class="scroll-link" data-target="team" href="#team">Team</a></li>
 				<li><a class="scroll-link" data-target="sponsors" href="#sponsors">Sponsors</a></li>
+				<li><a class="scroll-link" data-target="team" href="#team">Team</a></li>
 				<li><a class="scroll-link" data-target="ticket" href="#ticket">Tickets</a></li>
 				<li><a class="scroll-link" data-target="get-in-touch" href="#get-in-touch">Contact</a></li>
 				<!--<li><a class="live" href="https://live.hackhpi.org/">LIVE</a></li>-->
@@ -99,7 +99,8 @@ <h1>What to expect at HackHPI 2018</h1>
 				</div>
 			</div>
 		</div>
-	</section><section class="container-fluid triangle bg-grey" id="schedule">
+	</section>
+	<section class="container-fluid triangle bg-grey" id="schedule">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12">
@@ -123,7 +124,8 @@ <h2 class="text-colored">Sunday, x+1th of May|June|July</h2>
 					<p><em>Keep in mind that we may have to adjust some of the times.</em></p>				</div>
 			</div>
 		</div>
-	</section><section class="container-fluid bg-grey triangle" id="location">
+	</section>
+	<section class="container-fluid bg-grey triangle" id="location">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-4 col-sm-6">
@@ -148,7 +150,8 @@ <h5>Universität Potsdam</h5>
 			<div class="location-map-overlay"></div>
 			<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m12!1m3!1d2295.5016715991924!2d13.123950349236813!3d52.39199012039249!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sde!2sus!4v1460462088708" width="100%" height="100%" frameborder="0" style="border:0;height:100%;width:100%;" allowfullscreen=""></iframe>
 		</div>
-	</section><section class="container-fluid triangle" id="faq">
+	</section>
+	<section class="container-fluid triangle" id="faq">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12">
@@ -198,7 +201,8 @@ <h2 class="text-colored">Can I sponsor this hackathon?</h2>
 							</div>				 </div>
 			</div>
 		</div>
-	</section><section class="container-fluid bg-grey triangle" id="sponsors">
+	</section>
+	<section class="container-fluid bg-grey triangle" id="sponsors">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12 top50">
@@ -266,7 +270,8 @@ <h3 class="text-colored text-center">Supporter</h3>
 				</div>
 			</div>
 		</div>
-	</section><section class="container-fluid bg-grey triangle" id="team">
+	</section>
+	<section class="container-fluid bg-grey triangle" id="team">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12 top50">
@@ -295,7 +300,8 @@ <h3 class="text-colored text-center">Organizers</h3>
 			</div>
 
 		</div>
-	</section><section class="container-fluid triangle" id="ticket">
+	</section>
+	<section class="container-fluid triangle" id="ticket">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12">
@@ -315,7 +321,8 @@ <h3 class="text-colored">Apply for your ticket:</h3>				</div>
 
 			<script>(function(){var qs,js,q,s,d=document,gi=d.getElementById,ce=d.createElement,gt=d.getElementsByTagName,id='typef_orm',b='https://s3-eu-west-1.amazonaws.com/share.typeform.com/';if(!gi.call(d,id)){js=ce.call(d,'script');js.id=id;js.src=b+'widget.js';q=gt.call(d,'script')[0];q.parentNode.insertBefore(js,q)}})()</script>
 		</div>
-	</section><section class="container-fluid bg-grey" id="get-in-touch">
+	</section>
+	<section class="container-fluid bg-grey" id="get-in-touch">
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12">