diff --git a/.gitignore b/.gitignore
index 953299758..782ae6c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ bin/security-checker
 bin/security-checker.bat
 
 composer.dev.json
+composer.dev.json.tmp
 composer.phar
 .idea/*
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1968ad9a8..3cc136c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,17 +9,50 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Added
+
+### Fixed
+
+### Changed
+
+
+## [0.15.1] - (2020-07-07)
+
 ### Added
 - Add default FB og:image
+- Add ListingSessionBundle compatibility
+- Add ListingPublicBundle compatibility
 
 ### Fixed
 - Fix update "unread" message in dashboard
 - Fix multi timezone in day mode  
+- Fix admin access front link
+- Fix Nesting level too deep error in user comparison in twig
 
 ### Changed
+- Update doc for SF 3.4
+- Update listing option bundle to v0.15.1
+- Update report bundle to v0.15.1
 - Add acceptation delay constraint in day mode
 - Replace cocorico.booking.min_start_delay parameter by cocorico.booking.min_start_time_delay in day mode
 - Change invoice number generation method
+- Handle end date not manually selected in range mode
+- Change form phone fields to TelType
+- Add condition to replace Translation extension
+- Update listing-alert-bundle to v0.15.1
+- Fork sonata user bundle
+- Replace app/console by bin/console in bin init scripts
+- Add NotFoundException to listings unreachable
+- Remove the comma for last link in edit dashboard page.
+- Add alert box when user delete his listing in edit listing page.
+- Move the description and title block on the right of the category block in deposit listing page.
+- Design changes for calendar title.
+- Remove in user profile page, language related last comma
+- Remove in home and search page category related last comma
+- Enhance error message displaying
+- Change comment count displaying
+- Add comment counts on HP listings
+- Add transchoice to nb comments
 
 ## [0.15.0] - (2019-03-21)
 
@@ -112,7 +145,7 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 - Fix listing availabilities checking in not day mode and with availabilities by default unavailable
 
 ### Changed
-
+- Disable JMS translation reference file adding
 
 ## [0.9.1] - (2019-01-15)
 
@@ -136,6 +169,7 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 ### Added
 
 ### Fixed
+- Set gc_probability to null
 
 ### Changed
 - Add BookingSubscriber for new booking
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 38cb25cd9..54712a453 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -19,19 +19,21 @@ public function registerBundles()
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
+            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new JMS\I18nRoutingBundle\JMSI18nRoutingBundle(),
             new JMS\TranslationBundle\JMSTranslationBundle(),
             new JMS\AopBundle\JMSAopBundle(),
             new JMS\DiExtraBundle\JMSDiExtraBundle(),
             new FOS\UserBundle\FOSUserBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
             new Sonata\AdminBundle\SonataAdminBundle(),
             new Sonata\CoreBundle\SonataCoreBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
             new Sonata\EasyExtendsBundle\SonataEasyExtendsBundle(),
             new Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle(),
             new Sonata\UserBundle\SonataUserBundle(),
+            new Sonata\IntlBundle\SonataIntlBundle(),
             new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
             new Oneup\UploaderBundle\OneupUploaderBundle(),
             new Liip\ImagineBundle\LiipImagineBundle(),
@@ -43,7 +45,6 @@ public function registerBundles()
             new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
             new FOS\CKEditorBundle\FOSCKEditorBundle(),
             new FM\ElfinderBundle\FMElfinderBundle(),
-            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new SimpleThings\EntityAudit\SimpleThingsEntityAuditBundle(),
             //Required bundles
             new Cocorico\CoreBundle\CocoricoCoreBundle(),
diff --git a/app/Resources/translations/cocorico_listing_public.en.xlf b/app/Resources/translations/cocorico_listing_public.en.xlf
new file mode 100644
index 000000000..6f8bdc5f9
--- /dev/null
+++ b/app/Resources/translations/cocorico_listing_public.en.xlf
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-20T00:18:52Z" source-language="en" target-language="en" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="dd72b497fa2331ddc4703f0325c7a908b28369ac" resname="listing.price_four">
+                <source>listing.price_four</source>
+                <target>0-3 years</target>
+            </trans-unit>
+            <trans-unit id="13f1e1f3ae0691647335196c1993e1643e98f9a5" resname="listing.price_four.help">
+                <source>listing.price_four.help</source>
+                <target>listing.price_four.help</target>
+            </trans-unit>
+            <trans-unit id="15d6b95ff2ec78ee71ce3159fa7cda5a1009a8f6" resname="listing.price_one">
+                <source>listing.price_one</source>
+                <target>18 years+</target>
+            </trans-unit>
+            <trans-unit id="6343f3b6f9b88827c70a46b5f8faf44b048fa1eb" resname="listing.price_one.help">
+                <source>listing.price_one.help</source>
+                <target>listing.price_one.help</target>
+            </trans-unit>
+            <trans-unit id="13dad3bfa615b0605168e17ff8d1abcc8cac08bd" resname="listing.price_three">
+                <source>listing.price_three</source>
+                <target>4-12 years</target>
+            </trans-unit>
+            <trans-unit id="d0bd24dda747d39864b0ca205588d8e24fe868c5" resname="listing.price_three.help">
+                <source>listing.price_three.help</source>
+                <target>listing.price_three.help</target>
+            </trans-unit>
+            <trans-unit id="b5c2218c164df7e08fa08f89226045bfb1f92413" resname="listing.price_two">
+                <source>listing.price_two</source>
+                <target>13-18 years</target>
+            </trans-unit>
+            <trans-unit id="fd3607b9c56a1ceb3e8b027780a38c8cc931df16" resname="listing.price_two.help">
+                <source>listing.price_two.help</source>
+                <target>listing.price_two.help</target>
+            </trans-unit>
+            <trans-unit id="447dc13870338b929260a9d1dadbb5b2bb3395a7" resname="listing_public.price.required">
+                <source>listing_public.price.required</source>
+                <target state="new">At least one price must be filled</target>
+            </trans-unit>
+            <trans-unit id="2097c33723b61c7e24d3d7d27840469989b61b49" resname="price">
+                <source>price</source>
+                <target>Price</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_public.fr.xlf b/app/Resources/translations/cocorico_listing_public.fr.xlf
new file mode 100644
index 000000000..257cb8b0f
--- /dev/null
+++ b/app/Resources/translations/cocorico_listing_public.fr.xlf
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-20T00:19:00Z" source-language="en" target-language="fr" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="dd72b497fa2331ddc4703f0325c7a908b28369ac" resname="listing.price_four">
+                <source>listing.price_four</source>
+                <target>0-3 ans</target>
+            </trans-unit>
+            <trans-unit id="13f1e1f3ae0691647335196c1993e1643e98f9a5" resname="listing.price_four.help">
+                <source>listing.price_four.help</source>
+                <target>listing.price_four.help</target>
+            </trans-unit>
+            <trans-unit id="15d6b95ff2ec78ee71ce3159fa7cda5a1009a8f6" resname="listing.price_one">
+                <source>listing.price_one</source>
+                <target>18 ans+</target>
+            </trans-unit>
+            <trans-unit id="6343f3b6f9b88827c70a46b5f8faf44b048fa1eb" resname="listing.price_one.help">
+                <source>listing.price_one.help</source>
+                <target>listing.price_one.help</target>
+            </trans-unit>
+            <trans-unit id="13dad3bfa615b0605168e17ff8d1abcc8cac08bd" resname="listing.price_three">
+                <source>listing.price_three</source>
+                <target>4-12 ans</target>
+            </trans-unit>
+            <trans-unit id="d0bd24dda747d39864b0ca205588d8e24fe868c5" resname="listing.price_three.help">
+                <source>listing.price_three.help</source>
+                <target>listing.price_three.help</target>
+            </trans-unit>
+            <trans-unit id="b5c2218c164df7e08fa08f89226045bfb1f92413" resname="listing.price_two">
+                <source>listing.price_two</source>
+                <target>13-18 ans</target>
+            </trans-unit>
+            <trans-unit id="fd3607b9c56a1ceb3e8b027780a38c8cc931df16" resname="listing.price_two.help">
+                <source>listing.price_two.help</source>
+                <target>listing.price_two.help</target>
+            </trans-unit>
+            <trans-unit id="447dc13870338b929260a9d1dadbb5b2bb3395a7" resname="listing_public.price.required">
+                <source>listing_public.price.required</source>
+                <target state="new">Au moins un prix doit être renseigné</target>
+            </trans-unit>
+            <trans-unit id="2097c33723b61c7e24d3d7d27840469989b61b49" resname="price">
+                <source>price</source>
+                <target>Prix</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_session.en.xlf b/app/Resources/translations/cocorico_listing_session.en.xlf
new file mode 100644
index 000000000..237c2e8c5
--- /dev/null
+++ b/app/Resources/translations/cocorico_listing_session.en.xlf
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-18T10:19:43Z" source-language="en" target-language="en" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="39b5a7eef4b8a1d29c2616db61bd803bc1e8e5b3" resname="listing.duration">
+                <source>listing.duration</source>
+                <target>Duration</target>
+            </trans-unit>
+            <trans-unit id="5a44c928642e3a4648a60d8ab1ab6362eb1e810a" resname="listing.form.duration">
+                <source>listing.form.duration</source>
+                <target>Session duration</target>
+            </trans-unit>
+            <trans-unit id="06c59b9b463c217f2965f3a0db032e4377420f1a" resname="listing.show.duration">
+                <source>listing.show.duration</source>
+                <target>Session duration</target>
+            </trans-unit>
+            <trans-unit id="55c0b3aa3afa5a74762bf8425ed58dd86f6f14a6" resname="listing_session.duration.min {{ min }}">
+                <source>listing_session.duration.min {{ min }}</source>
+                <target state="new">THe minimum duration is {{ min }}</target>
+            </trans-unit>
+            <trans-unit id="f6837b3e73f08e9626617af82fd78015c5d763ad" resname="time_unit_session">
+                <source>time_unit_session</source>
+                <target xml:space="preserve">{-3} by session|{-1} hour(s)|{0} session|]0,1] %hour%h %minute%|]1,Inf]%hour%h%minute%
+        </target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_session.fr.xlf b/app/Resources/translations/cocorico_listing_session.fr.xlf
new file mode 100644
index 000000000..1973aec53
--- /dev/null
+++ b/app/Resources/translations/cocorico_listing_session.fr.xlf
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-18T10:12:51Z" source-language="en" target-language="fr" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="39b5a7eef4b8a1d29c2616db61bd803bc1e8e5b3" resname="listing.duration">
+                <source>listing.duration</source>
+                <target>Durée</target>
+            </trans-unit>
+            <trans-unit id="5a44c928642e3a4648a60d8ab1ab6362eb1e810a" resname="listing.form.duration">
+                <source>listing.form.duration</source>
+                <target>Durée d'une séance</target>
+            </trans-unit>
+            <trans-unit id="06c59b9b463c217f2965f3a0db032e4377420f1a" resname="listing.show.duration">
+                <source>listing.show.duration</source>
+                <target>Durée d'une séance</target>
+            </trans-unit>
+            <trans-unit id="55c0b3aa3afa5a74762bf8425ed58dd86f6f14a6" resname="listing_session.duration.min {{ min }}">
+                <source>listing_session.duration.min {{ min }}</source>
+                <target state="new">La durée minimum est de {{ min }}</target>
+            </trans-unit>
+            <trans-unit id="f6837b3e73f08e9626617af82fd78015c5d763ad" resname="time_unit_session">
+                <source>time_unit_session</source>
+                <target>{-3} par séance|{-1} heure(s)|{0} séance|]0,1] %hour%h%minute%|]1,Inf]%hour%h%minute%</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/config/config.yml b/app/config/config.yml
index cc907c849..13b0a3426 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -34,7 +34,7 @@ framework:
         handler_id:  ~
         name: _csess
         #on debian there is a /etc/cron.d/php5 doing the job
-        gc_probability: 0 #todo check in prod
+        gc_probability: null
     fragments:       ~
     http_method_override: true
 
diff --git a/app/config/config_staging.yml b/app/config/config_staging.yml
index 32621cc81..ad5e54144 100644
--- a/app/config/config_staging.yml
+++ b/app/config/config_staging.yml
@@ -4,7 +4,7 @@ imports:
 framework:
     test: ~
     session:
-        gc_probability: 0
+        gc_probability: null
 #        storage_id: session.storage.mock_file
 #    profiler:
 #        collect: false
diff --git a/composer.json b/composer.json
index c28b4a140..7b941a3d1 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
   "license": "MIT",
   "type": "project",
   "description": "The Cocorico Standard Edition distribution",
+  "version": "0.15.1",
   "keywords": [
     "marketplace",
     "service",
@@ -10,7 +11,7 @@
     "platform",
     "consumption"
   ],
-  "homepage": "http://cocorico.io",
+  "homepage": "http://www.cocorico.io",
   "authors": [
     {
       "name": "Cocolabs SAS",
diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php
index e6621c8be..94c733b9a 100644
--- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php
+++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php
@@ -79,7 +79,7 @@ public function editAvailabilitiesPricesAction(Request $request, Listing $listin
             'CocoricoCoreBundle:Dashboard/Listing:edit_availabilities_prices.html.twig',
             array(
                 'listing' => $listing,
-                'form_prices' => $form->createView()
+                'form' => $form->createView()
             )
         );
 
diff --git a/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php b/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php
index 8ddc07879..d9235a76d 100644
--- a/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php
+++ b/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php
@@ -39,6 +39,8 @@ class ListingController extends Controller
      * @param Request $request
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @throws \Symfony\Component\Form\Exception\RuntimeException
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException
      */
     public function newAction(Request $request)
     {
diff --git a/src/Cocorico/CoreBundle/Controller/Frontend/ListingSearchController.php b/src/Cocorico/CoreBundle/Controller/Frontend/ListingSearchController.php
index 42445ca72..6fc77e08f 100644
--- a/src/Cocorico/CoreBundle/Controller/Frontend/ListingSearchController.php
+++ b/src/Cocorico/CoreBundle/Controller/Frontend/ListingSearchController.php
@@ -160,23 +160,34 @@ protected function getMarkers(Request $request, $results, $resultsIterator)
         $liipCacheManager = $this->get('liip_imagine.cache.manager');
         $currencyExtension = $this->get('lexik_currency.currency_extension');
         $currencyExtension->getFormatter()->setLocale($locale);
+        $listingSession = array_key_exists('CocoricoListingSessionBundle', $this->getParameter('kernel.bundles'));
         $markers = $listingsIds = array();
 
         foreach ($results->getIterator() as $i => $result) {
             $listing = $result[0];
             $listingsIds[] = $listing['id'];
+            $isInCurrentPage = in_array($listing['id'], $resultsInPage);
 
+            //Image
             $imageName = count($listing['images']) ? $listing['images'][0]['name'] : ListingImage::IMAGE_DEFAULT;
-
             $image = $liipCacheManager->getBrowserPath($imagePath . $imageName, 'listing_medium', array());
 
+            //Price
             $price = $currencyExtension->convertAndFormat($listing['price'] / 100, $currentCurrency, false);
 
+            //Duration
+            $duration = null;
+            if ($listingSession && array_key_exists('duration', $listing)) {
+                /** @var \DateTime $duration */
+                $duration = $listing['duration'];
+                $duration = '(' . $duration->format('H\hi') . ')';
+            }
+
+            //Categories
             $categories = count($listing['listingListingCategories']) ?
                 $listing['listingListingCategories'][0]['category']['translations'][$locale]['name'] : '';
 
-            $isInCurrentPage = in_array($listing['id'], $resultsInPage);
-
+            //Ratings
             $rating1 = $rating2 = $rating3 = $rating4 = $rating5 = 'hidden';
             if ($listing['averageRating']) {
                 $rating1 = ($listing['averageRating'] >= 1) ? '' : 'inactive';
@@ -201,14 +212,14 @@ protected function getMarkers(Request $request, $results, $resultsIterator)
                 'rating4' => $rating4,
                 'rating5' => $rating5,
                 'price' => $price,
+                'duration' => $duration,
                 'certified' => $listing['certified'] ? 'certified' : 'hidden',
-                'url' => $url = $this->generateUrl(
+                'url' => $this->generateUrl(
                     'cocorico_listing_show',
                     array('slug' => $listing['translations'][$locale]['slug'])
                 ),
                 'zindex' => $isInCurrentPage ? 2 * $nbResults - $i : $i,
                 'opacity' => $isInCurrentPage ? 1 : 0.4,
-
             );
         }
 
diff --git a/src/Cocorico/CoreBundle/Event/BookingFormEvents.php b/src/Cocorico/CoreBundle/Event/BookingFormEvents.php
index 4e3a378f9..8ae757f3a 100644
--- a/src/Cocorico/CoreBundle/Event/BookingFormEvents.php
+++ b/src/Cocorico/CoreBundle/Event/BookingFormEvents.php
@@ -14,6 +14,16 @@
 
 class BookingFormEvents
 {
+
+    /**
+     * The BOOKING_PRICE_FORM_BUILD event is thrown each time a booking price form is build
+     *
+     * This event allows you to add form fields and validation on them.
+     *
+     * The event listener receives a \Cocorico\CoreBundle\Event\BookingFormBuilderEvent instance.
+     */
+    const BOOKING_PRICE_FORM_BUILD = 'cocorico.booking_price.form.build';
+
     /**
      * The BOOKING_NEW_FORM_BUILD event is thrown each time a new booking form is build
      *
@@ -32,4 +42,6 @@ class BookingFormEvents
      * The event listener receives a \Cocorico\CoreBundle\Event\BookingFormEvent instance.
      */
     const BOOKING_NEW_FORM_PROCESS = 'cocorico.booking_new.form.process';
+
+
 }
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Event/ListingFormEvents.php b/src/Cocorico/CoreBundle/Event/ListingFormEvents.php
index 9258a6ba2..53ab2dc2b 100644
--- a/src/Cocorico/CoreBundle/Event/ListingFormEvents.php
+++ b/src/Cocorico/CoreBundle/Event/ListingFormEvents.php
@@ -51,4 +51,14 @@ class ListingFormEvents
      */
     const LISTING_NEW_FORM_BUILD = 'cocorico.listing_new.form.build';
 
+
+    /**
+     * The LISTING_AVAILABILITIES_FORM_BUILD event is thrown each time a listing availability edition form is build
+     *
+     * This event allows you to add form fields and validation on them.
+     *
+     * The event listener receives a \Cocorico\CoreBundle\Event\ListingFormBuilderEvent instance.
+     */
+    const LISTING_AVAILABILITIES_FORM_BUILD = 'cocorico.listing_edit.availabilities.form.build';
+
 }
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Form/Handler/Dashboard/ListingAvailabilityPriceFormHandler.php b/src/Cocorico/CoreBundle/Form/Handler/Dashboard/ListingAvailabilityPriceFormHandler.php
index d5ec219cd..d5c13afef 100644
--- a/src/Cocorico/CoreBundle/Form/Handler/Dashboard/ListingAvailabilityPriceFormHandler.php
+++ b/src/Cocorico/CoreBundle/Form/Handler/Dashboard/ListingAvailabilityPriceFormHandler.php
@@ -22,7 +22,6 @@
 
 /**
  * Handle Listing Availability Price Form
- *
  */
 class ListingAvailabilityPriceFormHandler extends ListingAvailabilityFormHandler
 {
diff --git a/src/Cocorico/CoreBundle/Form/Type/Dashboard/ListingEditAvailabilitiesType.php b/src/Cocorico/CoreBundle/Form/Type/Dashboard/ListingEditAvailabilitiesType.php
index ddefdb3b6..71c689e2f 100644
--- a/src/Cocorico/CoreBundle/Form/Type/Dashboard/ListingEditAvailabilitiesType.php
+++ b/src/Cocorico/CoreBundle/Form/Type/Dashboard/ListingEditAvailabilitiesType.php
@@ -11,10 +11,13 @@
 
 namespace Cocorico\CoreBundle\Form\Type\Dashboard;
 
+use Cocorico\CoreBundle\Event\ListingFormBuilderEvent;
+use Cocorico\CoreBundle\Event\ListingFormEvents;
 use Cocorico\TimeBundle\Form\Type\DateRangeType;
 use Cocorico\TimeBundle\Form\Type\TimeRangeType;
 use Cocorico\TimeBundle\Form\Type\WeekDaysType;
 use Cocorico\TimeBundle\Validator\Constraints\TimeRangesOverlap;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -23,17 +26,19 @@
 
 class ListingEditAvailabilitiesType extends AbstractType
 {
-
+    protected $dispatcher;
     protected $timeUnit;
     protected $timeUnitIsDay;
     protected $daysMaxEdition;
 
     /**
-     * @param int $timeUnit
-     * @param int $daysMaxEdition
+     * @param EventDispatcherInterface $dispatcher
+     * @param int                      $timeUnit
+     * @param int                      $daysMaxEdition
      */
-    public function __construct($timeUnit, $daysMaxEdition)
+    public function __construct(EventDispatcherInterface $dispatcher, $timeUnit, $daysMaxEdition)
     {
+        $this->dispatcher = $dispatcher;
         $this->timeUnit = $timeUnit;
         $this->timeUnitIsDay = ($timeUnit % 1440 == 0) ? true : false;
         $this->daysMaxEdition = $daysMaxEdition;
@@ -91,6 +96,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             );
         }
 
+        //Dispatch LISTING_AVAILABILITIES_FORM_BUILD Event. Listeners can add fields and validation
+        $this->dispatcher->dispatch(
+            ListingFormEvents::LISTING_AVAILABILITIES_FORM_BUILD,
+            new ListingFormBuilderEvent($builder)
+        );
     }
 
     /**
diff --git a/src/Cocorico/CoreBundle/Form/Type/Frontend/BookingPriceType.php b/src/Cocorico/CoreBundle/Form/Type/Frontend/BookingPriceType.php
index 04eee5e91..abf3d18a4 100644
--- a/src/Cocorico/CoreBundle/Form/Type/Frontend/BookingPriceType.php
+++ b/src/Cocorico/CoreBundle/Form/Type/Frontend/BookingPriceType.php
@@ -12,10 +12,13 @@
 namespace Cocorico\CoreBundle\Form\Type\Frontend;
 
 use Cocorico\CoreBundle\Entity\Booking;
+use Cocorico\CoreBundle\Event\BookingFormBuilderEvent;
+use Cocorico\CoreBundle\Event\BookingFormEvents;
 use Cocorico\TimeBundle\Form\Type\DateRangeType;
 use Cocorico\TimeBundle\Form\Type\TimeRangeType;
 use Cocorico\TimeBundle\Model\DateRange;
 use Cocorico\TimeBundle\Model\DateTimeRange;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use DateTime;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,6 +29,7 @@
 
 class BookingPriceType extends AbstractType
 {
+    protected $dispatcher;
     protected $allowSingleDay;
     protected $endDayIncluded;
     protected $daysDisplayMode;
@@ -33,6 +37,7 @@ class BookingPriceType extends AbstractType
     protected $timeUnitIsDay;
 
     /**
+     * @param EventDispatcherInterface $dispatcher
      * @param bool   $allowSingleDay
      * @param bool   $endDayIncluded
      * @param string $daysDisplayMode
@@ -40,12 +45,14 @@ class BookingPriceType extends AbstractType
      * @param int    $timeUnit
      */
     public function __construct(
+        $dispatcher,
         $allowSingleDay,
         $endDayIncluded,
         $daysDisplayMode,
         $timesDisplayMode,
         $timeUnit
     ) {
+        $this->dispatcher = $dispatcher;
         $this->allowSingleDay = $allowSingleDay;
         $this->endDayIncluded = $endDayIncluded;
         $this->daysDisplayMode = $daysDisplayMode;
@@ -109,11 +116,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'required' => true,
                     /** @Ignore */
                     'label' => false,
-                    'display_mode' => $this->timesDisplayMode
+                    'display_mode' => $this->timesDisplayMode,
                 )
             );
         }
 
