diff --git a/Yavsc/Views/Command/Create.cshtml b/Yavsc/Views/Command/Create.cshtml
index ab6b8392..11f23fb3 100644
--- a/Yavsc/Views/Command/Create.cshtml
+++ b/Yavsc/Views/Command/Create.cshtml
@@ -27,24 +27,34 @@
 <script>
 $(document).ready(function(){
     
+    var config = {
+        mapId: 'map',
+        addrId: 'Location_Address',
+        longId: 'Location_Longitude',
+        latId: 'Location_Latitude',
+        addrValidationId: 'valloc',
+        formValidId: 'valsum',
+        locComboId: 'loccomb'
+    };
+
      $.validator.setDefaults({
        messages: {
         remote:  "Ce lieu n'est pas identifié par les services de géo-localisation Google",
         required: "Veuillez renseigner ce champ"
        }
    });
-    var gmap = new google.maps.Map(document.getElementById('map'), {
+    var gmap = new google.maps.Map(document.getElementById(config.mapId), {
 	    zoom: 16,
 	    center: { lat: 48.862854, lng: 2.2056466 }
 	  });
     var marker;
-    function chooseLoc(loc) {
-        $('#Location_Address').val(loc.formatted_address);
+    function chooseLoc(sender,loc) {
+        if (sender === 'user') $('#'+config.addrId).val(loc.formatted_address);
         var pos = loc.geometry.location;
         var lat = new Number(pos.lat);
         var lng = new Number(pos.lng);
-        $('#Location_Latitude').val(lat.toLocaleString('en'));
-        $('#Location_Longitude').val(lng.toLocaleString('en'));
+        $('#'+config.latId).val(lat.toLocaleString('en'));
+        $('#'+config.longId).val(lng.toLocaleString('en'));
         gmap.setCenter(pos);
         if (marker) { 
             marker.setMap(null);
@@ -58,41 +68,43 @@ $(document).ready(function(){
         google.maps.event.addListener(marker, 'dragend', function() {
             // TODO reverse geo code
             var pos = marker.getPosition();
-                $('#Location_Latitude').val(pos.lat);
-                $('#Location_Longitude').val(pos.lng);
+                $('#'+config.latId).val(pos.lat);
+                $('#'+config.longId).val(pos.lng);
         });
-        $('#Location_Address').valid();
+        $('#'+config.addrId).valid();
+        $('#'+config.addrValidationId).empty();
+        $('#'+config.formValidId).empty();
         return true;
     }
-                
+    
     $('#EventDate').datepicker({language:'fr'});
 
-    $('#Location_Address').rules("add",
+    $('#'+config.addrId).rules("add",
     {
         remote: {
-            url: 'http://maps.googleapis.com/maps/api/geocode/json',
+            url: 'https://maps.googleapis.com/maps/api/geocode/json',
             type: 'get',
             data: {
                 sensor: false,
-                address: function () { return $('#Location_Address').val() }
+                address: function () { return $('#'+config.addrId).val() }
                 },
             dataType: 'json',
             dataFilter: function(datastr,type) {
-                $('#Location_combo').html("");
+                $('#'+config.locComboId).html("");
                 var data = JSON.parse(datastr);
                 data.results.forEach(function(element) {
-                    if (element.formatted_address !== $('#Location_Address').val()) {
+                    if (element.formatted_address !== $('#'+config.addrId).val()) {
                         $('<li>'+element.formatted_address+'</li>')
                         .data("geoloc",element)
-                        .click(function() { chooseLoc($(this).data("geoloc")) })
-                        .appendTo($('#Location_combo'));}
+                        .click(function() { chooseLoc('user',$(this).data("geoloc")) })
+                        .appendTo($('#'+config.locComboId));}
                     else {  }
                 });
-                if  ((data.status === 'OK') && (data.results.length == 1))
+               if  ((data.status === 'OK') && (data.results.length == 1))
                 { 
-                    chooseLoc(data.results[0]);
+                    chooseLoc('google',data.results[0]);
                     return true;
-                }
+                } 
                 return false;
                 },
             error: function(xhr, textStatus, errorThrown)
@@ -110,9 +122,8 @@ $(document).ready(function(){
     <div class="form-horizontal">
         <h4>@SR["Fill in your book query"]</h4>
         <hr />
-<div asp-validation-summary="ValidationSummary.All" class="text-danger"></div>
+<div asp-validation-summary="ValidationSummary.All" class="text-danger" id="valsum"></div>
         <div class="form-group" has-feedback>
-        @Html.ValidationSummary()
              <fieldset>
 <legend><label for="EventDate" class="col-md-2 control-label" >
     @SR["Event date"]
@@ -154,8 +165,8 @@ $(document).ready(function(){
             <input asp-for="Location.Address" type="text" name="Location.Address" id="Location_Address"
              class="form-control" data-val-required=@SR["SpecifyPlace"] 
              data-val-remote=@SR["GoogleDidntGeoLocalized"]>
-            <span asp-validation-for="Location.Address" class="text-danger" ></span>
-            <ul id="Location_combo" >
+            <span asp-validation-for="Location.Address" class="text-danger" id="valloc" ></span>
+            <ul id="loccomb" >
             </ul>
             <div id="map"></div>
             </div>
diff --git a/Yavsc/Views/Manage/SetActivity.cshtml b/Yavsc/Views/Manage/SetActivity.cshtml
index 5eaf299c..0dd745c0 100644
--- a/Yavsc/Views/Manage/SetActivity.cshtml
+++ b/Yavsc/Views/Manage/SetActivity.cshtml
@@ -1,42 +1,50 @@
-@model PerformerProfile
-@{
-    ViewData["Title"] = "Setup your performer profile";
-}
-
-@section header{
-    <script src="~/js/jquery-ui.js"></script>
-    <script src="~/lib/jquery-validation/jquery.validate.js"></script>
-    <script src="~/lib/jquery-validation/additional-methods.js"></script>
-    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
-    <script src="~/js/validator.js"></script>
+@model PerformerProfile 
+@{ ViewData["Title"] = "Setup your performer profile"; } 
+@section header{ 
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
     <script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
-    <script src="~/js/google.geocode.js"></script>
-    <style>
-      #map {
+}
+<style>
+    #map {
         width: 100%;
         height: 250px;
-      }
-    </style>
-}
-
+    }
+</style>
+} 
 @section scripts{
-    <script>
-
+<script>
      $(document).ready(function(){
-var gmap = new google.maps.Map(document.getElementById('map'), {
+         var config = {
+        mapId: 'map',
+        addrId: 'OrganizationAddress_Address',
+        longId: 'OrganizationAddress_Longitude',
+        latId: 'OrganizationAddress_Latitude',
+        addrValidationId: 'AddressError',
+        formValidId: 'valsum',
+        locComboId: 'loccomb'
+    };
+     $.validator.setDefaults({
+       messages: {
+        remote:  "Ce lieu n'est pas identifié par les services de géo-localisation Google",
+        required: "Veuillez renseigner ce champ"
+       }
+   });
+
+    var gmap = new google.maps.Map(document.getElementById('map'), {
 	    zoom: 16,
 	    center: { lat: 48.862854, lng: 2.2056466 }
 	  });
     var marker;
-    function chooseLoc(loc) {
-        $('#Location_Address').val(loc.formatted_address);
+
+   function chooseLoc(sender,loc) {
+        if (sender === 'user') $('#'+config.addrId).val(loc.formatted_address);
         var pos = loc.geometry.location;
         var lat = new Number(pos.lat);
         var lng = new Number(pos.lng);
-        $('#OrganizationAddress_Latitude').val(lat.toLocaleString());
-        $('#OrganizationAddress_Longitude').val(lng.toLocaleString());
+        $('#'+config.latId).val(lat.toLocaleString('en'));
+        $('#'+config.longId).val(lng.toLocaleString('en'));
         gmap.setCenter(pos);
-        if (marker) { 
+        if (marker) { 
             marker.setMap(null);
         }
         marker = new google.maps.Marker({
@@ -48,53 +56,42 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
         google.maps.event.addListener(marker, 'dragend', function() {
             // TODO reverse geo code
             var pos = marker.getPosition();
-                $('#OrganizationAddress_Latitude').val(pos.lat);
-                $('#OrganizationAddress_Longitude').val(pos.lng);
+                $('#'+config.latId).val(pos.lat);
+                $('#'+config.longId).val(pos.lng);
         });
-        $('#Location_Address').valid();
+        $('#'+config.addrId).valid();
+        $('#'+config.addrValidationId).empty();
+        $('#'+config.formValidId).empty();
         return true;
-    };
+    }
 
-          $('#Location_Address').geocode( { submit: 'btngeocode' ,
-          inputLatitude: 'OrganizationAddress_Longitude',
-          inputLongitude: 'OrganizationAddress_Latitude',
-          combo: 'dropdownItems1',
-          onValidated: function (e) {
-              if (e.success) {
-                  var firstres = e.results[0];
-                  console.log(firstres);
-                  console.log(firstres.geometry);
-                $('#AddressError').html("");
-              }
-              else {
-                 if (e.status=="ZERO_RESULTS") {
-                    $('#AddressError').html("aucun résultat");
-                  }
-                  else  $('#AddressError').html(e.status);
-              }
-   } } );
-
-
-          $('#OrganizationAddress').rules("add",
+    $('#'+config.addrId).rules("add",
     {
         remote: {
-            url: 'http://maps.googleapis.com/maps/api/geocode/json',
+            url: 'https://maps.googleapis.com/maps/api/geocode/json',
             type: 'get',
             data: {
                 sensor: false,
-                address: function () { return $('#Location_Address').val() }
+                address: function () { return $('#'+config.addrId).val() }
                 },
             dataType: 'json',
             dataFilter: function(datastr,type) {
-                $('#Location_combo').html("");
+                $('#'+config.locComboId).html("");
                 var data = JSON.parse(datastr);
                 data.results.forEach(function(element) {
-                    if (element.formatted_address !== $('#Location_Address').val()) {
+                    if (element.formatted_address !== $('#'+config.addrId).val()) {
                         $('<li>'+element.formatted_address+'</li>')
                         .data("geoloc",element)
-                        .click(function() { chooseLoc($(this).data("geoloc")) })
-                        .appendTo($('#Location_combo'));}});
-                return (data.status === 'OK') && (data.results.length == 1);
+                        .click(function() { chooseLoc('user',$(this).data("geoloc")) })
+                        .appendTo($('#'+config.locComboId));}
+                    else {  }
+                });
+               if  ((data.status === 'OK') && (data.results.length == 1))
+                { 
+                    chooseLoc('google',data.results[0]);
+                    return true;
+                } 
+                return false;
                 },
             error: function(xhr, textStatus, errorThrown)
                 {
@@ -102,12 +99,9 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
                 return false;
                 }
          }
+        });
     });
-
-    });
-    </script>
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
- }
+    </script> @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } }
 
 <h2>@ViewData["Title"].</h2>
 
@@ -116,23 +110,23 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 <form id="FrmSetAct" asp-controller="Manage" asp-action="SetActivity" method="post" class="form-horizontal" role="form">
     <h4>@SR["Choose below your main activity"]:</h4>
     <hr />
-    <div asp-validation-summary="ValidationSummary.All" class="text-danger"></div>
+    <div asp-validation-summary="ValidationSummary.All" class="text-danger" id="valsum"></div>
     <div class="form-group">
         <label asp-for="ActivityCode" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <select asp-for="ActivityCode" asp-items=@ViewBag.Activities class="form-control" >
+            <select asp-for="ActivityCode" asp-items=@ViewBag.Activities class="form-control">
             </select>
             <span asp-validation-for="ActivityCode" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
         <label asp-for="AcceptNotifications" class="col-md-2 control-label"></label>
         <div class="col-md-10">
             <input asp-for="AcceptNotifications" class="form-control" />
             <span asp-validation-for="AcceptNotifications" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="AcceptPublicContact" class="col-md-2 control-label"></label>
         <div class="col-md-10">
@@ -140,8 +134,8 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 
             <span asp-validation-for="AcceptPublicContact" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="AcceptGeoLocalization" class="col-md-2 control-label"></label>
         <div class="col-md-10">
@@ -149,8 +143,8 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 
             <span asp-validation-for="AcceptGeoLocalization" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="WebSite" class="col-md-2 control-label"></label>
         <div class="col-md-10">
@@ -158,8 +152,8 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 
             <span asp-validation-for="WebSite" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="MinDailyCost" class="col-md-2 control-label"></label>
         <div class="col-md-10">
@@ -167,8 +161,8 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 
             <span asp-validation-for="MinDailyCost" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="MaxDailyCost" class="col-md-2 control-label"></label>
         <div class="col-md-10">
@@ -176,38 +170,38 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 
             <span asp-validation-for="MaxDailyCost" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="Active" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Active"  class="form-control" />
+            <input asp-for="Active" class="form-control" />
 
             <span asp-validation-for="Active" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="SIREN" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="SIREN"  class="form-control" />
+            <input asp-for="SIREN" class="form-control" />
 
             <span asp-validation-for="SIREN" class="text-danger"></span>
         </div>
-     </div>
-     <div class="form-group">
+    </div>
+    <div class="form-group">
 
         <label asp-for="OrganizationAddress.Address" class="col-md-2 control-label"></label>
         <div class="col-md-10">
             <input asp-for="OrganizationAddress.Address" class="form-control" type="text" />
 
             <span id="AddressError" asp-validation-for="OrganizationAddress.Address" class="text-danger"></span>
+            <ul id="loccomb" >
+            </ul>
             <div id="map"></div>
         </div>
-     </div>
-        @Html.Hidden("OrganizationAddress.Latitude")
-        @Html.Hidden("OrganizationAddress.Longitude")
-        @Html.Hidden("PerformerId")
+    </div>
+    @Html.Hidden("OrganizationAddress.Latitude") @Html.Hidden("OrganizationAddress.Longitude") @Html.Hidden("PerformerId")
     <button type="submit" class="btn btn-default">Save these settings</button>
 
 </form>
@@ -215,4 +209,4 @@ var gmap = new google.maps.Map(document.getElementById('map'), {
 <form asp-controller="Manage" asp-action="UnsetActivity" method="post" class="form-horizontal" role="form">
     @Html.Hidden("PerfomerId")
     <button type="submit" class="btn btn-default">Remove my professional profile</button>
-</form>
+</form>
\ No newline at end of file