diff --git a/content/events/2016-amsterdam/location.md b/content/events/2016-amsterdam/location.md
index 7b65614b129..a881fa0f99e 100644
--- a/content/events/2016-amsterdam/location.md
+++ b/content/events/2016-amsterdam/location.md
@@ -6,18 +6,41 @@ title = "Event Location"
 type = "event"
 tags = ["amsterdam","amsterdam-2016"]
 +++
+
 ### Conference Location
-<b><a href="http://www.dezwijger.nl/" target="_blank">Pakhuis de Zwijger</a></b><br>
-Piet Heinkade 179<br>
-1019 HC Amsterdam<br>
-The Netherlands<br>
+
+The conference is located at [Pakhuis de Zwijger](http://www.dezwijger.nl/ "Website of Pakhuis de Zwijger")
+
+Piet Heinkade 179  
+1019 HC Amsterdam  
+The Netherlands
 
 <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1217.8299847897188!2d4.916584334295782!3d52.37658535918132!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47c609a80e2c8a2f%3A0x2d9e404fc8f71f8d!2sPakhuis+De+Zwijger!5e0!3m2!1sen!2snl!4v1454809743396" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
-<br>
-<br>
+<br />
+## Getting there and accommodation
+
+### Transportation
+
+Amsterdam has a fantastic public transportation system.  
+- Buses [48](http://maps.gvb.nl/en/lijnen/48), [246](http://maps.gvb.nl/en/lijnen/246) and [759](http://maps.gvb.nl/en/lijnen/759) stop right in front of the conference.  
+- Tram [26](http://maps.gvb.nl/en/lijnen/26), departing from Amsterdam Centraal Station (main train station in the city).
+
+More information can be obtained by using the [GVB](http://en.gvb.nl/) or [9292](http://9292.nl/en) websites. Both have excellent apps in the iOS ([GVB](https://itunes.apple.com/nl/app/gvb/id370393784) & [9292](https://itunes.apple.com/nl/app/9292/id556557690)) and Google Play ([GVB](https://play.google.com/store/apps/details?id=nl.moopmobility.gvb&hl=en)) & [9292](https://play.google.com/store/apps/details?id=nl.negentwee&hl=en)) store. Other apps (like Google Maps) have great integration as well.
+
+##### A note to out of towners in in regards to obtaining a reloadable card for public transportation.
+
+You can purchase an "OV chipkaart" at Amsterdam Centraal and most large metro stations (including Schiphol). Note that the unattended machines do not handle non-EU issued (e.g. Chip+Signature) cards well. Some U.S. Credit Unions now offer Chip+Pin technology on their *debit* card (note: not *credit* card). If your card doesn't work or want to use Euros (other than coins), there is a customer service center located on the "IJ side" of Amsterdam Centraal where you can purchase a chipkaart in person at the [Service Office](https://www.nsinternational.nl/en/tickets-services/opening-hours-ticket-and-service-shops "Link to NS International Service Office"). If you're arriving via Schiphol - a similar service is offered in the main train hall
+
+#### Alternative methods of transportation
+- [Uber](https://www.uber.com/)  
+- [Rent A Bike](http://www.iamsterdam.com/en/visiting/plan-your-trip/getting-around/rental/bike-hire)  
+- And if you want must -- [Taxis](http://www.iamsterdam.com/en/visiting/plan-your-trip/getting-around/taxis)
 
-<hr>
 
-### Getting there and accommodation
+### Accommodations
+Amsterdam has amazing hotels and incredible amount of Airbnbs spread out all over the city that allows you to experience life as an Amsterdammer (Beware of the dark red bike paths!). Besides Airbnbs, here is a list of hotels that are near to the [Pakhuis de Zwijger](http://www.dezwijger.nl/ "Website of Pakhuis de Zwijger").
 
-Pretty much any hotel or airbnb in Amsterdam will work. There is a great coverage of <a href="http://9292.nl/en">public transportation</a>, <a href="https://www.uber.com/">Uber</a>, <a href="http://www.iamsterdam.com/en/visiting/plan-your-trip/getting-around/taxis">taxis</a> or <a href="http://www.iamsterdam.com/en/visiting/plan-your-trip/getting-around/rental/bike-hire">bikes</a>!
+* [Mövenpick Hotel Amsterdam City Centre](http://www.movenpick.com/en/europe/netherlands/amsterdam/hotel-amsterdam/overview/)
+* [DoubleTree by Hilton Hotel Amsterdam Centraal Station](http://doubletree3.hilton.com/en/hotels/netherlands/doubletree-by-hilton-amsterdam-centraal-station-AMSCSDI/index.html)
+* [Hotel NH Barbizon Place](http://www.nh-hotels.nl/hotel/nh-collection-amsterdam-barbizon-palace)
+* [Inntel Hotels Amsterdam Centre](http://www.inntelhotelsamsterdamcentre.nl/)