+        //Dispatch BOOKING_PRICE_FORM_BUILD Event. Listener listening this event can add fields and validation
+        $this->dispatcher->dispatch(
+            BookingFormEvents::BOOKING_PRICE_FORM_BUILD,
+            new BookingFormBuilderEvent($builder)
+        );
+
         //Sync date and time
         $builder->addEventListener(
             FormEvents::SUBMIT,
@@ -154,11 +167,6 @@ public function configureOptions(OptionsResolver $resolver)
                 'translation_domain' => 'cocorico_booking',
                 'constraints' => new Valid(),
                 'validation_groups' => array('new'),
-//                'error_bubbling' => false,//To prevent errors bubbling up to the parent form
-//                //To map errors of all unmapped properties (date_range) to a particular field (date_range)
-//                'error_mapping' => array(
-//                    '.' => 'date_range',
-//                ),
             )
         );
     }
diff --git a/src/Cocorico/CoreBundle/Form/Type/Frontend/ListingNewType.php b/src/Cocorico/CoreBundle/Form/Type/Frontend/ListingNewType.php
index 5e5916975..c744c557c 100644
--- a/src/Cocorico/CoreBundle/Form/Type/Frontend/ListingNewType.php
+++ b/src/Cocorico/CoreBundle/Form/Type/Frontend/ListingNewType.php
@@ -18,6 +18,7 @@
 use Cocorico\CoreBundle\Event\ListingFormEvents;
 use Cocorico\CoreBundle\Form\Type\ImageType;
 use Cocorico\CoreBundle\Form\Type\PriceType;
