diff --git a/app/database/add_oceans_garden.py b/app/database/add_oceans_garden.py
index fcc063f..0111ec3 100644
--- a/app/database/add_oceans_garden.py
+++ b/app/database/add_oceans_garden.py
@@ -18,7 +18,7 @@ specials = ["Nasi Kippenbolletjes Zoetzuur", "Bami Kippenbolletjes Zoetzuur",
 def add():
     chinees = Location()
     chinees.configure("Oceans's Garden",
-                      "Zwijnaardsesteenweg 399 9000 Gent, tel: 09/222.72.74",
+                      "Zwijnaardsesteenweg 399 9000 Gent", "tel: 09/222.72.74",
                       "http://oceangarden.byethost3.com/studentenmenus.html")
     db.session.add(chinees)
 
diff --git a/app/database/add_primadonna.py b/app/database/add_primadonna.py
index 6b79e11..687db8f 100644
--- a/app/database/add_primadonna.py
+++ b/app/database/add_primadonna.py
@@ -45,7 +45,7 @@ pizzasTA = {
 
 def addTA():
     primadonna_takeaway = Location()
-    primadonna_takeaway.configure("Primadonna (takeaway laten bezorgen)", "Overpoortstraat 46 9000 Gent, tel: 0475 40 13 00", "https://www.takeaway.com/be-en/prima-donna")
+    primadonna_takeaway.configure("Primadonna (takeaway laten bezorgen)", "Overpoortstraat 46 9000 Gent", "tel: 0475 40 13 00", "https://www.takeaway.com/be-en/prima-donna")
     db.session.add(primadonna_takeaway)
 
     for pizza, price in pizzasTA.items():
@@ -93,7 +93,7 @@ pizzasAfhalen = {
 
 def addAfhalen():
     primadonna_afhalen = Location()
-    primadonna_afhalen.configure("Primadonna (bellen en afhalen)", "Overpoortstraat 46 9000 Gent, tel: 0475 40 13 00", "http://primadonnagent.be/Menu.html")
+    primadonna_afhalen.configure("Primadonna (bellen en afhalen)", "Overpoortstraat 46 9000 Gent", "tel: 0475 40 13 00", "http://primadonnagent.be/Menu.html")
     db.session.add(primadonna_afhalen)
 
     for pizza, price in pizzasAfhalen.items():
diff --git a/app/database/add_simpizza.py b/app/database/add_simpizza.py
index 59bfb2e..e3fb7c8 100644
--- a/app/database/add_simpizza.py
+++ b/app/database/add_simpizza.py
@@ -11,7 +11,7 @@ pizzas = ['Bolognese de luxe', 'Hawaï', 'Popeye', 'Pepperoni', 'Seafood', 'Hot
 
 def add():
     simpizza = Location()
-    simpizza.configure("Sim-pizza", "De Pintelaan 252 9000 Gent, tel: 09/321.02.00", "http://simpizza.be")
+    simpizza.configure("Sim-pizza", "De Pintelaan 252 9000 Gent", "tel: 09/321.02.00", "http://simpizza.be")
     db.session.add(simpizza)
 
     for pizza in pizzas:
diff --git a/app/models.py b/app/models.py
index 2507e82..9e67f1d 100644
--- a/app/models.py
+++ b/app/models.py
@@ -50,10 +50,11 @@ class Location(db.Model):
     products = db.relationship('Product', backref='location', lazy='dynamic')
     orders = db.relationship('Order', backref='location', lazy='dynamic')
 
-    def configure(self, name, address, website):
+    def configure(self, name, address, telephone, website):
         self.name = name
         self.address = address
         self.website = website
+        self.telephone = telephone
 
     def __repr__(self):
         return '%s' % (self.name)
diff --git a/app/static/css/map.css b/app/static/css/map.css
new file mode 100644
index 0000000..eb42ff5
--- /dev/null
+++ b/app/static/css/map.css
@@ -0,0 +1,4 @@
+#mapid {
+    min-height: 400px;
+    height: 600px;
+}
\ No newline at end of file
diff --git a/app/templates/layout.html b/app/templates/layout.html
index 58862c7..56ca967 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -6,6 +6,7 @@
     ('home', 'Home'),
     ('order_bp.orders', 'Orders'),
     ('locations', 'Locations'),
+    ('map', 'Map'), 
     ('about', 'About'),
     ('stats', 'Stats'),
 ] -%}
diff --git a/app/templates/locations.html b/app/templates/locations.html
index 874cf36..3e78b30 100644
--- a/app/templates/locations.html
+++ b/app/templates/locations.html
@@ -15,7 +15,7 @@
             {% for loc in locations -%}
                 <tr>
                     <td><a href="{{ url_for('location', id=loc.id) }}">{{ loc.name }}</a></td>
-                    <td>{{ loc.address }}<td>
+                    <td>{{ loc.address }}  {{ loc.telephone }}<td>
                     <td><a href="{{ loc.website}}"><span class="glyphicon glyphicon-link"></span></a></td>
                 </tr>
             {%- endfor %}
diff --git a/app/templates/maps.html b/app/templates/maps.html
index 770d43f..d5fd4b4 100644
--- a/app/templates/maps.html
+++ b/app/templates/maps.html
@@ -1,18 +1,85 @@
 {% extends "layout.html" %}
-{% set active_page = "locations" -%}
+{% set active_page = "map" -%}
 
 {% import "utils.html" as util %}
+
+{% block container %}
+<div id="mapid"></div>
+{% endblock %}
+
 {% block styles %}
 {{ super() }}
 
 <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.css') }}">
+<link rel="stylesheet" href="{{url_for('static', filename='css/map.css')}}">
+
 {% endblock %}
 
 {% block scripts %}
 {{super()}}
-<script src="{{ url_for('static', filename='js/leaflet.js')}}" ></script>
-{% endblock %}
+<script src="{{ url_for('static', filename='js/leaflet.js')}}"></script>
 
-{% block container %}
- 
+<script>
+    var map = L.map('mapid').setView([51.0231183, 3.708106], 13);
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    }).addTo(map);
+
+
+    function performRequest(url, success_callback) {
+        var request = new XMLHttpRequest();
+        request.open('GET', url, true);
+        request.onload = function () {
+            if (this.status >= 200 && this.status < 400) {
+                // Success!
+                var data = JSON.parse(this.response);
+                success_callback(data);
+            } else {
+                // We reached our target server, but it returned an error
+            }
+        };
+        request.onerror = function () {
+            // There was a connection error of some sort
+        };
+        request.send();
+    }
+
+    let callback = function OSMCallBack(data){
+            var lat, lon;
+            if (data.features.length < 1) {
+                lat = 51.0538286;
+                lon = 3.7250121;
+                var className = 'is-invisible';
+                var el = document.getElementById('map-error');
+                if (el.classList)
+                    el.classList.remove(className);
+                else
+                    el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
+            } else {
+                var place = data.features[0].properties;
+                lat = data.features[0].geometry.coordinates[1];
+                lon = data.features[0].geometry.coordinates[0];
+                L.marker([lat, lon]).addTo(map)
+                    .bindPopup(place.name + ', ' + place.street + ' ' + place.housenumber)
+                    .openPopup();
+            }
+    };
+
+
+    let locations = [];
+    let loc = {};
+    {% for loc in locations -%}
+
+        loc =  { "address" : "{{loc.address}}",
+                     "name" : "{{loc.name}}"
+        }; 
+
+        locations.push(loc); 
+
+    {%- endfor %}
+
+    for (let loc of locations) {
+        performRequest("https://photon.komoot.de/api/?limit=1&q=" + loc.address, callback)
+    };
+</script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/__init__.py b/app/views/__init__.py
index aaf536b..d9ab307 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -19,9 +19,14 @@ def home():
     return render_template('home.html', orders=get_orders(),
                            recently_closed=recently_closed)
 
+
+@app.route('/map', defaults= {'id': None})
 @app.route('/map/<int:id>')
 def map(id):
-    return render_template('maps.html') 
+    locs = Location.query.order_by('name') 
+    return render_template('maps.html', locations= locs)  
+
+
 @app.route('/location')
 def locations():
     locs = Location.query.order_by('name')