diff --git a/app/hlds/parser.py b/app/hlds/parser.py
index 5bd8036..854e766 100644
--- a/app/hlds/parser.py
+++ b/app/hlds/parser.py
@@ -45,7 +45,7 @@ class HldsSemanticActions:
             ast["id"],
             name=ast["name"],
             description=ast["description"],
-            price=ast["price"],
+            price=ast["price"] if ast["price"] else 0,
             tags=ast["tags"] if ast["tags"] else [],
             choices=ast["choices"],
         )
@@ -70,7 +70,7 @@ class HldsSemanticActions:
             ast["id"],
             name=ast["name"],
             description=ast["description"],
-            price=ast["price"],
+            price=ast["price"] if ast["price"] else 0,
             tags=ast["tags"],
         )
 
diff --git a/app/templates/location.html b/app/templates/location.html
index 70e00e9..64b9020 100644
--- a/app/templates/location.html
+++ b/app/templates/location.html
@@ -7,9 +7,10 @@
 <div class="row location_data" xmlns="http://www.w3.org/1999/html">
     <div class="col-md-push-1 col-md-5 darker">
         <h3>{{ location.name }}</h3>
-        <span class="glyphicon glyphicon-home"></span> {{ location.address }} <br/>
-        <span class="glyphicon glyphicon-phone"></span> {{ location.telephone }} <br/>
-        <span class="glyphicon glyphicon-link"></span> <a href="{{ location.website}}">{{ location.website }}</a>
+        {% if location.address   %}<span class="glyphicon glyphicon-home"></span> {{ location.address   }}<br/>{% endif %}
+        {% if location.telephone %}<span class="glyphicon glyphicon-phone"></span>{{ location.telephone }}<br/>{% endif %}
+        {% if location.website   %}<span class="glyphicon glyphicon-link"></span> <a href="{{ location.website}}">{{ location.website }}</a> <br/>{% endif %}
+        {% if location.osm       %}<span class="glyphicon glyphicon-map-marker"></span> <a href="{{ location.osm}}">{{ location.osm }}</a> <br/>{% endif %}
         {% if not current_user.is_anonymous() %}
             <a href="{{ url_for("order_bp.orders", location_id=location.id) }}" class="btn btn-primary btn-sm">Create order</a>
         {% endif %}
@@ -28,10 +29,10 @@
                 <tr><th>Name</th><th>Price</th></tr>
             </thead>
             <tbody>
-            {% for prod in location.products -%}
+            {% for dish in location.dishes -%}
                 <tr>
-                    <td>{{ prod.name }}</td>
-                    <td>{{ prod.price|euro }}<td>
+                    <td>{{ dish.name }}{% if dish.description %} <span class="description">({{dish.description}})</span>{% endif %}</td>
+                    <td>{{ dish.price|euro }}<td>
                 </tr>
             {%- endfor %}
             </tbody>
diff --git a/app/templates/locations.html b/app/templates/locations.html
index 553442b..03d8c99 100644
--- a/app/templates/locations.html
+++ b/app/templates/locations.html
@@ -16,7 +16,7 @@
                 <tr>
                     <td><a href="{{ url_for('general_bp.location', location_id=loc.id) }}">{{ loc.name }}</a></td>
                     <td>{{ loc.address }}<td>
-                    <td><a href="{{ loc.website}}"><span class="glyphicon glyphicon-link"></span></a></td>
+                    <td><a href="{{ loc.website }}"><span class="glyphicon glyphicon-link"></span> {{ loc.website }}</a></td>
                     <td>
                         {% if not current_user.is_anonymous() %}
                             <a href="{{ url_for("order_bp.orders", location_id=loc.id) }}" class="btn btn-primary btn-xs">Create order</a>