--- a/src/pyams_gis/widget/templates/geopoint-input.pt	Fri Jan 26 15:59:57 2018 +0100
+++ b/src/pyams_gis/widget/templates/geopoint-input.pt	Fri Jan 26 16:06:19 2018 +0100
@@ -2,7 +2,8 @@
 	<fieldset
 		tal:define="name python:view.name.replace('.','_')"
 		data-ams-plugins="pyams_gis"
-		tal:attributes="data-ams-plugin-pyams_gis-src extension:resource_path('pyams_gis:pyams_gis')"
+		tal:attributes="class view/fieldset_class | default;
+						data-ams-plugin-pyams_gis-src extension:resource_path('pyams_gis:pyams_gis');"
 		data-ams-plugin-pyams_gis-async="false">
 		<button class="btn pull-right" tal:attributes="href string:#modal_dialog_${name}"
 			data-ams-click-handler="PyAMS_GIS.position.clear">
@@ -30,13 +31,19 @@
 					</div>
 					<div class="ams-form">
 						<div class="modal-body">
+							<div class="map-header"
+								 tal:define="header provider:pyams_gis.map.header"
+								 tal:condition="header"
+								 tal:content="structure header"></div>
 							<div class="map" id="map_location" style="width: 100%; height: 600px;"
 								 data-map-leaflet-fieldname="fieldname"
 								 tal:attributes="id string:map_location_${name};
 												 data-map-leaflet-fieldname view/name;"></div>
 						</div>
 						<footer>
-							<button type="button" class="btn btn-primary close-widget" data-dismiss="modal">OK</button>
+							<button type="button" class="btn btn-primary close-widget"
+									data-dismiss="modal" data-ams-click-event="marker.closed.position"
+									tal:attributes='data-ams-click-event-options string:{"fieldname": "${view/name}"}'>OK</button>
 						</footer>
 					</div>
 				</div>