diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index c3fb707..af19dcd 100644
--- a/paddling_amenities.yaml
+++ b/paddling_amenities.yaml
@@ -32,22 +32,27 @@ feature:
   body: |-
     {% if constIndex in ['canoe=put_in', 'leisure=slipway','canoe=portage'] %}
       <dl>
-        <dt>{{ keyTrans('Surface') }}</dt>
-        <dd>{{ tagTrans('surface', attribute(tags, 'surface')) }}</dd>
-        
         <dt>{{ keyTrans('Description') }}</dt>
         <dd>{{ localizedTag(tags, 'description') }}</dd>
 
+        <dt>{{ keyTrans('Surface') }}</dt>
+        <dd>{{ attribute(tags, 'surface') ? tagTrans('surface', attribute(tags, 'surface')) : '' }}</dd>
+        
         <dt>{{ keyTrans('Access') }}</dt>
-        <dd>{{ tagTrans('access', attribute(tags, 'access')) }}</dd>
+        <dd>{{ attribute(tags, 'access') ? tagTrans('access', attribute(tags, 'access')) : '' }}</dd>
 
         <dt>{{ keyTrans('Fee') }}</dt>
-        <dd>{{ tagTrans('fee', attribute(tags, 'fee')) }}</dd>
+        <dd>{{ attribute(tags, 'fee') ? tagTrans('fee', attribute(tags, 'fee')) : '' }}</dd>
+
+       <dt>{{ trans('Photos') }}</dt>
+       <dd>
+         {% if attribute(tags, 'mapillary') %}
+           <a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary</a>
+         {% endif %}
+        </dd>
 
       </dl>
-      {% if attribute(tags, 'mapillary') %}
-        <div><a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary Photo</a><div>
-      {% endif %}
+  
     {% endif %}
   markerSign: '{{ item[''sign''] }}'