+use Cocorico\UserBundle\Entity\User;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Translation\TranslationContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -41,24 +42,24 @@ class ListingNewType extends AbstractType implements TranslationContainerInterfa
     public static $credentialError = 'user.form.credential.error';
 
     private $request;
+    protected $dispatcher;
     private $locale;
     private $locales;
-    protected $dispatcher;
 
     /**
      * @param RequestStack             $requestStack
-     * @param array                    $locales
      * @param EventDispatcherInterface $dispatcher
+     * @param array                    $locales
      */
     public function __construct(
         RequestStack $requestStack,
-        $locales,
-        EventDispatcherInterface $dispatcher
+        EventDispatcherInterface $dispatcher,
+        $locales
     ) {
         $this->request = $requestStack->getCurrentRequest();
+        $this->dispatcher = $dispatcher;
         $this->locale = $this->request->getLocale();
         $this->locales = $locales;
-        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -96,33 +97,32 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             );
         }
 
-        $builder->add(
-            'translations',
-            TranslationsType::class,
-            array(
-                'required_locales' => array($this->locale),
-                'fields' => array(
-                    'title' => array(
-                        'field_type' => 'text',
-                        'locale_options' => $titles,
-                    ),
-                    'description' => array(
-                        'field_type' => 'textarea',
-                        'locale_options' => $descriptions,
-                    ),
-                    'rules' => array(
-                        'display' => false,
-                    ),
-                    'slug' => array(
-                        'display' => false
+        $builder
+            ->add(
+                'translations',
+                TranslationsType::class,
+                array(
+                    'required_locales' => array($this->locale),
+                    'fields' => array(
+                        'title' => array(
+                            'field_type' => 'text',
+                            'locale_options' => $titles,
+                        ),
+                        'description' => array(
+                            'field_type' => 'textarea',
+                            'locale_options' => $descriptions,
+                        ),
+                        'rules' => array(
+                            'display' => false,
+                        ),
+                        'slug' => array(
+                            'display' => false
+                        ),
                     ),
-                ),
-                /** @Ignore */
-                'label' => false,
+                    /** @Ignore */
+                    'label' => false,
+                )
             )
-        );
-
-        $builder
             ->add(
                 'price',
                 PriceType::class,
@@ -133,28 +133,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add(
                 'image',
                 ImageType::class
-            );
-
-        //Default listing location
-        $listingLocation = null;
-        $user = $listing->getUser();
-        if ($user) {
-            if ($user->getListings()->count()) {
-                /** @var Listing $listing */
-                $listing = $user->getListings()->first();
-                $location = $listing->getLocation();
-
-                $listingLocation = new ListingLocation();
-                $listingLocation->setListing($listing);
-                $listingLocation->setCountry($location->getCountry());
-                $listingLocation->setCity($location->getCity());
-                $listingLocation->setZip($location->getZip());
-                $listingLocation->setRoute($location->getRoute());
-                $listingLocation->setStreetNumber($location->getStreetNumber());
-            }
-        }
-
-        $builder
+            )
             ->add(
                 'location',
                 ListingLocationType::class,
@@ -162,11 +141,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data_class' => 'Cocorico\CoreBundle\Entity\ListingLocation',
                     /** @Ignore */
                     'label' => false,
-                    'data' => $listingLocation,
+                    'data' => $this->getDefaultListingLocation($listing->getUser()),
                 )
-            );
-
-        $builder
+            )
             ->add(
                 'tac',
                 CheckboxType::class,
@@ -189,6 +166,30 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
     }
 
+    /**
+     * @param User $user
+     * @return ListingLocation|null
+     */
+    private function getDefaultListingLocation(User $user)
+    {
+        $listingLocation = null;
+        if ($user && $user->getListings()->count()) {
+            /** @var Listing $listing */
+            $listing = $user->getListings()->first();
+            $location = $listing->getLocation();
+
+            $listingLocation = new ListingLocation();
+            $listingLocation->setListing($listing);
+            $listingLocation->setCountry($location->getCountry());
+            $listingLocation->setCity($location->getCity());
+            $listingLocation->setZip($location->getZip());
+            $listingLocation->setRoute($location->getRoute());
+            $listingLocation->setStreetNumber($location->getStreetNumber());
+        }
+
+        return $listingLocation;
+    }
+
     /**
      * @param OptionsResolver $resolver
      */
diff --git a/src/Cocorico/CoreBundle/Model/Manager/BookingManager.php b/src/Cocorico/CoreBundle/Model/Manager/BookingManager.php
index 6f450c079..6f62100e8 100644
--- a/src/Cocorico/CoreBundle/Model/Manager/BookingManager.php
+++ b/src/Cocorico/CoreBundle/Model/Manager/BookingManager.php
@@ -223,6 +223,12 @@ public function initBookingDatesInNotDayMode(Booking $booking)
         }
 //        echo "hourToFind: " . $hourToFind. "<br>";
 
+        //TimeUnit
+        $timeUnit = $this->timeUnit;
+        if ($this->listingSessionIsEnabled()) {//Time unit is equal to listing duration
+            $timeUnit = $booking->getListing()->getDurationInMinute();
+        }
+
         //We look for each days if some availabilities are defined
         $found = false;
         for ($d = clone $minStartDay; $d <= $maxEndDate; $d->add(new DateInterval('P1D'))) {
@@ -245,8 +251,8 @@ public function initBookingDatesInNotDayMode(Booking $booking)
                 $minHourBis = ($d == $minStartDay ? intval($minStartDate->format('H')) * 60 : $minHour);
                 for ($m = $minHourBis; $m <= $maxHour; $m++) {
 //                    echo $m . ":" . $availability[$m] . "<br>";
-                    if ($nbMinutesAvailable == $this->timeUnit) {//Previous "timeUnit" minutes was available
-                        $hourToFind = $m - $this->timeUnit;//This is the minute in the day of the first hour available
+                    if ($nbMinutesAvailable == $timeUnit) {//Previous "timeUnit" minutes was available
+                        $hourToFind = $m - $timeUnit;//This is the minute in the day of the first hour available
 //                        echo "hour found:" . $hourToFind . "<br>";
                         if ($hourToFind >= $minHour && $hourToFind <= $maxHour) {//If the found hour is in the hours available range
 //                            echo "found" . "<br>";
@@ -292,12 +298,12 @@ public function initBookingDatesInNotDayMode(Booking $booking)
             //Time of end date is equal to start time plus one hour
             $end = clone $endDayToFind;
             $end->setTime(0, 0, 0);
-            $end->add(new DateInterval('PT'.($hourToFind + $this->timeUnit).'M'));
+            $end->add(new DateInterval('PT' . ($hourToFind + $timeUnit) . 'M'));
             $booking->setEnd($end);
 
             //End date time is equal to start date time plus one hour
             $endTime = clone $start;
-            $endTime->add(new DateInterval('PT'.($this->timeUnit).'M'));
+            $endTime->add(new DateInterval('PT' . ($timeUnit) . 'M'));
             $booking->setEndTime($endTime);
         }
 
@@ -649,9 +655,15 @@ private function checkBookingAvailabilityInNoDayMode(Booking $booking, $availabi
 
         $daysTimeRanges = $booking->getDateTimeRange()->getDaysTimeRanges(true);
 
-        $duration = $booking->getDuration($this->endDayIncluded, $this->timeUnit);
+        //If session is enabled then time unit is equal to listing session duration
+        $timeUnit = $this->timeUnit;
+        if ($this->listingSessionIsEnabled()) {
+            $timeUnit = $booking->getListing()->getDurationInMinute();
+        }
+
+        $duration = $booking->getDuration($this->endDayIncluded, $timeUnit);
         $price = $booking->getListing()->getPrice();
-        $amountByMinute = $price / $this->timeUnit;
+        $amountByMinute = $price / $timeUnit;
         $amount = $duration * $price;
 
 //        echo count($availabilities) . '<br>';
@@ -691,7 +703,7 @@ private function checkBookingAvailabilityInNoDayMode(Booking $booking, $availabi
                 //If price reported to one minute is defined for this minute, it is added to amount
                 if (isset($times[$k])) {
                     $amount -= $amountByMinute;
-                    $amount += $times[$k]["p"] / $this->timeUnit;
+                    $amount += $times[$k]["p"] / $timeUnit;
                 }
             }
         }
@@ -1563,6 +1575,14 @@ private function voucherIsEnabled()
         return isset($this->bundles["CocoricoVoucherBundle"]);
     }
 
+    /**
+     * @return bool
+     */
+    private function listingSessionIsEnabled()
+    {
+        return isset($this->bundles["CocoricoListingSessionBundle"]);
+    }
+
     /**
      *
      * @return BookingRepository
diff --git a/src/Cocorico/CoreBundle/Model/Manager/ListingAvailabilityManager.php b/src/Cocorico/CoreBundle/Model/Manager/ListingAvailabilityManager.php
index 899d1fac3..9c510e471 100644
--- a/src/Cocorico/CoreBundle/Model/Manager/ListingAvailabilityManager.php
+++ b/src/Cocorico/CoreBundle/Model/Manager/ListingAvailabilityManager.php
@@ -178,7 +178,7 @@ public function saveAvailabilities(
      * @param DateTime $day
      * @param array    $timeRanges
      * @param int      $status
-     * @param int      $price
+     * @param int       $price
      * @param int|null $defaultPrice
      * @param bool     $bookingCancellation
      *
@@ -453,9 +453,9 @@ public function asCalendarEvents($availabilities, $timezone)
                 $prevEvent = $event;
 
                 //Get start and end in UTC
-                $startUTC = new DateTime($event['start'], new DateTimeZone($timezone));
+                $startUTC = new \DateTime($event['start'], new DateTimeZone($timezone));
                 $startUTC->setTimezone(new DateTimeZone('UTC'));
-                $endUTC = new DateTime($event['end'], new DateTimeZone($timezone));
+                $endUTC = new \DateTime($event['end'], new DateTimeZone($timezone));
                 $endUTC->setTimezone(new DateTimeZone('UTC'));
 
                 $result[] = array(
@@ -485,14 +485,14 @@ public function asCalendarEvents($availabilities, $timezone)
      */
     private function asCalendarDayEvents($availability, $timezone)
     {
-        /** @var MongoDate $dayMD */
+        /** @var \MongoDate $dayMD */
         $dayMD = $availability['d'];
-        $day = new DateTime();
+        $day = new \DateTime();
         $day->setTimestamp($dayMD->sec);
         $dayAsString = $dayEndAsString = $day->format('Y-m-d');//by default day is the same for an event
 
         $nextDay = clone $day;//if end time is 00:00 the day will be the next one
-        $nextDay->add(new DateInterval('P1D'));
+        $nextDay->add(new \DateInterval('P1D'));
         $nextDayAsString = $nextDay->format('Y-m-d');
 
         //time ranges array in UTC
@@ -507,8 +507,8 @@ private function asCalendarDayEvents($availability, $timezone)
                     $dayEndAsString = $nextDayAsString;
                 }
 
-                $startUTC = new DateTime($dayAsString.' '.$timeRange['start']);
-                $endUTC = new DateTime($dayEndAsString.' '.$timeRange['end']);
+                $startUTC = new \DateTime($dayAsString . ' ' . $timeRange['start']);
+                $endUTC = new \DateTime($dayEndAsString . ' ' . $timeRange['end']);
 
 //                echo $startUTC->format('Y-m-d H:i') . ' / ' . $endUTC->format('Y-m-d H:i') . '<br>';
 
@@ -548,8 +548,8 @@ private function asCalendarDayEvents($availability, $timezone)
                 }
             }
         } else {
-            $start = new DateTime($dayAsString.' '.'00:00');
-            $end = new DateTime($dayAsString.' '.'23:59');
+            $start = new \DateTime($dayAsString . ' ' . '00:00');
+            $end = new \DateTime($dayAsString . ' ' . '23:59');
 
             $events[$start->format('Y-m-d')][] = array(
                 'id' => $availability['_id'] . '0000',
@@ -572,10 +572,10 @@ private function asCalendarDayEvents($availability, $timezone)
      */
     public function duplicate($listingId, $duplicatedListingId, $daysMaxEdition)
     {
-        $start = new DateTime();
-        $start->sub(new DateInterval('P1D'));
-        $end = new DateTime();
-        $end = $end->add(new DateInterval('P'.$daysMaxEdition.'D'));
+        $start = new \DateTime();
+        $start->sub(new \DateInterval('P1D'));
+        $end = new \DateTime();
+        $end = $end->add(new \DateInterval('P' . $daysMaxEdition . 'D'));
 
         $availabilities = $this->getAvailabilitiesByListingAndDateRange($listingId, $start, $end);
         $newAvailabilities = array();
diff --git a/src/Cocorico/CoreBundle/Resources/config/Services/forms.yml b/src/Cocorico/CoreBundle/Resources/config/Services/forms.yml
index 7f2ec1c6d..9148afb78 100644
--- a/src/Cocorico/CoreBundle/Resources/config/Services/forms.yml
+++ b/src/Cocorico/CoreBundle/Resources/config/Services/forms.yml
@@ -4,8 +4,8 @@ services:
         class: Cocorico\CoreBundle\Form\Type\Frontend\ListingNewType
         arguments:
             - "@request_stack"
-            - "%cocorico.locales%"
             - "@event_dispatcher"
+            - "%cocorico.locales%"
         tags:
             - { name: form.type }
 
@@ -61,6 +61,7 @@ services:
     cocorico.form.type.listing_edit_availabilities:
         class: Cocorico\CoreBundle\Form\Type\Dashboard\ListingEditAvailabilitiesType
         arguments:
+            - "@event_dispatcher"
             - "%cocorico.time_unit%"
             - "%cocorico.days_max_edition%"
         tags:
@@ -226,6 +227,7 @@ services:
     cocorico.form.type.booking_price:
         class: Cocorico\CoreBundle\Form\Type\Frontend\BookingPriceType
         arguments:
+            - "@event_dispatcher"
             - "%cocorico.booking.allow_single_day%"
             - "%cocorico.booking.end_day_included%"
             - "%cocorico.days_display_mode%"
diff --git a/src/Cocorico/CoreBundle/Resources/config/parameters.yml b/src/Cocorico/CoreBundle/Resources/config/parameters.yml
index c81bb52fd..39d5a0d3b 100644
--- a/src/Cocorico/CoreBundle/Resources/config/parameters.yml
+++ b/src/Cocorico/CoreBundle/Resources/config/parameters.yml
@@ -3,7 +3,7 @@ parameters:
     #Site general info
     cocorico.site_name: Cocorico
     cocorico.phone: +33(0) 1 43 79 86 30
-    cocorico.address: 67 rue de Provence, 75009
+    cocorico.address: 67 rue de Provence, 75009, Paris
     cocorico.short_description: 'Cocorico is collaborative consumption platform'
     cocorico.contact_mail: contact@cocorico.io
     #To obfuscate see http://wbwip.com/wbw/emailencoder.html
@@ -11,7 +11,7 @@ parameters:
     cocorico.from_email: no-reply@cocorico.io
     cocorico.webmaster_email: webmaster@cocorico.io
     cocorico.vat_number: FR 12 123 456 789
-    cocorico.home_rss_feed: 'http://www.cocolabs.io/fr/feed/'
+    cocorico.home_rss_feed: 'https://www.cocolabs.io/fr/feed/'
 
     #Languages
     #For knp translatable
diff --git a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/_edit_availabilities.html.twig b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/_edit_availabilities.html.twig
new file mode 100644
index 000000000..0078dbfaa
--- /dev/null
+++ b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/_edit_availabilities.html.twig
@@ -0,0 +1,35 @@
+{% trans_default_domain 'cocorico_listing' %}
+
+<div class="field-row time">
+    {{ form_errors(form) }}
+
+    {{ form_errors(form.date_range) }}
+    {{ form_label(form.date_range) }}
+    {{ form_widget(form.date_range) }}
+</div>
+
+<h3>{{ 'listing.edit.price.choose_weekdays.title'|trans }}</h3>
+
+{{ form_errors(form.weekdays) }}
+{{ form_label(form.weekdays) }}
+{{ form_widget(form.weekdays) }}
+
+{% if bundleExist('CocoricoListingSessionBundle') %}
+    {%- include 'CocoricoListingSessionBundle:Dashboard:Listing/_show_duration.html.twig' with {
+        'form': form,
+        'duration': listing.duration,
+    } only %}
+{% endif %}
+
+{% if not timeUnitIsDay %}
+    <h3>
+        {{ 'listing.edit.price.choose_times.title'|trans }}
+        ({{ 'form.time_zone'|trans({}, 'cocorico_user') }} :
+        {{ app.session.get('timezone')|timezone_name }})
+    </h3>
+    <div class="time-ranges">
+        {{ form_errors(form.time_ranges) }}
+        {{ form_label(form.time_ranges) }}
+        {{ form_widget(form.time_ranges) }}
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_prices.html.twig b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_prices.html.twig
index adb60e0cb..308dcb1b9 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_prices.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_prices.html.twig
@@ -63,42 +63,24 @@
                     </div>
 
                     <div class="form-block">
-                        {{ form_start(form_prices, {'attr': {'id': 'prices-form', 'class': 'form'}}) }}
+                        {{ form_start(form, {'attr': {'id': 'prices-form', 'class': 'form'}}) }}
 
                         <!-- price-range -->
                         <div class="price-range">
                             <h3>{{ 'listing.edit.price.range.title'|trans }}</h3>
 
-                            <div class="field-row time">
-                                {{ form_errors(form_prices) }}
-
-                                {{ form_errors(form_prices.date_range) }}
-                                {{ form_label(form_prices.date_range) }}
-                                {{ form_widget(form_prices.date_range) }}
-                            </div>
-
-                            <h3>{{ 'listing.edit.price.choose_weekdays.title'|trans }}</h3>
-
-                            {{ form_errors(form_prices.weekdays) }}
-                            {{ form_label(form_prices.weekdays) }}
-                            {{ form_widget(form_prices.weekdays) }}
-
-                            {% if not timeUnitIsDay %}
-                                <h4>{{ 'listing.edit.price.choose_times.title'|trans }}</h4>
-                                <div class="time-ranges">
-                                    {{ form_errors(form_prices.time_ranges) }}
-                                    {{ form_label(form_prices.time_ranges) }}
-                                    {{ form_widget(form_prices.time_ranges) }}
-                                </div>
-                            {% endif %}
+                            {% include 'CocoricoCoreBundle:Dashboard/Listing:_edit_availabilities.html.twig' ignore missing with {
+                                'listing': listing,
+                                'form': form
+                            } only %}
 
                             <div class="field-row agenda">
-                                {{ form_errors(form_prices.price_custom) }}
+                                {{ form_errors(form.price_custom) }}
                                 <span class="label">
-                                    {{ form_label(form_prices.price_custom) }}
+                                    {{ form_label(form.price_custom) }}
                                 </span>
 
-                                {{ form_widget(form_prices.price_custom, {
+                                {{ form_widget(form.price_custom, {
                                     'attr': {'class': 'form-control numbers-only' }
                                 }) }}
 
@@ -111,7 +93,7 @@
                             </div>
                         </div>
 
-                        {{ form_end(form_prices) }}
+                        {{ form_end(form) }}
                     </div>
 
 
diff --git a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_status.html.twig b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_status.html.twig
index 1203db799..c40f3781e 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_status.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/edit_availabilities_status.html.twig
@@ -47,29 +47,10 @@
                         <div class="price-range">
                             <h3>{{ 'listing.edit.calendar.range.title'|trans }}</h3>
 
-                            <div class="field-row time">
-                                {{ form_errors(form) }}
-                                {{ form_errors(form.date_range) }}
-                                {{ form_label(form.date_range) }}
-                                {{ form_widget(form.date_range) }}
-                            </div>
-
-                            <h3>{{ 'listing.edit.calendar.choose_weekdays.title'|trans }}</h3>
-
-                            {{ form_errors(form.weekdays) }}
-                            {{ form_label(form.weekdays) }}
-                            {{ form_widget(form.weekdays) }}
-
-
-                            {% if ( not timeUnitIsDay ) %}
-                                <h4>{{ 'listing.edit.calendar.choose_times.title'|trans }}</h4>
-
-                                <div class="time-ranges collection-dib">
-                                    {{ form_errors(form.time_ranges) }}
-                                    {{ form_label(form.time_ranges) }}
-                                    {{ form_widget(form.time_ranges) }}
-                                </div>
-                            {% endif %}
+                            {% include 'CocoricoCoreBundle:Dashboard/Listing:_edit_availabilities.html.twig' ignore missing with {
+                                'listing': listing,
+                                'form': form
+                            } only %}
 
                             <div class="location">
                                 {{ form_errors(form.status) }}
diff --git a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/form_price.html.twig b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/form_price.html.twig
index f3e65fa64..1e9bc77fb 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/form_price.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/form_price.html.twig
@@ -92,19 +92,19 @@
     <script>
         $(function () {
             $("#price-form-container").submitAjaxForm(
-                    function () {
-                        //Replace price with new one on calendar
-                        var $titleElt = $('.fc-title-default');
-                        var $price = $("#listing_price_price");
-                        var newPrice = $price.val();
-                        newPrice = convertCurrency(newPrice, defaultCurrency, currentCurrency);
-                        if ($titleElt.length) {
-                            $titleElt.html($titleElt.html().replace(/\d+(\.\d*)?|\.\d+/, newPrice));
-                        }
-                        jcf.replaceAll("#price-form-container");
-
-                        $("#listing_availabilities_prices_price_custom").val($price.val());
+                function () {
+                    //Replace price with new one on calendar
+                    var $titleElt = $('.fc-title-default');
+                    var $price = $("#listing_price_price");
+                    var newPrice = $price.val();
+                    newPrice = convertCurrency(newPrice, defaultCurrency, currentCurrency);
+                    if ($titleElt.length) {
+                        $titleElt.html($titleElt.html().replace(/\d+(\.\d*)?|\.\d+/, newPrice));
                     }
+                    jcf.replaceAll("#price-form-container");
+
+                    $("#listing_availabilities_prices_price_custom").val($price.val());
+                }
             );
             $("[data-toggle='tooltip']").tooltip();
         });
diff --git a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/index.html.twig b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/index.html.twig
index 8d520ef82..67a4bddb0 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/index.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Dashboard/Listing/index.html.twig
@@ -78,7 +78,7 @@
             </div>
 
             {% include '@CocoricoCore/Frontend/Common/_pagination.html.twig' with {
-            'pagination': pagination
+                'pagination': pagination
             } only %}
         </div>
     </div>
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Booking/form_booking_price.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Booking/form_booking_price.html.twig
index b89a315e0..aff2b5911 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/Booking/form_booking_price.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Booking/form_booking_price.html.twig
@@ -44,19 +44,16 @@
             } only %}
         {% endif %}
 
-        {#{% if form.vars['errors'] is empty %}#}
         {% if form.vars.submitted and form.vars.valid %}
-            <a href="#" data-id="submit-booking"
-               class="btn btn-default">{{ 'listing.show.book.now.submit'|trans }}</a>
+            <a href="#" data-id="submit-booking" class="btn btn-default">{{ 'listing.show.book.now.submit'|trans }}</a>
         {% else %}
             <a disabled data-id="submit-booking" class="btn btn-default">{{ 'listing.show.book.now.submit'|trans }}</a>
         {% endif %}
-        <span class="text">*{{ 'listing.show.excluding_booking_fees'|trans }}</span>
 
         {% set duration = booking.duration(endDayIncluded, timeUnit) %}
         {% if duration %}
             <em class="text">
-                {{ 'booking.duration:'|trans ~ " " ~ duration|add_time_unit_text }}
+                <strong>{{ 'booking.duration:'|trans ~ " " ~ duration|add_time_unit_text }}</strong>
             </em>
         {% endif %}
 
@@ -77,6 +74,8 @@
                 'listing_deposit': booking.listing.amountDepositDecimal
             } only %}
         {% endif %}
+
+        <em class="text small">*{{ 'listing.show.excluding_booking_fees'|trans }}</em>
     </div>
 
 
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Home/_high_rank.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Home/_high_rank.html.twig
index a19370635..4e0a5cfdb 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/Home/_high_rank.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Home/_high_rank.html.twig
@@ -45,7 +45,8 @@
                                                             <!-- rating -->
                                                             {% if listing.averageRating %}
                                                                 {{ listing.averageRating | cocorico_star_rating }}
-                                                                <span class="home-comment-counter">({{ listing.commentCount }})</span>
+                                                                <span class="home-comment-counter">({{ listing.commentCount }}
+                                                                    )</span>
                                                             {% endif %}
                                                             {% if  listing.certified %}
                                                                 <span class="certified">
@@ -75,6 +76,12 @@
 
                                                 <p>{{ listing_location.city }} </p>
                                             </div>
+
+                                            {% if bundleExist('CocoricoListingSessionBundle') and not app.request.xmlHttpRequest %}
+                                                {% include 'CocoricoListingSessionBundle:Frontend:ListingResult/_show_duration.html.twig' with {
+                                                    'duration': listing.duration
+                                                } only %}
+                                            {% endif %}
                                         </div>
                                     </div>
                                 </a>
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_images.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_images.html.twig
new file mode 100644
index 000000000..c0ea9f34d
--- /dev/null
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_images.html.twig
@@ -0,0 +1,45 @@
+{% trans_default_domain 'cocorico_listing' %}
+
+<div class="row">
+    <div class="file-selection">
+
+        <h2>{{ 'listing.edit.various_information.title'|trans }}</h2>
+        <strong class="sub-heading">{{ 'listing_edit.photos.title'|trans({'%max_images%': listing_img_max}) }}</strong>
+
+        <div class="area">
+            <div class="uploader">
+                <div id="images-new">
+                    {{ form_errors(form.image.new) }}
+                    {{ form_widget(form.image.new) }}
+
+                    {{ form_errors(form.image.uploaded) }}
+                    {{ form_widget(form.image.uploaded ) }}
+                </div>
+            </div>
+
+            <div class="detail">
+                <p>{{ 'listing_edit.photos.details'|trans }}</p>
+            </div>
+
+            <div style="clear:both"></div>
+
+            <div id="drop-zone">
+                {{ 'listing.drop.files'|trans }}
+            </div>
+
+            <h2>{{ 'listing.images.to_upload.title'|trans }}</h2>
+            <ul id="files-to-upload" class="images-list"></ul>
+        </div>
+
+        <!-- files-list -->
+        <div class="files-list">
+            <ul class="images-list">
+                {% for image in listing.images %}
+                    <li>
+                        <img src="{{ image.getWebPath | imagine_filter('listing_xsmall') }}" alt=""/>
+                    </li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_location.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_location.html.twig
new file mode 100644
index 000000000..2e1569ce5
--- /dev/null
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_location.html.twig
@@ -0,0 +1,116 @@
+{% trans_default_domain 'cocorico_listing' %}
+
+<div class="row">
+    <div class="form-inquiry">
+        <div class="columns-holder">
+            <div class="column" id="listing-location">
+                <h2>{{ 'listing.new.address.title'|trans }}</h2>
+
+                <p class="error"></p>
+                {{ form_errors(form.location.coordinate) }}
+                {{ form_widget(form.location.coordinate) }}
+
+                <div class="field-row">
+                    {{ form_errors(form.location.country) }}
+                    <span class="label">{{ form_label(form.location.country) }}</span>
+
+                    <div class="select-holder">
+                        {{ form_widget(form.location.country, {
+                            'attr': {
+                                'class': "no-arrow"
+                            }
+                        }) }}
+                    </div>
+                </div>
+                <div class="field-row">
+                    <div class="col location">
+                        {{ form_errors(form.location.city) }}
+                        <span class="label">{{ form_label(form.location.city) }}</span>
+
+                        <div class="field-holder">
+                            {{ form_widget(form.location.city, {
+                                'attr': {
+                                    'class': "form-control"
+                                }
+                            }) }}
+                        </div>
+                    </div>
+                    <div class="col postel-code">
+                        {{ form_errors(form.location.zip) }}
+                        <span class="label">{{ form_label(form.location.zip) }}</span>
+
+                        <div class="field-holder">
+                            {{ form_widget(form.location.zip, {
+                                'attr': {
+                                    'class': "form-control"
+                                }
+                            }) }}
+                        </div>
+                    </div>
+                </div>
+                <div class="field-row">
+                    <div class="col cell">
+                        {{ form_errors(form.location.street_number) }}
+                        <span class="label">
+                            {{ form_label(form.location.street_number) }}
+                            <button title="{{ 'listing.location.help'|trans }}"
+                                    data-placement="right"
+                                    data-toggle="tooltip" class="tooltip-button"
+                                    type="button"
+                                    data-original-title="{{ 'listing.location.help'|trans }}">
+                                                            ?
+                            </button>
+                        </span>
+
+                        <div class="field-holder">
+                            {{ form_widget(form.location.street_number, {
+                                'attr': {
+                                    'class': "form-control"
+                                }
+                            }) }}
+                        </div>
+                    </div>
+
+                    <div class="col street">
+                        {{ form_errors(form.location.route) }}
+                        <span class="label">{{ form_label(form.location.route) }}</span>
+
+                        <div class="field-holder">
+                            {{ form_widget(form.location.route, {
+                                'attr': {
+                                    'class': "form-control"
+                                }
+                            }) }}
+                        </div>
+                    </div>
+                </div>
+
+                <p>
+                    <a class="validate-location" href="javascript:void(0)">
+                        {{ 'listing.location.validate'|trans }}
+                    </a>
+                </p>
+
+                <p>
+                    <label> {{ 'listing.location.address_found'|trans }}</label>
+                    <strong id="formatted-address">{{ 'listing.location.none'|trans }}</strong>
+                </p>
+
+                <div class="alert alert-info" role="alert">
+                    <i class="ico arrow"></i>
+
+                    <p>{{ 'listing.location.drag_message'|trans }}</p>
+                </div>
+            </div>
+
+            <div class="column">
+                <div class="alert alert-success" role="alert">
+                    <i class="ico"><i class="icon-location"></i></i>
+
+                    <p>{{ 'listing.location.private_message'|trans }}</p>
+                </div>
+                <div id="map-listing" class="map-box"></div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_price.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_price.html.twig
new file mode 100644
index 000000000..a11f0b207
--- /dev/null
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/_new_price.html.twig
@@ -0,0 +1,45 @@
+{% trans_default_domain 'cocorico_listing' %}
+
+<div class="row">
+    <div class="block">
+        <h2>{{ 'listing.new.price.title'|trans }}</h2>
+
+        <div class="area">
+            <div class="price-box">
+                <div class="field-row">
+                    {{ form_errors(form.price) }}
+                    <span class="label">
+                        {{ 'listing.new.price.rent'|trans }}
+                        / {{ form_label(form.price, 0|add_time_unit_text|capitalize) }}
+                    </span>
+                    {{ form_widget(form.price, {
+                        'attr': {
+                            'class': 'numbers-only form-control',
+                            'help':  'listing.edit.price.help'|trans
+                        }
+                    }) }}
+                </div>
+
+                {% include 'CocoricoListingSessionBundle:Frontend:Listing/_form_duration.html.twig' ignore missing with { 'form': form } only %}
+
+                {% include 'CocoricoDeliveryBundle:Frontend:Listing/_form_delivery.html.twig' ignore missing with { 'form': form } only %}
+
+                {% include 'CocoricoCarrierBundle:Frontend:Listing/_form_carrier.html.twig' ignore missing with { 'form': form } only %}
+            </div>
+
+            <!-- simulator -->
+            <div class="currency-converter">
+                {% include '@CocoricoCore/Frontend/Common/_currency_converter.html.twig' with {'close' : true} only %}
+            </div>
+        </div>
+
+        <!-- alert -->
+        <div role="alert" class="alert alert-warning">
+            <i class="ico exclamation">!</i>
+
+            <p>
+                {{ 'listing.new.price_notice'| trans }}
+            </p>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/js/_calendar_js.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/js/_calendar_js.html.twig
index 0b9ea14a9..020c51ef2 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/js/_calendar_js.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/js/_calendar_js.html.twig
@@ -197,3 +197,8 @@
         {% endif %}
     });
 </script>
+
+{#Session bundle #}
+{% include '@CocoricoListingSession/Dashboard/Listing/js/_sync_timepicker_js.html.twig' ignore missing with {
+    'edit_mode': edit_mode
+}  only %}
\ No newline at end of file
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/new.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/new.html.twig
index 3d42db256..4d25c4324 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/new.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/Listing/new.html.twig
@@ -61,208 +61,11 @@
                                 </div>
                             </div>
 
-                            <div class="row">
-                                <div class="file-selection">
-
-                                    <h2>{{ 'listing.edit.various_information.title'|trans }}</h2>
-                                    <strong class="sub-heading">{{ 'listing_edit.photos.title'|trans({'%max_images%': listing_img_max}) }}</strong>
+                            {% include '@CocoricoCore/Frontend/Listing/_new_images.html.twig' with {'form': form, 'listing' : listing} only %}
 
-                                    <div class="area">
-                                        <div class="uploader">
-                                            <div id="images-new">
-                                                {{ form_errors(form.image.new) }}
-                                                {{ form_widget(form.image.new) }}
+                            {% include '@CocoricoCore/Frontend/Listing/_new_price.html.twig' with {'form': form} only %}
 
-                                                {{ form_errors(form.image.uploaded) }}
-                                                {{ form_widget(form.image.uploaded ) }}
-                                            </div>
-                                        </div>
-                                        <div class="detail">
-                                            <p>{{ 'listing_edit.photos.details'|trans }}</p>
-                                        </div>
-                                        <div style="clear:both"></div>
-                                        <div id="drop-zone">
-                                            {{ 'listing.drop.files'|trans }}
-                                        </div>
-                                        <h3>{{ 'listing.images.to_upload.title'|trans }}</h3>
-                                        <ul id="files-to-upload" class="images-list"></ul>
-                                    </div>
-                                    <!-- files-list -->
-                                    <div class="files-list">
-                                        <ul class="images-list">
-                                            {% for image in listing.images %}
-                                                <li>
-                                                    <img src="{{ image.getWebPath | imagine_filter('listing_xsmall') }}"
-                                                         alt=""/>
-                                                </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="block">
-                                    <h2>{{ 'listing.new.price.title'|trans }}</h2>
-                                    <!-- price-box -->
-                                    <div class="area">
-                                        <div class="price-box">
-                                            <strong class="title">
-                                                {{ 'listing.new.price.rent'|trans }}
-                                            </strong>
-
-                                            <div class="field-row">
-                                                {{ form_errors(form.price) }}
-                                                <span class="label">
-                                                {{ form_label(form.price, 0|add_time_unit_text|capitalize) }}
-                                            </span>
-                                                {{ form_widget(form.price, {
-                                                    'attr': {
-                                                        'class': 'numbers-only form-control',
-                                                        'help':  'listing.edit.price.help'|trans
-                                                    }
-                                                }) }}
-                                            </div>
-
-                                            {% if bundleExist('CocoricoDeliveryBundle') %}
-                                                {% include 'CocoricoDeliveryBundle:Frontend:Listing/_form_delivery.html.twig' with {
-                                                    'form': form
-                                                } only %}
-                                            {% elseif bundleExist('CocoricoCarrierBundle') %}
-                                                {% include 'CocoricoCarrierBundle:Frontend:Listing/_form_carrier.html.twig' with {
-                                                    'form': form
-                                                } only %}
-                                            {% endif %}
-                                        </div>
-                                        <!-- simulator -->
-                                        <div class="currency-converter">
-                                            {% include '@CocoricoCore/Frontend/Common/_currency_converter.html.twig' with {'close' : true} only %}
-                                        </div>
-                                    </div>
-                                    <!-- alert -->
-                                    <div role="alert" class="alert alert-warning">
-                                        <i class="ico exclamation">!</i>
-
-                                        <p>
-                                            {{ 'listing.new.price_notice'| trans }}
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="form-inquiry">
-                                    <div class="columns-holder">
-                                        <div class="column" id="listing-location">
-                                            <h2>{{ 'listing.new.address.title'|trans }}</h2>
-
-                                            <p class="error"></p>
-                                            {{ form_errors(form.location.coordinate) }}
-                                            {{ form_widget(form.location.coordinate) }}
-
-                                            <div class="field-row">
-                                                {{ form_errors(form.location.country) }}
-                                                <span class="label">{{ form_label(form.location.country) }}</span>
-
-                                                <div class="select-holder">
-                                                    {{ form_widget(form.location.country, {
-                                                        'attr': {
-                                                            'class': "no-arrow"
-                                                        }
-                                                    }) }}
-                                                </div>
-                                            </div>
-                                            <div class="field-row">
-                                                <div class="col location">
-                                                    {{ form_errors(form.location.city) }}
-                                                    <span class="label">{{ form_label(form.location.city) }}</span>
-
-                                                    <div class="field-holder">
-                                                        {{ form_widget(form.location.city, {
-                                                            'attr': {
-                                                                'class': "form-control"
-                                                            }
-                                                        }) }}
-                                                    </div>
-                                                </div>
-                                                <div class="col postel-code">
-                                                    {{ form_errors(form.location.zip) }}
-                                                    <span class="label">{{ form_label(form.location.zip) }}</span>
-
-                                                    <div class="field-holder">
-                                                        {{ form_widget(form.location.zip, {
-                                                            'attr': {
-                                                                'class': "form-control"
-                                                            }
-                                                        }) }}
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="field-row">
-                                                <div class="col cell">
-                                                    {{ form_errors(form.location.street_number) }}
-                                                    <span class="label">
-                                                    {{ form_label(form.location.street_number) }}
-                                                    <button title="{{ 'listing.location.help'|trans }}"
-                                                            data-placement="right"
-                                                            data-toggle="tooltip" class="tooltip-button"
-                                                            type="button"
-                                                            data-original-title="{{ 'listing.location.help'|trans }}">
-                                                        ?
-                                                    </button>
-                                                </span>
-
-
-                                                    <div class="field-holder">
-                                                        {{ form_widget(form.location.street_number, {
-                                                            'attr': {
-                                                                'class': "form-control"
-                                                            }
-                                                        }) }}
-                                                    </div>
-                                                </div>
-
-                                                <div class="col street">
-                                                    {{ form_errors(form.location.route) }}
-                                                    <span class="label">{{ form_label(form.location.route) }}</span>
-
-                                                    <div class="field-holder">
-                                                        {{ form_widget(form.location.route, {
-                                                            'attr': {
-                                                                'class': "form-control"
-                                                            }
-                                                        }) }}
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                            <p>
-                                                <a class="validate-location" href="javascript:void(0)">
-                                                    {{ 'listing.location.validate'|trans }}
-                                                </a>
-                                            </p>
-
-                                            <p>
-                                                <label> {{ 'listing.location.address_found'|trans }}</label>
-                                                <strong id="formatted-address">{{ 'listing.location.none'|trans }}</strong>
-                                            </p>
-
-                                            <div class="alert alert-info" role="alert">
-                                                <i class="ico arrow"></i>
-
-                                                <p>{{ 'listing.location.drag_message'|trans }}</p>
-                                            </div>
-                                        </div>
-
-                                        <div class="column">
-                                            <div class="alert alert-success" role="alert">
-                                                <i class="ico"><i class="icon-location"></i></i>
-
-                                                <p>{{ 'listing.location.private_message'|trans }}</p>
-                                            </div>
-                                            <div id="map-listing" class="map-box"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                            {% include '@CocoricoCore/Frontend/Listing/_new_location.html.twig' with {'form' : form} only %}
                         </div>
                     </fieldset>
                 </div>
@@ -333,4 +136,6 @@
         'upload_max': listing_img_max - listing.images.count,
     } only %}
 
+    {#Session #}
+    {% include '@CocoricoListingSession/Common/js/_init_timepicker_js.html.twig' ignore missing only %}
 {% endblock %}
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_marker.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_marker.html.twig
index 781afb9cd..7c80490ee 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_marker.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_marker.html.twig
@@ -65,7 +65,7 @@
 
                                 <div class="post-content">
                                     <div class="textbox">
-                                        <h2>%title%</h2>
+                                    <h2>%title% %duration%</h2>
                                         <span class="%certified%">
                                         <i class="icon-ok"></i>{{ 'listing.search.result.certified'|trans }}
                                     </span>
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_result_listings.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_result_listings.html.twig
index 2ee9afa31..bbabe2c60 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_result_listings.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/_result_listings.html.twig
@@ -28,23 +28,23 @@
                     <div class="box">
                         <div class="box-holder">
                             <div class="head">
-                                <div class="time-price">
-                                    <strong class="price">{{ price }}</strong>
+                                    <div class="time-price">
+                                        <strong class="price">{{ price }}</strong>
 
-                                    <p>
-                                        {{ vatInclusionText(app.request.getLocale()) }}
-                                        / {{ (0)|add_time_unit_text }}
-                                    </p>
-                                </div>
+                                        <p>
+                                            {{ vatInclusionText(app.request.getLocale()) }}
+                                            / {{ (0)|add_time_unit_text }}
+                                        </p>
+                                    </div>
                             </div>
                             <div class="foot">
                                 <div class="area">
                                     <div class="rating-block">
-                                    <!-- rating -->
-                                    {% if listing.averageRating %}
-                                        {{ listing.averageRating | cocorico_star_rating }}
+                                        <!-- rating -->
+                                        {% if listing.averageRating %}
+                                            {{ listing.averageRating | cocorico_star_rating }}
                                             <span class="comment-counter">({{ listing.commentCount }})</span>
-                                    {% endif %}
+                                        {% endif %}
                                     </div>
                                     {% if  listing.certified %}
                                         <span class="certified">
@@ -71,7 +71,7 @@
                     <div class="textbox">
                         {% if bundleExist('CocoricoDeliveryBundle') and not app.request.xmlHttpRequest %}
                             {% include 'CocoricoDeliveryBundle:Frontend:Listing/_show_delivery.html.twig' with {
-                            'listing_delivery': listing.delivery
+                                'listing_delivery': listing.delivery
                             } only %}
                         {% endif %}
 
@@ -79,6 +79,12 @@
 
                         <p>{{ listing_location.city }} </p>
 
+                        {% if bundleExist('CocoricoListingSessionBundle') and not app.request.xmlHttpRequest %}
+                            {% include 'CocoricoListingSessionBundle:Frontend:ListingResult/_show_duration.html.twig' with {
+                                'duration': listing.duration
+                            } only %}
+                        {% endif %}
+
                         {#<!--Debug:#}
                         {#accuracy : {{ listingTmp.accuracy|default(-1) }}<br/>#}
                         {#distance : {{ listingTmp.distance|default(-1) }}<br/>#}
diff --git a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/result.html.twig b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/result.html.twig
index 89d310512..6da19587d 100644
--- a/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/result.html.twig
+++ b/src/Cocorico/CoreBundle/Resources/views/Frontend/ListingResult/result.html.twig
@@ -202,15 +202,6 @@
 
             //Move seo desc to bottom
             $("[data-id=seo-desc]").appendTo("[data-id=seo-desc-moved]");
-
-            //Select change submit the form
-//            $("select[id^='characteristics_'], select#sort_by").change(function (e) {
-//                $(this).closest('form').submit();
-//            });
-//            $(".ui-slider").on("slidestop", function (event, ui) {
-//                $(this).closest('form').submit();
-//            });
-
         });
     </script>
 {% endblock %}
diff --git a/src/Cocorico/CoreBundle/Twig/CoreExtension.php b/src/Cocorico/CoreBundle/Twig/CoreExtension.php
index d17610db4..355dbcb17 100644
--- a/src/Cocorico/CoreBundle/Twig/CoreExtension.php
+++ b/src/Cocorico/CoreBundle/Twig/CoreExtension.php
@@ -149,7 +149,6 @@ public function getFilters()
     {
         return array(
             new Twig_SimpleFilter('repeat', array($this, 'stringRepeatFilter')),
-            new Twig_SimpleFilter('add_time_unit_text', array($this, 'addTimeUnitTextFilter')),
             new Twig_SimpleFilter('ucwords', 'ucwords'),
             new Twig_SimpleFilter('format_price', array($this, 'formatPriceFilter')),
             new Twig_SimpleFilter('strip_private_info', array($this, 'stripPrivateInfoFilter')),
@@ -166,43 +165,6 @@ public function stringRepeatFilter($input, $multiplier)
         return str_repeat($input, $multiplier);
     }
 
-    /**
-     * Add unit time text to duration value
-     *
-     * @param int    $duration
-     * @param string $locale
-     * @return string
-     */
-    public function addTimeUnitTextFilter($duration, $locale = null)
-    {
-        if ($this->timeUnitIsDay) {
-            if ($this->timeUnitAllDay) {
-                return $this->translator->transChoice(
-                    'time_unit_day',
-                    $duration,
-                    array('%count%' => $duration),
-                    'cocorico',
-                    $locale
-                );
-            } else {
-                return $this->translator->transChoice(
-                    'time_unit_night',
-                    $duration,
-                    array('%count%' => $duration),
-                    'cocorico',
-                    $locale
-                );
-            }
-        } else {
-            return $this->translator->transChoice(
-                'time_unit_hour',
-                $duration,
-                array('%count%' => $duration),
-                'cocorico',
-                $locale
-            );
-        }
-    }
 
     /**
      * @param int    $price
diff --git a/src/Cocorico/CoreBundle/Validator/Constraints/BookingValidator.php b/src/Cocorico/CoreBundle/Validator/Constraints/BookingValidator.php
index a5c25ca88..b4e5b9921 100644
--- a/src/Cocorico/CoreBundle/Validator/Constraints/BookingValidator.php
+++ b/src/Cocorico/CoreBundle/Validator/Constraints/BookingValidator.php
@@ -232,8 +232,8 @@ private function getViolations($booking, $constraint)
     /**
      * Build violations
      *
-     * @param Context|ExecutionContextInterface $context
-     * @param array $violations
+     * @param Context|\Symfony\Component\Validator\Context\ExecutionContextInterface $context
+     * @param array                                                                  $violations
      */
     public static function buildViolations($context, $violations)
     {
diff --git a/src/Cocorico/CoreBundle/Validator/Constraints/ListingDiscountValidator.php b/src/Cocorico/CoreBundle/Validator/Constraints/ListingDiscountValidator.php
index 2c75237fb..940be7c9a 100644
--- a/src/Cocorico/CoreBundle/Validator/Constraints/ListingDiscountValidator.php
+++ b/src/Cocorico/CoreBundle/Validator/Constraints/ListingDiscountValidator.php
@@ -35,8 +35,8 @@ public function __construct($minDiscount, $maxDiscount)
      */
     public function validate($listingDiscount, Constraint $constraint)
     {
-        /** @var $listingDiscount \Cocorico\CoreBundle\Entity\ListingDiscount */
-        /** @var $constraint \Cocorico\CoreBundle\Validator\Constraints\ListingDiscount */
+        /** @var \Cocorico\CoreBundle\Entity\ListingDiscount $listingDiscount */
+        /** @var \Cocorico\CoreBundle\Validator\Constraints\ListingDiscount $constraint */
 
         //Discount
         if ($listingDiscount->getDiscount() < $this->minDiscount) {
diff --git a/src/Cocorico/GeoBundle/Resources/views/Common/js/_geocoding_js.html.twig b/src/Cocorico/GeoBundle/Resources/views/Common/js/_geocoding_js.html.twig
index b7d575f7d..9516ee18f 100644
--- a/src/Cocorico/GeoBundle/Resources/views/Common/js/_geocoding_js.html.twig
+++ b/src/Cocorico/GeoBundle/Resources/views/Common/js/_geocoding_js.html.twig
@@ -689,6 +689,7 @@
                     var tmpContent = markerTemplate.replace('%title%', marker['title']);
                     tmpContent = tmpContent.replace('%data-src%', marker['image']);
                     tmpContent = tmpContent.replace('%price%', marker['price']);
+                    tmpContent = tmpContent.replace('%duration%', marker['duration']);
                     tmpContent = tmpContent.replace('%certified%', marker['certified']);
                     tmpContent = tmpContent.replace('%url%', marker['url']);
                     tmpContent = tmpContent.replace('%category%', marker['category']);
diff --git a/src/Cocorico/SonataUserBundle/Resources/views/Admin/Security/login.html.twig b/src/Cocorico/SonataUserBundle/Resources/views/Admin/Security/login.html.twig
index d80ff9cd6..02548bf34 100644
--- a/src/Cocorico/SonataUserBundle/Resources/views/Admin/Security/login.html.twig
+++ b/src/Cocorico/SonataUserBundle/Resources/views/Admin/Security/login.html.twig
@@ -77,7 +77,7 @@ file that was distributed with this source code.
                         {#</div>#}
                         <div class="col-xs-4">
                             <button type="submit"
-                                    class="btn btn-primary btn-block btn-flat">{{ 'security.login.submit'|trans({}, 'FOSUserBundle') }}</button>
+                                    class="btn btn-primary btn-block btn-flat">{{ 'security.login.submit'|trans({}, 'SonataUserBundle') }}</button>
                         </div>
                     </div>
                 </form>
diff --git a/src/Cocorico/TimeBundle/Form/DataTransformer/TimeRangeViewTransformer.php b/src/Cocorico/TimeBundle/Form/DataTransformer/TimeRangeViewTransformer.php
index cbc3d71a7..96ee5af55 100644
--- a/src/Cocorico/TimeBundle/Form/DataTransformer/TimeRangeViewTransformer.php
+++ b/src/Cocorico/TimeBundle/Form/DataTransformer/TimeRangeViewTransformer.php
@@ -110,6 +110,9 @@ private function reverseTransformWithDST(TimeRange $timeRange = null)
             $viewTimezone = $this->options['timezone'];
             $date = $timeRange->getDate();
 
+            if (!$date) {
+                return $timeRange;
+            }
             try {
                 foreach ($fields as $index => $field) {
                     $getter = 'get' . ucfirst($field);
diff --git a/src/Cocorico/TimeBundle/Form/Type/TimeRangeType.php b/src/Cocorico/TimeBundle/Form/Type/TimeRangeType.php
index 28ee5212b..46b62218a 100644
--- a/src/Cocorico/TimeBundle/Form/Type/TimeRangeType.php
+++ b/src/Cocorico/TimeBundle/Form/Type/TimeRangeType.php
@@ -27,7 +27,6 @@
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-//todo: Fix SF2.8 depreciated : use 'choices_as_values' => true and flip choices keys values
 class TimeRangeType extends AbstractType
 {
     protected $timezone;
@@ -63,6 +62,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             function (FormEvent $event) use ($options) {
                 $form = $event->getForm();
 
+                $timesMax = $this->timesMax;
+                if (isset($options['times_max']) && $options['times_max']) {
+                    $timesMax = $options['times_max'];
+                }
+
+                $timeUnit = $this->timeUnit;
+                if (isset($options['time_unit']) && $options['time_unit']) {
+                    $timeUnit = $options['time_unit'];
+                }
+
                 $form
                     ->add(
                         'start',
@@ -115,37 +124,41 @@ function (FormEvent $event) use ($options) {
                     ->add(
                         'start_picker',
                         TimeType::class,
-                        array(
-                            'mapped' => false,
-                            'widget' => 'single_text',
-                            /** @Ignore */
-                            'label' => false
+                        array_merge(
+                            array(
+                                'mapped' => false,
+                                'widget' => 'single_text',
+                                /** @Ignore */
+                                'label' => false
+                            ),
+                            $options['start_picker_options']
                         )
                     )
                     ->add(
                         'end_picker',
                         TimeType::class,
-                        array(
-                            'mapped' => false,
-                            'widget' => 'single_text',
-                            /** @Ignore */
-                            'label' => false
+                        array_merge(
+                            array(
+                                'mapped' => false,
+                                'widget' => 'single_text',
+                                /** @Ignore */
+                                'label' => false
+                            ),
+                            $options['end_picker_options']
                         )
                     );
 
 
                 //Times display mode: range or duration
                 if ($options['display_mode'] == "duration") {
-                    if ($this->timesMax > 1) {
-//                    if ($options['times_max'] > 1) { //Create times unit choice list limited to timesMax
+                    if ($timesMax > 1) {
                         $nbMinutes = null;
                         if (isset($options['start_options']['data']) && isset($options['end_options']['data'])) {
                             $timeRange = new TimeRange(
                                 $options['start_options']['data'],
                                 $options['end_options']['data']
                             );
-                            $nbMinutes = $timeRange->getDuration($this->timeUnit) * $this->timeUnit;
-//                            $nbMinutes = $timeRange->getDuration($options['time_unit']) * $options['time_unit'];
+                            $nbMinutes = $timeRange->getDuration($timeUnit) * $timeUnit;
                         }
 
                         /** @var DateRange $dateRange */
@@ -156,14 +169,8 @@ function (FormEvent $event) use ($options) {
                                 array(
                                     //from one time unit to timesMax * timeUnit
                                     'choices' => array_combine(
-                                        range(1, $this->timesMax),
-                                        range($this->timeUnit, $this->timesMax * $this->timeUnit, $this->timeUnit)
-//                                        range(1, $options['times_max']),
-//                                        range(
-//                                            $options['time_unit'],
-//                                            $options['times_max'] * $options['time_unit'],
-//                                            $options['time_unit']
-//                                        )
+                                        range(1, $timesMax),
+                                        range($timeUnit, $timesMax * $timeUnit, $timeUnit)
                                     ),
                                     'data' => $nbMinutes,
                                     /** @Ignore */
@@ -179,8 +186,7 @@ function (FormEvent $event) use ($options) {
                                 'nb_minutes',
                                 HiddenType::class,
                                 array(
-                                    'data' => $this->timeUnit,
-//                                    'data' => $options['time_unit']
+                                    'data' => $timeUnit,
                                 )
                             );
                     }
@@ -243,12 +249,14 @@ public function configureOptions(OptionsResolver $resolver)
                 'data_class' => 'Cocorico\TimeBundle\Model\TimeRange',
                 'start_options' => array(),
                 'end_options' => array(),
+                'start_picker_options' => array(),
+                'end_picker_options' => array(),
                 'transformer' => null,
                 'validator' => null,
                 'translation_domain' => 'cocorico_listing',
                 'display_mode' => 'range',
-//                'time_unit' => $this->timeUnit,
-//                'times_max' => $this->timesMax,
+                'times_max' => null,
+                'time_unit' => null,
             )
         );
 
diff --git a/src/Cocorico/TimeBundle/Resources/config/Services/twig_extensions.yml b/src/Cocorico/TimeBundle/Resources/config/Services/twig_extensions.yml
index fadaff86a..d167681f6 100644
--- a/src/Cocorico/TimeBundle/Resources/config/Services/twig_extensions.yml
+++ b/src/Cocorico/TimeBundle/Resources/config/Services/twig_extensions.yml
@@ -3,6 +3,7 @@ services:
     cocorico_time.twig.time_extension:
         class: Cocorico\TimeBundle\Twig\TimeExtension
         arguments:
+          - "@translator.default"
           - "%cocorico.time_unit%"
           - "%cocorico.time_unit_allday%"
         tags:
diff --git a/src/Cocorico/TimeBundle/Twig/TimeExtension.php b/src/Cocorico/TimeBundle/Twig/TimeExtension.php
index 5e15c2c9b..df034a9aa 100644
--- a/src/Cocorico/TimeBundle/Twig/TimeExtension.php
+++ b/src/Cocorico/TimeBundle/Twig/TimeExtension.php
@@ -13,16 +13,27 @@
 namespace Cocorico\TimeBundle\Twig;
 
 use Cocorico\TimeBundle\Utils\PHP;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class TimeExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
 {
+    protected $translator;
+    protected $timeUnit;
+    protected $timeUnitAllDay;
+    protected $timeUnitIsDay;
 
     /**
      * TimeExtension constructor.
+     * @param TranslatorInterface $translator
+     * @param                     $timeUnit
+     * @param                     $timeUnitAllDay
      */
-    public function __construct()
+    public function __construct(TranslatorInterface $translator, $timeUnit, $timeUnitAllDay)
     {
-
+        $this->translator = $translator;
+        $this->timeUnit = $timeUnit;
+        $this->timeUnitAllDay = $timeUnitAllDay;
+        $this->timeUnitIsDay = ($timeUnit % 1440 == 0) ? true : false;
     }
 
     /**
@@ -33,11 +44,50 @@ public function __construct()
     public function getFilters()
     {
         return array(
+            new \Twig_SimpleFilter('add_time_unit_text', array($this, 'addTimeUnitTextFilter')),
             new \Twig_SimpleFilter('format_seconds', array($this, 'formatSecondsFilter')),
             new \Twig_SimpleFilter('timezone_name', array($this, 'timezoneName'))
         );
     }
 
+    /**
+     * Add unit time text to duration value
+     *
+     * @param int    $duration
+     * @param string $locale
+     * @return string
+     */
+    public function addTimeUnitTextFilter($duration, $locale = null)
+    {
+        if ($this->timeUnitIsDay) {
+            if ($this->timeUnitAllDay) {
+                return $this->translator->transChoice(
+                    'time_unit_day',
+                    $duration,
+                    array('%count%' => $duration),
+                    'cocorico',
+                    $locale
+                );
+            } else {
+                return $this->translator->transChoice(
+                    'time_unit_night',
+                    $duration,
+                    array('%count%' => $duration),
+                    'cocorico',
+                    $locale
+                );
+            }
+        } else {
+            return $this->translator->transChoice(
+                'time_unit_hour',
+                $duration,
+                array('%count%' => $duration),
+                'cocorico',
+                $locale
+            );
+        }
+    }
+
     /**
      * Format time from seconds to unit
      *
diff --git a/web/css/all-override.css b/web/css/all-override.css
index 3f746bdd9..ac223c293 100644
--- a/web/css/all-override.css
+++ b/web/css/all-override.css
@@ -1,3 +1,7 @@
+.text-weight-normal {
+    font-weight: normal;
+}
+
 /*Favourite active class*/
 .listing-post .favourit {
     cursor: pointer;
@@ -462,6 +466,16 @@ li.time-fields {
     clear: both;
 }
 
+#booking-price-form .time-fields.display-range {
+    float: left;
+    width: 100%;
+}
+
+#booking-price-form .time-fields.display-range .col + .col {
+    float: right;
+    width: 46%;
+}
+
 #booking-price-form .time-fields .col .title {
     clear: both;
     margin-right: 10px;
@@ -471,6 +485,10 @@ li.time-fields {
     margin: 0 0 0 43px;
 }
 
+#booking-price-form .time-fields.display-range .col + .col .title {
+    margin: 0 0 0 20px;
+}
+
 #booking-price-form .time-fields label {
     font-size: 14px;
 }
@@ -590,12 +608,35 @@ li.time-fields {
     float: right;
     margin: 8px 0 0 5px;
     font-size: 16px;
+    min-width: 60px;
 }
 
 .price-box .field-holder {
     max-width: 110px;
 }
 
+.price-box .timepicker-holder {
+    float: left;
+}
+
+.price-box .timepicker-holder .form-control {
+    float: left;
+    width: 110px;
+}
+
+.price-box .timepicker-holder .add-on {
+    position: absolute;
+}
+
+.price-box .timepicker-holder .icon-clock {
+    font-size: 22px;
+    color: #c6cdd2;
+    cursor: pointer;
+    width: 110px;
+    -webkit-transition: all 0.35s ease;
+    transition: all 0.35s ease;
+}
+
 /* user edit_payment.html.twig */
 .form-area .payment-info .field-day, .form-signup .field-day {
     width: 29%;
@@ -775,6 +816,10 @@ li.time-fields {
     width: 52px;
 }
 
+.price-range .agenda {
+    max-width: 240px;
+}
+
 /** edit_availabilities_status.html.twig **/
 .form-area .form-block .field-row > .col.cell {
     width: 25%;
@@ -1158,6 +1203,13 @@ li.time-fields {
 }
 
 /*similar listing css*/
+section.widget.similar-ads h2 {
+    margin: 0 0 6px;
+}
+
+section.similar-ads p {
+    font-size: 12px;
+}
 section.similar-ads .listing-post {
     margin-bottom: 0;
 }
@@ -1325,6 +1377,10 @@ images css for making it 4:3
     font-size: 9px;
 }
 
+.listing-post p {
+    margin: 0 0 0;
+}
+
 .price-section .info.price {
     font-size: 16px;
     display: inline-block;
@@ -1448,12 +1504,12 @@ images css for making it 4:3
 .postarea .booking-detail .timezone {
     float: right;
 }
+
 .postarea .booking-detail ul {
     width: 68%;
     margin: 0;
 }
 
-
 .postarea .booking-detail ul li, .postarea .booking-detail ul li:last-child {
     text-align: left;
     width: 49%;
diff --git a/web/css/all.css b/web/css/all.css
index 9f13d6cd3..6feb18f61 100644
--- a/web/css/all.css
+++ b/web/css/all.css
@@ -7983,7 +7983,7 @@ label {
 .price-box {
     display: inline-block;
     vertical-align: top;
-    width: 350px;
+    /*width: 350px;*/
     color: #58595b;
     border-radius: 5px;
     margin: 0 4.7% 0 3.5%;
@@ -8027,7 +8027,7 @@ label {
 
 .price-box .label {
     float: left;
-    width: 140px;
+    width: 175px;
     text-align: right;
     margin: 7px 11px 0 0;
 }
diff --git a/web/js/date-time.js b/web/js/date-time.js
index 553cd29fc..586c59fe2 100644
--- a/web/js/date-time.js
+++ b/web/js/date-time.js
@@ -68,48 +68,51 @@ function initDatepicker() {
 
 /**
  * Init timePicker fields.
+ * Sync corresponding hidden hour and minute fields with current time picker value
  *
- * @param parentTimesElt string
+ * @param  parentTimesElt string
+ * @param fields array
+ * @param duration array
  */
-function initTimePicker(parentTimesElt) {
+function initTimePicker(parentTimesElt, fields) {
     var timePickerCompatible = true;
     if (/Edge|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
         timePickerCompatible = false;
     }
+    fields = typeof fields !== 'undefined' ? fields : ['start', 'end'];
 
     $(parentTimesElt).each(function () {
         var holder = $(this);
-        //Time Pickers
-        var pickers = ['start', 'end'];
-        pickers.forEach(function (picker) {
-            var $picker = holder.find("[id$=_" + picker + "_picker]").first();
-
-            if ($picker.length) {
-                if (!timePickerCompatible) $picker.attr('type', 'text');
-                $picker.prev('.add-on').find('.icon-clock').on('click', function () {
-                    $picker.focus();
+
+        fields.forEach(function (field) {
+            var $field = holder.find("[id$=_" + field + "_picker]").first();
+
+            if ($field.length) {
+                if (!timePickerCompatible) $field.attr('type', 'text');
+                $field.prev('.add-on').find('.icon-clock').on('click', function () {
+                    $field.focus();
                 });
-                $picker.next('.add-on').find('.icon-clock').on('click', function () {
-                    $picker.focus();
+                $field.next('.add-on').find('.icon-clock').on('click', function () {
+                    $field.focus();
                 });
-                var $hour = holder.find("[id$=_" + picker + "_hour]").first();
-                var $minute = holder.find("[id$=_" + picker + "_minute]").first();
+                var $hour = holder.find("[id$=_" + field + "_hour]").first();
+                var $minute = holder.find("[id$=_" + field + "_minute]").first();
 
                 var defaultTime = '';
                 if ($hour.val() !== '' && $minute.val() !== '') {
                     defaultTime = moment($hour.val() + ":" + $minute.val(), 'HH:mm');
                 }
 
-                $picker.datetimepicker({
+                $field.datetimepicker({
                     format: 'HH:mm',
                     stepping: 15,
                     defaultDate: defaultTime,
                     useCurrent: false,
                     enabledHours: hoursAvailable
-                    //,debug: true
+                    // ,debug: true
                 }).on('dp.hide', function (e) {
                     var date = e.date;
-                    if (date && $picker.val()) {
+                    if (date && $field.val()) {
                         $hour.val(date.format("H"));
                         $minute.val(date.format("m")).change();
                     } else {
@@ -121,7 +124,7 @@ function initTimePicker(parentTimesElt) {
                     //Lib vs 4.17.43 fix this above issue but create a new one with useCurrent :/
                     if (!$(this).data('DateTimePicker').date()) {
                         $(this).data('DateTimePicker').defaultDate(moment(hoursAvailable[0] + ":" + "0", 'HH:mm'));
-                        $picker.val('');
+                        $field.val('');
                     }
                 });
             }