diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
old mode 100755
new mode 100644
diff --git a/.gitignore b/.gitignore
index d607a621127..3566606ab6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,31 +2,37 @@
 !.gitignore
 !.htaccess
 !.gitkeep
+/composer.phar
+
 /app/bootstrap*
 /app/tests.bootstrap*
+/app/phpunit.xml
+
 /app/bundles/CoreBundle/Assets/css/app/less/**/*.css
 /app/bundles/CoreBundle/Assets/css/libraries/**/*.css
 /app/bundles/CoreBundle/Assets/css/libraries/Froala/plugins/*.css
 !/app/bundles/CoreBundle/Assets/css/libraries/builder.css
 !/app/bundles/CoreBundle/Assets/css/libraries/froala/plugins/gated_video.css
 !/app/bundles/CoreBundle/Assets/css/*.css
+
 /app/cache/*
 !/app/cache/.gitkeep
-/app/logs/*
-!/app/logs/.gitkeep
+
 /app/config/local*.php
 /app/config/config_local.php
 /app/config/paths_local.php
+
+/app/logs/*
+!/app/logs/.gitkeep
+
 /app/Resources/SensioGeneratorBundle
-/app/phpunit.xml
 /app/spool/*
+
 /vendor/*
 !/vendor/.htaccess
+
 /bin/*
-/composer.phar
 /bundles
-/media/files/*
-!/media/files/.htaccess
 /node_modules
 /build/packaging
 /build/packages/*
@@ -34,7 +40,11 @@
 /mockup
 /upgrade
 /upgrade_errors.txt
-/translations
+
+/media/dashboards/*
+!/media/dashboards/*.json
+/media/files/*
+!/media/files/.htaccess
 /media/images/*
 !/media/images/flags
 !/media/images/apple-touch-icon.png
@@ -42,5 +52,31 @@
 !/media/images/favicon.ico
 !/media/images/mautic_logo*
 !/media/images/.htaccess
-/media/dashboards/*
-!/media/dashboards/*.json
\ No newline at end of file
+
+/plugins/*
+!/plugins/MauticCitrixBundle
+!/plugins/MauticClearbitBundle
+!/plugins/MauticCloudStorageBundle
+!/plugins/MauticCrmBundle
+!/plugins/MauticEmailMarketingBundle
+!/plugins/MauticFocusBundle
+!/plugins/MauticFullContactBundle
+!/plugins/MauticGmailBundle
+!/plugins/MauticOutlookBundle
+!/plugins/MauticSocialBundle
+!/plugins/index.html
+
+/themes/*
+!/themes/blank
+!/themes/coffee
+!/themes/goldstar
+!/themes/Mauve
+!/themes/nature
+!/themes/neopolitan
+!/themes/oxygen
+!/themes/skyline
+!/themes/sunday
+!/themes/blank.png
+!/themes/blank-big.png
+
+/translations
diff --git a/.travis.yml b/.travis.yml
index dc57895ccc7..b71b9eef83c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,10 @@ php:
   #- 5.5
   - 5.6
   - 7.0
-  - 7.1
+
+matrix:
+  allow_failures:
+    - php: 7.0
 
 before_script:
   - composer install
diff --git a/Gruntfile.js b/Gruntfile.js
index e01445a8f9b..88a2c6ba423 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,6 +17,7 @@ module.exports = function (grunt) {
         mautic: {
             // configurable paths
             bundleAssets: 'app/bundles/**/Assets/css',
+            pluginAssets: 'plugins/**/Assets/css',
             rootAssets: 'media/css'
         },
 
@@ -31,7 +32,7 @@ module.exports = function (grunt) {
         // Compiles less files in bundle's Assets/css root and single level directory to CSS
         less: {
             files: {
-                src: ['<%= mautic.bundleAssets %>/*.less', '<%= mautic.bundleAssets %>/*/*.less', '<%= mautic.bundleAssets %>/../builder/*.less'],
+                src: ['<%= mautic.bundleAssets %>/*.less', '<%= mautic.pluginAssets %>/*.less', '<%= mautic.bundleAssets %>/*/*.less', '<%= mautic.bundleAssets %>/../builder/*.less'],
                 expand: true,
                 rename: function (dest, src) {
                     return dest + src.replace('.less', '.css')
diff --git a/README.md b/README.md
index 6b06a7fa2f6..178f5a6737e 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Installing from source is only recommended if you are comfortable using the comm
 #### Mautic requirements
 
 1. See [Mautic requirements](https://www.mautic.org/download/requirements).
-2. PHP modules: 
+2. PHP modules:
 	- required: `zip`, `xml`, `mcrypt`, `imap`, `mailparse`
 	- recommended: `openssl`, `opcache` / `apcu` / `memcached`
 	- recommended for development: `xdebug`
@@ -76,32 +76,32 @@ Before running these commands, please make a backup of your database.
 
 If updating from <a href="https://github.com/mautic/mautic/releases">a tagged release</a> to <a href="https://github.com/mautic/mautic/releases">a tagged release</a>, schema changes will be included in a migrations file. To apply the changes, run
 
-    `$ php app/console doctrine:migrations:migrate`
+    $ php app/console doctrine:migrations:migrate
 
 If you are updating to the latest source (remember this is alpha), first run
 
-    `$ php app/console doctrine:schema:update --dump-sql`
+    $ php app/console doctrine:schema:update --dump-sql
 
 This will list out the queries Doctrine wants to execute in order to get the schema up-to-date (no queries are actually executed). Review the queries to ensure there is nothing detrimental to your data. If you have doubts about a query, submit an issue here and we'll verify it.
 
 If you're satisfied with the queries, execute them with
 
-    `$ php app/console doctrine:schema:update --force`
+    $ php app/console doctrine:schema:update --force
 
 Your schema should now be up-to-date with the source.
 
 # Usage
 
-Learning how to use marketing automation can be challenging. The first step is to understand what marketing automation is and how it can help your business be more successful. This quick usage outline is not meant to be comprehensive but will outline a few key areas of Mautic and how to use each of them.  
+Learning how to use marketing automation can be challenging. The first step is to understand what marketing automation is and how it can help your business be more successful. This quick usage outline is not meant to be comprehensive but will outline a few key areas of Mautic and how to use each of them.
 
 *You can find more detailed information at <a href="https://docs.mautic.org">https://docs.mautic.org</a>*
 
 ### 1. Monitoring
 
-The act of monitoring website traffic and visitors is often the first step in a marketing automation system. This step involves collecting details and information about each visitor to your website.  
+The act of monitoring website traffic and visitors is often the first step in a marketing automation system. This step involves collecting details and information about each visitor to your website.
 
 #### Visitor Types
-There are two types of visitor, **anonymous** and **known**.  
+There are two types of visitor, **anonymous** and **known**.
 
 **Anonymous visitors** are all visitors which browse to your website. These visitors are monitored and certain key pieces of information are collected. This information includes:
 
@@ -143,16 +143,16 @@ There are several ways to connect with your leads. The three most common are **e
 
 **Landing pages** are usually the first step in the connection process as these are used to make initial contact with leads and collect the information to move them from an anonymous visitor to a known visitor. These pages are used to funnel visitors to a specific call to action. This call to action is usually a form to collect the visitor's information.
 
-###3. Automating
+### 3. Automating
 
-One of Mautic's main purposes is to enable automation of specific tasks. The task of connecting with leads is one such area where automation becomes increasingly valuable. Mautic allows you to define specific times, events, or actions when a connection should be triggered. Here is an example of an automation process.  
+One of Mautic's main purposes is to enable automation of specific tasks. The task of connecting with leads is one such area where automation becomes increasingly valuable. Mautic allows you to define specific times, events, or actions when a connection should be triggered. Here is an example of an automation process.
 
 **Example**
-A visitor fills out a call-to-action form on your landing page. This form collects their email address and automatically moves them from an **anonymous** to a **known** visitor. As a known visitor they are now added as a new lead to a specific campaign. This campaign will send the new lead an email you have pre-defined. You can then define additional actions to be taken based on the lead's response to your email.  
+A visitor fills out a call-to-action form on your landing page. This form collects their email address and automatically moves them from an **anonymous** to a **known** visitor. As a known visitor they are now added as a new lead to a specific campaign. This campaign will send the new lead an email you have pre-defined. You can then define additional actions to be taken based on the lead's response to your email.
 
-This example demonstrates several uses of automation. First, the visitor is *automatically* moved from anonymous to known status. Second, the visitor is *automatically* added to a particular campaign. Lastly the visitor is sent an email *automatically* as a new lead.  
+This example demonstrates several uses of automation. First, the visitor is *automatically* moved from anonymous to known status. Second, the visitor is *automatically* added to a particular campaign. Lastly the visitor is sent an email *automatically* as a new lead.
 
-There are many more ways in which automation can be used throughout Mautic to improve efficiency and reduce the time you spend connecting with your leads. As mentioned earlier, refer to [https://docs.mautic.org](https://docs.mautic.org) for more details.  
+There are many more ways in which automation can be used throughout Mautic to improve efficiency and reduce the time you spend connecting with your leads. As mentioned earlier, refer to [https://docs.mautic.org](https://docs.mautic.org) for more details.
 
 ## Customizing - Plugins, Themes
 
@@ -168,7 +168,7 @@ Read more about API and webhooks in the [Mautic Developer Docummentation](https:
 
 ## Translations
 
-One benefit of using Mautic is the ability to modify and customize the solution to fit your needs. Mautic allows you to quickly change to your preferred language, or modify any string through the language files. These language files are available for the translation by the community at [Transifex](https://www.transifex.com/mautic/mautic/dashboard) and if you are interested you can add more languages, or help to translate the current ones.  
+One benefit of using Mautic is the ability to modify and customize the solution to fit your needs. Mautic allows you to quickly change to your preferred language, or modify any string through the language files. These language files are available for the translation by the community at [Transifex](https://www.transifex.com/mautic/mautic/dashboard) and if you are interested you can add more languages, or help to translate the current ones.
 
 ## How to test a pull request
 
@@ -207,7 +207,7 @@ Every change to Mautic core happens via PRs. Every PR must have 2 successful tes
 
 ## Unit Tests
 
-The unit tests can be executed in the Mautic root directory with `phpunit --bootstrap vendor/autoload.php --configuration app/phpunit.xml.dist app/bundles` command.
+The unit tests can be executed in the Mautic root directory with `composer test` command.
 
 # FAQ and Contact Information
 Marketing automation has historically been a difficult tool to implement in a business. The Mautic community is a rich environment for you to learn from others and share your knowledge as well. Open source means more than open code. Open source is providing equality for all and a chance to improve. If you have questions then the Mautic community can help provide the answers.
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 1d31f40e67f..7f4eb1133c7 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -34,7 +34,7 @@ class AppKernel extends Kernel
      *
      * @const integer
      */
-    const MINOR_VERSION = 6;
+    const MINOR_VERSION = 8;
 
     /**
      * Patch version number.
@@ -181,6 +181,7 @@ public function registerBundles()
             new Mautic\WebhookBundle\MauticWebhookBundle(),
             new LightSaml\SymfonyBridgeBundle\LightSamlSymfonyBridgeBundle(),
             new LightSaml\SpBundle\LightSamlSpBundle(),
+            new Ivory\OrderedFormBundle\IvoryOrderedFormBundle(),
         ];
 
         //dynamically register Mautic Plugin Bundles
diff --git a/app/bundles/ApiBundle/Translations/en_US/messages.ini b/app/bundles/ApiBundle/Translations/en_US/messages.ini
index 170b41fbf80..64d4c62b5df 100644
--- a/app/bundles/ApiBundle/Translations/en_US/messages.ini
+++ b/app/bundles/ApiBundle/Translations/en_US/messages.ini
@@ -7,7 +7,7 @@ mautic.api.auth.error.signature_method_rejected="The signature method used is un
 mautic.api.auth.error.signature_invalid="The signature provided does not match the one calculated by the service."
 mautic.api.auth.error.consumer_key_unknown="The consumer key provided is unsupported."
 mautic.api.auth.error.token_expired="The access token provided is valid, but has expired."
-mautic.api.auth.error.token_rejected="The token provided does not have the right format.";
+mautic.api.auth.error.token_rejected="The token provided does not have the right format."
 mautic.api.auth.error.additional_authorization_required="The access token does not have the correct access scopes."
 permission_denied="The access session handle (ASH) has expired or is invalid."
 mautic.api.call.notfound="Object not found."
diff --git a/app/bundles/AssetBundle/EventListener/ReportSubscriber.php b/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
index 79bfcada4d1..af5b9081016 100644
--- a/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
@@ -68,7 +68,13 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 ],
             ];
 
-            $columns = array_merge($columns, $event->getStandardColumns($prefix, ['name'], 'mautic_asset_action'), $event->getCategoryColumns());
+            $columns = array_merge(
+                $columns,
+                $event->getStandardColumns($prefix, ['name'], 'mautic_asset_action'),
+                $event->getCategoryColumns(),
+                $event->getCampaignByChannelColumns()
+            );
+
             $event->addTable(
                 'assets',
                 [
@@ -107,7 +113,12 @@ public function onReportBuilder(ReportBuilderEvent $event)
                     'asset.downloads',
                     [
                         'display_name' => 'mautic.asset.report.downloads.table',
-                        'columns'      => array_merge($columns, $downloadColumns, $event->getLeadColumns(), $event->getIpColumn()),
+                        'columns'      => array_merge(
+                            $columns,
+                            $downloadColumns,
+                            $event->getLeadColumns(),
+                            $event->getIpColumn()
+                        ),
                     ],
                     'assets'
                 );
@@ -135,6 +146,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
         if ($context == 'assets') {
             $queryBuilder->from(MAUTIC_TABLE_PREFIX.'assets', 'a');
             $event->addCategoryLeftJoin($queryBuilder, 'a');
+            $event->addCampaignByChannelJoin($queryBuilder, 'a', 'asset');
         } elseif ($context == 'asset.downloads') {
             $event->applyDateFilters($queryBuilder, 'date_download', 'ad');
 
@@ -143,6 +155,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
             $event->addCategoryLeftJoin($queryBuilder, 'a');
             $event->addLeadLeftJoin($queryBuilder, 'ad');
             $event->addIpAddressLeftJoin($queryBuilder, 'ad');
+            $event->addCampaignByChannelJoin($queryBuilder, 'a', 'asset');
         }
 
         $event->setQueryBuilder($queryBuilder);
diff --git a/app/bundles/CampaignBundle/Config/config.php b/app/bundles/CampaignBundle/Config/config.php
index 2ed53c09267..b3edd8d31ed 100644
--- a/app/bundles/CampaignBundle/Config/config.php
+++ b/app/bundles/CampaignBundle/Config/config.php
@@ -200,7 +200,7 @@
             ],
             'mautic.form.type.campaignconfig' => [
                 'class'     => 'Mautic\CampaignBundle\Form\Type\ConfigType',
-                'arguments' => 'mautic.factory',
+                'arguments' => 'translator',
                 'alias'     => 'campaignconfig',
             ],
         ],
diff --git a/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php b/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
index 969b199722a..2166efd4064 100644
--- a/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
+++ b/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
@@ -92,8 +92,8 @@ public function getLeadLogs($leadId, array $options = [])
                       ->leftJoin('ll', MAUTIC_TABLE_PREFIX.'campaign_events', 'e', 'll.event_id = e.id')
                       ->leftJoin('ll', MAUTIC_TABLE_PREFIX.'campaigns', 'c', 'll.campaign_id = c.id')
                       ->where('ll.lead_id = '.(int) $leadId)
-                      ->andWhere('e.event_type = :eventType')
-                      ->setParameter('eventType', 'action');
+                      ->andWhere('e.event_type != :eventType')
+                      ->setParameter('eventType', 'decision');
 
         if (isset($options['scheduledState'])) {
             if ($options['scheduledState']) {
@@ -176,8 +176,14 @@ public function getUpcomingEvents(array $options = null)
         }
 
         if (isset($options['eventType'])) {
-            $query->andwhere('e.event_type = :eventType')
-                ->setParameter('eventType', $options['eventType']);
+            if (is_array($options['eventType'])) {
+                $query->andWhere(
+                    $query->expr()->in('e.event_type', array_map([$query->expr(), 'literal'], $options['eventType']))
+                );
+            } else {
+                $query->andwhere('e.event_type = :eventTypes')
+                    ->setParameter('eventTypes', $options['eventType']);
+            }
         }
 
         if (isset($options['limit'])) {
diff --git a/app/bundles/CampaignBundle/Form/Type/ConfigType.php b/app/bundles/CampaignBundle/Form/Type/ConfigType.php
index a6b35b8b08c..79c0f15d823 100644
--- a/app/bundles/CampaignBundle/Form/Type/ConfigType.php
+++ b/app/bundles/CampaignBundle/Form/Type/ConfigType.php
@@ -1,5 +1,14 @@
 <?php
-// plugins/HelloWorldBundle/Form/Type/ConfigType.php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
 namespace Mautic\CampaignBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
diff --git a/app/bundles/CampaignBundle/Model/CampaignModel.php b/app/bundles/CampaignBundle/Model/CampaignModel.php
index dff3f92f69f..78df2d0e9b7 100644
--- a/app/bundles/CampaignBundle/Model/CampaignModel.php
+++ b/app/bundles/CampaignBundle/Model/CampaignModel.php
@@ -290,6 +290,7 @@ public function setEvents(Campaign $entity, $sessionEvents, $sessionConnections,
         }
 
         $relationships = [];
+
         if (isset($sessionConnections['connections'])) {
             foreach ($sessionConnections['connections'] as $connection) {
                 $source = $connection['sourceId'];
@@ -299,7 +300,12 @@ public function setEvents(Campaign $entity, $sessionEvents, $sessionConnections,
                     // Only concerned with events and not sources
                     continue;
                 }
-                $sourceDecision = (!empty($connection['anchors'][0])) ? $connection['anchors'][0]['endpoint'] : null;
+
+                if (isset($connection['anchors']['source'])) {
+                    $sourceDecision = $connection['anchors']['source'];
+                } else {
+                    $sourceDecision = (!empty($connection['anchors'][0])) ? $connection['anchors'][0]['endpoint'] : null;
+                }
 
                 if ($sourceDecision == 'leadsource') {
                     // Lead source connection that does not matter
diff --git a/app/bundles/CampaignBundle/Model/EventModel.php b/app/bundles/CampaignBundle/Model/EventModel.php
index de93602ef32..82b2de2e401 100644
--- a/app/bundles/CampaignBundle/Model/EventModel.php
+++ b/app/bundles/CampaignBundle/Model/EventModel.php
@@ -390,6 +390,7 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
                         } elseif ($child['decisionPath'] == 'no') {
                             // non-action paths should not be processed by this because the contact already took action in order to get here
                             $childrenTriggered = true;
+                            $this->logger->debug('CAMPAIGN: '.ucfirst($child['eventType']).' ID# '.$child['id'].' has a decision path of no');
                         } else {
                             $this->logger->debug('CAMPAIGN: '.ucfirst($child['eventType']).' ID# '.$child['id'].' is being processed');
                         }
@@ -626,8 +627,9 @@ public function triggerStartingEvents(
                         ++$totalEventCount;
 
                         $event['campaign'] = [
-                            'id'   => $campaign->getId(),
-                            'name' => $campaign->getName(),
+                            'id'        => $campaign->getId(),
+                            'name'      => $campaign->getName(),
+                            'createdBy' => $campaign->getCreatedBy(),
                         ];
 
                         $decisionEvent = [
@@ -769,8 +771,7 @@ public function triggerScheduledEvents(
     ) {
         defined('MAUTIC_CAMPAIGN_SYSTEM_TRIGGERED') or define('MAUTIC_CAMPAIGN_SYSTEM_TRIGGERED', 1);
 
-        $campaignId   = $campaign->getId();
-        $campaignName = $campaign->getName();
+        $campaignId = $campaign->getId();
 
         $this->logger->debug('CAMPAIGN: Triggering scheduled events');
 
@@ -903,8 +904,9 @@ public function triggerScheduledEvents(
 
                     // Set campaign ID
                     $event['campaign'] = [
-                        'id'   => $campaignId,
-                        'name' => $campaignName,
+                        'id'        => $campaign->getId(),
+                        'name'      => $campaign->getName(),
+                        'createdBy' => $campaign->getCreatedBy(),
                     ];
 
                     // Execute event
@@ -1011,8 +1013,6 @@ public function triggerNegativeEvents(
         $this->logger->debug('CAMPAIGN: Triggering negative events');
 
         $campaignId   = $campaign->getId();
-        $campaignName = $campaign->getName();
-
         $repo         = $this->getRepository();
         $campaignRepo = $this->getCampaignRepository();
         $logRepo      = $this->getLeadEventLogRepository();
@@ -1262,8 +1262,9 @@ public function triggerNegativeEvents(
                                 // Set event
                                 $event             = $events[$id];
                                 $event['campaign'] = [
-                                    'id'   => $campaignId,
-                                    'name' => $campaignName,
+                                    'id'        => $campaign->getId(),
+                                    'name'      => $campaign->getName(),
+                                    'createdBy' => $campaign->getCreatedBy(),
                                 ];
 
                                 // Set lead in case this is triggered by the system
@@ -1542,9 +1543,11 @@ public function executeEvent(
         }
 
         // Set campaign ID
+
         $event['campaign'] = [
-            'id'   => $campaign->getId(),
-            'name' => $campaign->getName(),
+            'id'        => $campaign->getId(),
+            'name'      => $campaign->getName(),
+            'createdBy' => $campaign->getCreatedBy(),
         ];
 
         // Ensure properties is an array
@@ -1648,6 +1651,17 @@ public function executeEvent(
             //trigger the action
             $response = $this->invokeEventCallback($event, $thisEventSettings, $lead, null, true, $log);
 
+            // Check if the lead wasn't deleted during the event callback
+            if (null === $lead->getId() && $response === true) {
+                ++$executedEventCount;
+
+                $this->logger->debug(
+                    'CAMPAIGN: Contact was deleted while executing '.ucfirst($event['eventType']).' ID# '.$event['id']
+                );
+
+                return true;
+            }
+
             $eventTriggered = false;
             if ($response instanceof LeadEventLog) {
                 // Listener handled the event and returned a log entry
@@ -1691,31 +1705,7 @@ public function executeEvent(
                     $repo->deleteEntity($log);
                 }
 
-                // Notify the lead owner if there is one otherwise campaign creator that there was a failure
-                if (!$owner = $lead->getOwner()) {
-                    $ownerId = $campaign->getCreatedBy();
-                    $owner   = $this->userModel->getEntity($ownerId);
-                }
-
-                if ($owner && $owner->getId()) {
-                    $this->notificationModel->addNotification(
-                        $campaign->getName().' / '.$event['name'],
-                        'error',
-                        false,
-                        $this->translator->trans(
-                            'mautic.campaign.event.failed',
-                            [
-                                '%contact%' => '<a href="'.$this->router->generate(
-                                        'mautic_contact_action',
-                                        ['objectAction' => 'view', 'objectId' => $lead->getId()]
-                                    ).'" data-toggle="ajax">'.$lead->getPrimaryIdentifier().'</a>',
-                            ]
-                        ),
-                        null,
-                        null,
-                        $owner
-                    );
-                }
+                $this->notifyOfFailure($lead, $campaign->getCreatedBy(), $campaign->getName().' / '.$event['name']);
 
                 $this->logger->debug($debug);
             } else {
@@ -1818,7 +1808,9 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
                     'lead'            => $lead,
                     'systemTriggered' => $systemTriggered,
                     'config'          => $event['properties'],
-                ], true, $log
+                ],
+                true,
+                $log
             );
 
             $eventName = array_key_exists('eventName', $settings) ? $settings['eventName'] : null;
@@ -2079,6 +2071,40 @@ public function getEventLineChartData($unit, \DateTime $dateFrom, \DateTime $dat
         return $chart->render();
     }
 
+    /**
+     * @param Lead $lead
+     * @param      $campaignCreatedBy
+     * @param      $header
+     */
+    public function notifyOfFailure(Lead $lead, $campaignCreatedBy, $header)
+    {
+        // Notify the lead owner if there is one otherwise campaign creator that there was a failure
+        if (!$owner = $lead->getOwner()) {
+            $ownerId = (int) $campaignCreatedBy;
+            $owner   = $this->userModel->getEntity($ownerId);
+        }
+
+        if ($owner && $owner->getId()) {
+            $this->notificationModel->addNotification(
+                $header,
+                'error',
+                false,
+                $this->translator->trans(
+                    'mautic.campaign.event.failed',
+                    [
+                        '%contact%' => '<a href="'.$this->router->generate(
+                                'mautic_contact_action',
+                                ['objectAction' => 'view', 'objectId' => $lead->getId()]
+                            ).'" data-toggle="ajax">'.$lead->getPrimaryIdentifier().'</a>',
+                    ]
+                ),
+                null,
+                null,
+                $owner
+            );
+        }
+    }
+
     /**
      * Handles condition type events.
      *
diff --git a/app/bundles/CampaignBundle/Translations/en_US/messages.ini b/app/bundles/CampaignBundle/Translations/en_US/messages.ini
index 999ec51208d..51eb31af5de 100644
--- a/app/bundles/CampaignBundle/Translations/en_US/messages.ini
+++ b/app/bundles/CampaignBundle/Translations/en_US/messages.ini
@@ -1,5 +1,6 @@
 mautic.campaign.add_new_source="Add a contact source..."
 mautic.campaign.campaign="Campaign"
+mautic.campaign.campaign.id="Campaign ID"
 mautic.campaign.campaign.addremovelead="Add / remove contact"
 mautic.campaign.campaign.description="<strong>Campaign description:</strong> %description%"
 mautic.campaign.campaign.launch.builder="Launch Campaign Builder"
@@ -24,6 +25,7 @@ mautic.campaign.event.inline.triggerimmediately="immediately"
 mautic.campaign.event.inline.triggerinterval="+ %interval% %unit%"
 mautic.campaign.event.last_error="Last execution error"
 mautic.campaign.event.failed="Failed to execute campaign event for %contact%."
+mautic.campaign.event.failed.timeline="Generic error."
 mautic.campaign.event.intervalunit.choice.d="day(s)"
 mautic.campaign.event.intervalunit.choice.h="hour(s)"
 mautic.campaign.event.intervalunit.choice.i="minute(s)"
@@ -94,7 +96,7 @@ mautic.campaign.rebuild.no_lists="There are no lists to rebuild from."
 mautic.campaign.rebuild.not_found="Campaign #%id% does not exist"
 mautic.campaign.rebuild.to_be_added="%leads% total contact(s) to be added in batches of %batch%"
 mautic.campaign.rebuild.to_be_removed="%leads% total contact(s) to be removed in batches of %batch%"
-mautic.campaign.scheduled="Campaign action scheduled"
+mautic.campaign.scheduled="Campaign event scheduled"
 mautic.campaign.trigger.event_count="%events% total events(s) to be processed in batches of %batch%"
 mautic.campaign.trigger.events_executed="%events% event(s) executed"
 mautic.campaign.trigger.lead_count_processed="%leads% total contact(s) to be processed in batches of %batch%"
diff --git a/app/bundles/CategoryBundle/Entity/Category.php b/app/bundles/CategoryBundle/Entity/Category.php
index 6daa200a014..3b0c88a86e5 100644
--- a/app/bundles/CategoryBundle/Entity/Category.php
+++ b/app/bundles/CategoryBundle/Entity/Category.php
@@ -117,10 +117,6 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'alias',
                     'description',
                     'color',
-                ]
-            )
-            ->addProperties(
-                [
                     'bundle',
                 ]
             )
diff --git a/app/bundles/CategoryBundle/Helper/MenuHelper.php b/app/bundles/CategoryBundle/Helper/MenuHelper.php
index b0eec836275..9441dda3b46 100644
--- a/app/bundles/CategoryBundle/Helper/MenuHelper.php
+++ b/app/bundles/CategoryBundle/Helper/MenuHelper.php
@@ -26,6 +26,6 @@ class MenuHelper
      */
     public static function addCategoryMenuItems(&$items, $bundleName, CorePermissions $security)
     {
-        @trigger_error('Individual category menu items are no longer used.', E_DEPRECATED);
+        @trigger_error('Individual category menu items are no longer used.', E_USER_DEPRECATED);
     }
 }
diff --git a/app/bundles/ChannelBundle/Entity/Message.php b/app/bundles/ChannelBundle/Entity/Message.php
index 2e9b44f39f6..e0afe6c06ca 100644
--- a/app/bundles/ChannelBundle/Entity/Message.php
+++ b/app/bundles/ChannelBundle/Entity/Message.php
@@ -115,6 +115,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'publishUp',
                     'publishDown',
                     'channels',
+                    'category',
                 ]
             )
             ->build();
diff --git a/app/bundles/ChannelBundle/Entity/MessageQueueRepository.php b/app/bundles/ChannelBundle/Entity/MessageQueueRepository.php
index 44025fe4f24..e81c8122523 100644
--- a/app/bundles/ChannelBundle/Entity/MessageQueueRepository.php
+++ b/app/bundles/ChannelBundle/Entity/MessageQueueRepository.php
@@ -18,6 +18,11 @@
  */
 class MessageQueueRepository extends CommonRepository
 {
+    /**
+     * @param $channel
+     * @param $channelId
+     * @param $leadId
+     */
     public function findMessage($channel, $channelId, $leadId)
     {
         $results = $this->createQueryBuilder('mq')
@@ -72,4 +77,38 @@ public function getQueuedMessages($limit, $processStarted, $channel = null, $cha
 
         return $results;
     }
+
+    /**
+     * @param            $channel
+     * @param array|null $ids
+     *
+     * @return bool|string
+     */
+    public function getQueuedChannelCount($channel, array $ids = null)
+    {
+        $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
+
+        $expr = $q->expr()->andX(
+            $q->expr()->eq($this->getTableAlias().'.channel', ':channel'),
+            $q->expr()->neq($this->getTableAlias().'.status', ':status')
+        );
+
+        if (!empty($ids)) {
+            $expr->add(
+                $q->expr()->in($this->getTableAlias().'.channel_id', $ids)
+            );
+        }
+
+        return (int) $q->select('count(*)')
+            ->from(MAUTIC_TABLE_PREFIX.'message_queue', $this->getTableAlias())
+            ->where($expr)
+            ->setParameters(
+                [
+                    'channel' => $channel,
+                    'status'  => MessageQueue::STATUS_SENT,
+                ]
+            )
+            ->execute()
+            ->fetchColumn();
+    }
 }
diff --git a/app/bundles/ChannelBundle/Model/MessageModel.php b/app/bundles/ChannelBundle/Model/MessageModel.php
index 899fb7172db..38c127f6d2d 100644
--- a/app/bundles/ChannelBundle/Model/MessageModel.php
+++ b/app/bundles/ChannelBundle/Model/MessageModel.php
@@ -57,6 +57,26 @@ public function __construct(ChannelListHelper $channelListHelper, CampaignModel
         $this->campaignModel     = $campaignModel;
     }
 
+    /**
+     * @param Message $entity
+     * @param bool    $unlock
+     */
+    public function saveEntity($entity, $unlock = true)
+    {
+        $isNew = $entity->isNew();
+
+        parent::saveEntity($entity, $unlock);
+
+        if (!$isNew) {
+            // Update the channels
+            $channels = $entity->getChannels();
+            foreach ($channels as $channel) {
+                $channel->setMessage($entity);
+            }
+            $this->getRepository()->saveEntities($channels);
+        }
+    }
+
     /**
      * @return string
      */
@@ -220,6 +240,13 @@ public function getLeadStatsPost($messageId, $dateFrom = null, $dateTo = null, $
         );
     }
 
+    /**
+     * @param      $messageId
+     * @param null $dateFrom
+     * @param null $dateTo
+     *
+     * @return mixed
+     */
     public function getMarketingMessagesEventLogs($messageId, $dateFrom = null, $dateTo = null)
     {
         $eventLog = $this->campaignModel->getCampaignLeadEventLogRepository();
diff --git a/app/bundles/ChannelBundle/Model/MessageQueueModel.php b/app/bundles/ChannelBundle/Model/MessageQueueModel.php
index 1a5a280b73d..cdc63a50825 100644
--- a/app/bundles/ChannelBundle/Model/MessageQueueModel.php
+++ b/app/bundles/ChannelBundle/Model/MessageQueueModel.php
@@ -362,6 +362,15 @@ public function rescheduleMessage($message, $rescheduleInterval = null, $leadId
         }
     }
 
+    /**
+     * @param       $channel
+     * @param array $channelIds
+     */
+    public function getQueuedChannelCount($channel, $channelIds = [])
+    {
+        return $this->getRepository()->getQueuedChannelCount($channel, $channelIds);
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -411,8 +420,12 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
      *
      * @param $action
      * @param $event
+     * @param $entity
+     * @param $isNew
      *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
+     *
+     * @return Event|null
      */
     protected function dispatchDeprecatedEvent($action, Event $event = null, $entity = null, $isNew = null)
     {
diff --git a/app/bundles/ChannelBundle/Translations/en_US/messages.ini b/app/bundles/ChannelBundle/Translations/en_US/messages.ini
index f68eb2dd4a9..32914fe981a 100644
--- a/app/bundles/ChannelBundle/Translations/en_US/messages.ini
+++ b/app/bundles/ChannelBundle/Translations/en_US/messages.ini
@@ -20,4 +20,5 @@ mautic.channel.choose.messages_descr="Marketing messages"
 mautic.email.send.edit.message="Edit Message"
 mautic.channel.message.send.marketing.message="Send marketing message"
 mautic.channel.message.send.marketing.message.descr="Send a message through the configured channels withing the marketing message selected."
-mautic.messages.processed.messages="Messages Sent by Channel"
\ No newline at end of file
+mautic.messages.processed.messages="Messages Sent by Channel"
+mautic.channel.message.form.confirmdelete="Delete this message?"
diff --git a/app/bundles/ChannelBundle/Views/Message/list_item.html.php b/app/bundles/ChannelBundle/Views/Message/list_item.html.php
index 9afc2328b38..512eeb09dc2 100644
--- a/app/bundles/ChannelBundle/Views/Message/list_item.html.php
+++ b/app/bundles/ChannelBundle/Views/Message/list_item.html.php
@@ -14,7 +14,7 @@
 $channels        = [];
 if ($messageChannels) {
     foreach ($messageChannels as $channelName => $channel) {
-        if (!$channel->getChannelId()) {
+        if (!$channel->isEnabled()) {
             continue;
         }
 
diff --git a/app/bundles/CoreBundle/Assets/css/app.css b/app/bundles/CoreBundle/Assets/css/app.css
index 46d7935b55b..fc4ea9897e3 100644
--- a/app/bundles/CoreBundle/Assets/css/app.css
+++ b/app/bundles/CoreBundle/Assets/css/app.css
@@ -4258,23 +4258,29 @@ lesshat-selector { -lh-property: 0 ;
   -moz-hyphens: auto;
   hyphens: auto;
 }
-.builder {
+.builder,
+.builder-slot {
   position: relative;
 }
-.builder [data-token] {
+.builder [data-token],
+.builder-slot [data-token] {
   cursor: pointer;
 }
-.builder .btn-block.ui-draggable-dragging {
+.builder .btn-block.ui-draggable-dragging,
+.builder-slot .btn-block.ui-draggable-dragging {
   width: 104px;
   height: 68px;
   margin: 6px 12px;
   white-space: normal;
 }
-.builder .builder-panel-top {
+.builder .builder-panel-top,
+.builder-slot .builder-panel-top {
   margin-bottom: 10px;
 }
 .builder .template-dnd-help,
-.builder .custom-dnd-help {
+.builder-slot .template-dnd-help,
+.builder .custom-dnd-help,
+.builder-slot .custom-dnd-help {
   display: table-cell;
   vertical-align: middle;
   width: 100%;
@@ -4325,6 +4331,38 @@ lesshat-selector { -lh-property: 0 ;
 .builder-panel .panel a.btn {
   white-space: normal;
 }
+/********** SLOT ************/
+.builder-active-slot {
+  background-color: #fff;
+  z-index: 1030;
+}
+.builder-panel-slot {
+  width: 50%;
+  padding: 15px;
+  background-color: #d5d4d4;
+  overflow-y: auto;
+}
+.builder-panel-slot .btn-close-builder {
+  width: 100%;
+}
+.builder-content-slot {
+  left: 50%;
+  width: 50%;
+}
+.code-mode .builder-panel-slot {
+  width: 50%;
+}
+.code-mode .builder-content-slot {
+  width: 50%;
+}
+.code-mode .btn-close-builder {
+  width: 150px;
+  float: right;
+}
+.builder-panel-slot .panel a.btn {
+  white-space: normal;
+}
+/************* END SLOT ******************/
 .ui-draggable-iframeFix {
   z-index: 9999 !important;
 }
@@ -4332,6 +4370,9 @@ lesshat-selector { -lh-property: 0 ;
   border: 1px solid #eee;
   height: auto;
 }
+#slot_codemode .CodeMirror {
+  height: 200px;
+}
 .CodeMirror-hints {
   position: absolute;
   z-index: 9999 !important;
@@ -4692,3 +4733,21 @@ td.col-id,
 th.col-id {
   width: 75px;
 }
+.badge-wrapper {
+  float: right;
+  vertical-align: middle;
+  margin-right: -10px;
+}
+span.slot-caption {
+  font-size: 12px;
+}
+.imagecard-caption,
+figcaption {
+  font-size: 16px;
+}
+.imagecard {
+  background-color: #ddd !important;
+}
+.imagecard .imagecard-caption {
+  background-color: #bbb !important;
+}
diff --git a/app/bundles/CoreBundle/Assets/css/app/less/components/builder.less b/app/bundles/CoreBundle/Assets/css/app/less/components/builder.less
index 382859b254a..0f83752d588 100644
--- a/app/bundles/CoreBundle/Assets/css/app/less/components/builder.less
+++ b/app/bundles/CoreBundle/Assets/css/app/less/components/builder.less
@@ -1,5 +1,5 @@
 
-.builder {
+.builder, .builder-slot {
   position: relative;
 
   [data-token] {
@@ -78,6 +78,48 @@
   white-space: normal;
 }
 
+/********** SLOT ************/
+
+.builder-active-slot {
+  background-color: #fff;
+  z-index: 1030;
+}
+
+.builder-panel-slot {
+  width: 50%;
+  padding: 15px;
+  background-color: #d5d4d4;
+  overflow-y: auto;
+
+  .btn-close-builder {
+    width: 100%;
+  }
+}
+
+.builder-content-slot {
+  left: 50%;
+  width: 50%;
+}
+
+.code-mode {
+  .builder-panel-slot {
+    width: 50%;
+  }
+  .builder-content-slot {
+    width: 50%;
+  }
+  .btn-close-builder {
+    width: 150px;
+    float: right;
+  }
+}
+
+.builder-panel-slot .panel a.btn {
+  white-space: normal;
+}
+
+/************* END SLOT ******************/
+
 .ui-draggable-iframeFix {
   z-index: 9999 !important;
 }
diff --git a/app/bundles/CoreBundle/Assets/css/app/less/custom.less b/app/bundles/CoreBundle/Assets/css/app/less/custom.less
index b552246fe59..b6822d53309 100644
--- a/app/bundles/CoreBundle/Assets/css/app/less/custom.less
+++ b/app/bundles/CoreBundle/Assets/css/app/less/custom.less
@@ -264,4 +264,22 @@ div[data-filter-container] .panel.in-group {
 
 td.col-id, th.col-id {
   width: 75px;
-}
\ No newline at end of file
+}
+
+.badge-wrapper {
+  float: right;
+  vertical-align: middle;
+  margin-right: -10px;
+}
+span.slot-caption {
+  font-size: 12px;
+}
+.imagecard-caption, figcaption {
+  font-size: 16px;
+}
+.imagecard {
+  background-color: #ddd !important;
+}
+.imagecard .imagecard-caption {
+  background-color: #bbb !important;
+}
diff --git a/app/bundles/CoreBundle/Assets/css/libraries/builder.css b/app/bundles/CoreBundle/Assets/css/libraries/builder.css
index 48f5096151a..1e4fee71fbf 100644
--- a/app/bundles/CoreBundle/Assets/css/libraries/builder.css
+++ b/app/bundles/CoreBundle/Assets/css/libraries/builder.css
@@ -5354,6 +5354,7 @@ div[data-slot-toolbar] {
   background-color: #4e5e9e;
   border-left: 1px solid #4e5e9e;
   border-right: 1px solid #4e5e9e;
+  padding-top: 2px;
 }
 div[data-slot-toolbar] .btn {
   width: 20px;
@@ -5375,8 +5376,8 @@ div[data-slot-toolbar] .btn {
   font-size: 11px;
   line-height: 1.456;
   float: right;
-  margin-right: 5px;
-  color: #ffffff;
+  margin-right: 2px;
+  color: #fff;
 }
 div[data-slot-toolbar] .btn .fa {
   padding-top: 4px;
@@ -5385,11 +5386,11 @@ div[data-slot],
 [data-section-wrapper] {
   position: relative;
 }
-div[data-slot="image"] {
+div[data-slot^="image"] {
   padding-top: 1px;
   padding-bottom: 1px;
 }
-div[data-slot="image"] img {
+div[data-slot^="image"] img {
   z-index: 2;
   position: relative;
 }
@@ -5433,13 +5434,19 @@ div[data-slot].ui-sortable-helper {
   color: inherit !important;
   min-height: inherit !important;
 }
-.slot-type-handle.btn {
+.slot-type-handle.btn,
+.section-type-handle.btn {
   float: left;
   width: 111px;
   margin: 2px;
-  height: 62px;
+  height: 75px;
+  padding-left: 5px;
+  padding-right: 5px;
+  text-align: center;
+  word-wrap: break-word;
 }
-.slot-type-handle.ui-draggable-dragging {
+.slot-type-handle.ui-draggable-dragging,
+.section-type-handle.ui-draggable-dragging {
   color: #5d6c7c;
   background-color: #f5f5f5;
   border-color: #d3d3d3;
@@ -5456,3 +5463,9 @@ div[data-slot].ui-sortable-helper {
 .theme-list .select-theme-link {
   margin-top: 5px;
 }
+.theme-list .select-theme-selected {
+  margin-top: 5px;
+}
+[data-slot="dynamicContent"] {
+  z-index: 50;
+}
diff --git a/app/bundles/CoreBundle/Assets/css/libraries/builder.less b/app/bundles/CoreBundle/Assets/css/libraries/builder.less
index a2694bddf9d..f19be330424 100644
--- a/app/bundles/CoreBundle/Assets/css/libraries/builder.less
+++ b/app/bundles/CoreBundle/Assets/css/libraries/builder.less
@@ -109,6 +109,7 @@ div[data-slot-toolbar] {
     background-color: @mautic-primary;
     border-left: 1px solid @mautic-primary;
     border-right: 1px solid @mautic-primary;
+    padding-top:2px;
 }
 
 div[data-slot-toolbar] .btn {
@@ -131,8 +132,8 @@ div[data-slot-toolbar] .btn {
     font-size: 11px;
     line-height: 1.456;
     float: right;
-    margin-right: 5px;
-    color: #ffffff;
+    margin-right: 2px;
+    color: #fff;
 }
 
 div[data-slot-toolbar] .btn .fa {
@@ -143,12 +144,12 @@ div[data-slot], [data-section-wrapper] {
     position: relative;
 }
 
-div[data-slot="image"] {
+div[data-slot^="image"] {
     padding-top: 1px; // prevent z-index of image from hiding the bottom border of a slot with focus above it
     padding-bottom: 1px;
 }
 
-div[data-slot="image"] img {
+div[data-slot^="image"] img {
     z-index: 2;
     position: relative;
 }
@@ -201,14 +202,18 @@ div[data-slot].ui-sortable-helper {
     }
 }
 
-.slot-type-handle.btn {
+.slot-type-handle.btn, .section-type-handle.btn {
     float: left;
     width: 111px;
     margin: 2px;
-    height: 62px;
+    height: 75px;
+    padding-left:5px;
+    padding-right:5px;
+    text-align:center;
+    word-wrap: break-word;
 }
 
-.slot-type-handle.ui-draggable-dragging {
+.slot-type-handle.ui-draggable-dragging, .section-type-handle.ui-draggable-dragging{
     color: #5d6c7c;
     background-color: #f5f5f5;
     border-color: #d3d3d3;
@@ -227,4 +232,11 @@ div[data-slot].ui-sortable-helper {
     .select-theme-link {
         margin-top: 5px;
     }
+    .select-theme-selected {
+        margin-top:5px;
+    }
 }
+
+[data-slot="dynamicContent"] {
+    z-index:50;
+}
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Assets/js/1.core.js b/app/bundles/CoreBundle/Assets/js/1.core.js
index ca3cdde9132..1b6857fd354 100644
--- a/app/bundles/CoreBundle/Assets/js/1.core.js
+++ b/app/bundles/CoreBundle/Assets/js/1.core.js
@@ -394,10 +394,11 @@ var Mautic = {
         if (mQuery(target).length) {
             var hasBtn = mQuery(target).hasClass('btn');
             var hasIcon = mQuery(target).hasClass('fa');
+            var dontspin = mQuery(target).hasClass('btn-nospin');
 
             var i = (hasBtn && mQuery(target).find('i.fa').length) ? mQuery(target).find('i.fa') : target;
 
-            if ((hasBtn && mQuery(target).find('i.fa').length) || hasIcon) {
+            if (!dontspin && ((hasBtn && mQuery(target).find('i.fa').length) || hasIcon)) {
                 var el = (hasIcon) ? target : mQuery(target).find('i.fa').first();
                 var identifierClass = (new Date).getTime();
                 MauticVars.iconClasses[identifierClass] = mQuery(el).attr('class');
diff --git a/app/bundles/CoreBundle/Assets/js/1a.content.js b/app/bundles/CoreBundle/Assets/js/1a.content.js
index edc6af920d5..e6dc8efa96a 100644
--- a/app/bundles/CoreBundle/Assets/js/1a.content.js
+++ b/app/bundles/CoreBundle/Assets/js/1a.content.js
@@ -517,7 +517,7 @@ Mautic.onPageLoad = function (container, response, inModal) {
             }
 
             if (textarea.hasClass('editor-dynamic-content')) {
-                minButtons = ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'insertLink', 'insertImage'];
+                minButtons = ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'paragraphFormat', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'insertLink', 'insertImage', 'insertGatedVideo', 'insertTable', 'html', 'fullscreen'];
             }
 
             if (textarea.hasClass('editor-advanced') || textarea.hasClass('editor-basic-fullpage')) {
@@ -604,6 +604,31 @@ Mautic.onPageLoad = function (container, response, inModal) {
         contentSpecific = mauticContent;
     }
 
+    if (response && response.sidebar) {
+        var sidebarContent = mQuery('.app-sidebar.sidebar-left');
+        var newSidebar     = mQuery(response.sidebar);
+        var nav            = sidebarContent.find('li');
+
+        if (nav.length) {
+            var openNavIndex;
+
+            nav.each(function(i, el) {
+                var $el = mQuery(el);
+
+                if ($el.hasClass('open')) {
+                    openNavIndex = i;
+                }
+            });
+
+            var openNav = mQuery(newSidebar.find('li')[openNavIndex]);
+
+            openNav.addClass('open');
+            openNav.find('ul').removeClass('collapse');
+        }
+
+        sidebarContent.html(newSidebar);
+    }
+
     if (container == '#app-content' || container == 'body') {
         //register global keyboard shortcuts
         Mautic.bindGlobalKeyboardShortcuts();
@@ -617,11 +642,9 @@ Mautic.onPageLoad = function (container, response, inModal) {
     }
 
     if (contentSpecific && typeof Mautic[contentSpecific + "OnLoad"] == 'function') {
-        if (typeof Mautic[contentSpecific + "OnLoad"] == 'function') {
-            if (typeof Mautic.loadedContent[contentSpecific] == 'undefined') {
-                Mautic.loadedContent[contentSpecific] = true;
-                Mautic[contentSpecific + "OnLoad"](container, response);
-            }
+        if (typeof Mautic.loadedContent[contentSpecific] == 'undefined') {
+            Mautic.loadedContent[contentSpecific] = true;
+            Mautic[contentSpecific + "OnLoad"](container, response);
         }
     }
 
@@ -735,7 +758,7 @@ Mautic.onPageUnload = function (container, response) {
             Mautic[contentSpecific + "OnUnload"](container, response);
         }
 
-        if (typeof (Mautic.loadedContent[contentSpecific])) {
+        if (typeof Mautic.loadedContent[contentSpecific] !== 'undefined') {
             delete Mautic.loadedContent[contentSpecific];
         }
     }
@@ -810,7 +833,8 @@ Mautic.ajaxifyLink = function (el, event) {
  *
  * @param el
  */
-Mautic.activateChosenSelect = function(el, ignoreGlobal) {
+Mautic.activateChosenSelect = function(el, ignoreGlobal, jQueryVariant) {
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
     if (mQuery(el).parents('.no-chosen').length && !ignoreGlobal) {
         // Globally ignored chosens because they are handled manually due to hidden elements, etc
         return;
@@ -891,9 +915,9 @@ Mautic.activateChosenSelect = function(el, ignoreGlobal) {
  * @param options
  */
 Mautic.activateFieldTypeahead = function (field, target, options, action) {
-    if (options) {
+    if (options && typeof options === 'String') {
         var keys = values = [];
-        //check to see if there is a key/value split
+
         options = options.split('||');
         if (options.length == 2) {
             keys = options[1].split('|');
@@ -915,15 +939,18 @@ Mautic.activateFieldTypeahead = function (field, target, options, action) {
         });
     }
 
-    mQuery(fieldTypeahead).on('typeahead:selected', function (event, datum) {
-        if (mQuery("#" + field).length && datum["value"]) {
-            mQuery("#" + field).val(datum["value"]);
-        }
-    }).on('typeahead:autocompleted', function (event, datum) {
+    var callback = function (event, datum) {
         if (mQuery("#" + field).length && datum["value"]) {
             mQuery("#" + field).val(datum["value"]);
+
+            var lookupCallback = mQuery('#' + field).data("lookup-callback");
+            if (lookupCallback && typeof Mautic[lookupCallback] == 'function') {
+                Mautic[lookupCallback](field, datum);
+            }
         }
-    });
+    };
+
+    mQuery(fieldTypeahead).on('typeahead:selected', callback).on('typeahead:autocompleted', callback);
 };
 
 /**
@@ -1346,7 +1373,7 @@ Mautic.activateListFilterSelect = function(el) {
  * Converts an input to a color picker
  * @param el
  */
-Mautic.activateColorPicker = function(el) {
+Mautic.activateColorPicker = function(el, options) {
     var pickerOptions = mQuery(el).data('color-options');
     if (!pickerOptions) {
         pickerOptions = {
@@ -1357,6 +1384,10 @@ Mautic.activateColorPicker = function(el) {
         };
     }
 
+    if (typeof options == 'object') {
+        pickerOptions = mQuery.extend(pickerOptions, options);
+    }
+
     mQuery(el).minicolors(pickerOptions);
 };
 
diff --git a/app/bundles/CoreBundle/Assets/js/4.builder.js b/app/bundles/CoreBundle/Assets/js/4.builder.js
index b18d7405ee1..41134c201c2 100644
--- a/app/bundles/CoreBundle/Assets/js/4.builder.js
+++ b/app/bundles/CoreBundle/Assets/js/4.builder.js
@@ -2,6 +2,7 @@
  * Launch builder
  *
  * @param formName
+ * @param actionName
  */
 Mautic.launchBuilder = function (formName, actionName) {
     var builder = mQuery('.builder');
@@ -64,17 +65,17 @@ Mautic.launchBuilder = function (formName, actionName) {
         Mautic.keepPreviewAlive('builder-template-content');
     }
 
-    var builderPanel = mQuery('.builder-panel')
-        builderContent = mQuery('.builder-content')
-        btnCloseBuilder = mQuery('.btn-close-builder')
-        panelHeight = (builderContent.css('right') == '0px') ? builderPanel.height() : 0,
-        panelWidth = (builderContent.css('right') == '0px') ? 0 : builderPanel.width(),
-        spinnerLeft = (mQuery(window).width() - panelWidth - 60) / 2,
-        spinnerTop = (mQuery(window).height() - panelHeight - 60) / 2;
+    var builderPanel = mQuery('.builder-panel');
+    var builderContent = mQuery('.builder-content');
+    var btnCloseBuilder = mQuery('.btn-close-builder');
+    var panelHeight = (builderContent.css('right') == '0px') ? builderPanel.height() : 0;
+    var panelWidth = (builderContent.css('right') == '0px') ? 0 : builderPanel.width();
+    var spinnerLeft = (mQuery(window).width() - panelWidth - 60) / 2;
+    var spinnerTop = (mQuery(window).height() - panelHeight - 60) / 2;
 
     // Blur and focus the focussed inputs to fix the browser autocomplete bug on scroll
     builderPanel.on('scroll', function(e) {
-        builderPanel.find('input:focus').blur().focus();
+        builderPanel.find('input:focus').blur();
     });
 
     var overlay = mQuery('<div id="builder-overlay" class="modal-backdrop fade in"><div style="position: absolute; top:' + spinnerTop + 'px; left:' + spinnerLeft + 'px" class="builder-spinner"><i class="fa fa-spinner fa-spin fa-5x"></i></div></div>').css(builderCss).appendTo('.builder-content');
@@ -86,6 +87,9 @@ Mautic.launchBuilder = function (formName, actionName) {
     var assets = Mautic.htmlspecialchars_decode(mQuery('[data-builder-assets]').html());
     themeHtml = themeHtml.replace('</head>', assets+'</head>');
 
+    // Turn Dynamic Content Tokens into builder slots
+    themeHtml = Mautic.prepareDynamicContentBlocksForBuilder(themeHtml);
+
     Mautic.buildBuilderIframe(themeHtml, 'builder-template-content', function() {
         mQuery('#builder-overlay').addClass('hide');
         btnCloseBuilder.prop('disabled', false);
@@ -144,8 +148,9 @@ Mautic.openServerBrowser = function(url, width, height) {
  * Creates an iframe and keeps its content live from CodeMirror changes
  *
  * @param iframeId
+ * @param slot
  */
-Mautic.keepPreviewAlive = function(iframeId) {
+Mautic.keepPreviewAlive = function(iframeId, slot) {
     var codeChanged = false;
     // Watch for code changes
     Mautic.builderCodeMirror.on('change', function(cm, change) {
@@ -154,7 +159,8 @@ Mautic.keepPreviewAlive = function(iframeId) {
 
     window.setInterval(function() {
         if (codeChanged) {
-            Mautic.livePreviewInterval = Mautic.updateIframeContent(iframeId, Mautic.builderCodeMirror.getValue());
+            var value = (Mautic.builderCodeMirror)?Mautic.builderCodeMirror.getValue():'';
+            Mautic.livePreviewInterval = Mautic.updateIframeContent(iframeId, value, slot);
             codeChanged = false;
         }
     }, 2000);
@@ -289,15 +295,20 @@ Mautic.initSelectTheme = function(themeField) {
 /**
  * Updates content of an iframe
  *
- * @param iframe ID
- * @param HTML content
+ * @param iframeId ID
+ * @param content HTML content
+ * @param slot
  */
-Mautic.updateIframeContent = function(iframeId, content) {
-    var iframe = document.getElementById(iframeId);
-    var doc = iframe.contentDocument || iframe.contentWindow.document;
-    doc.open();
-    doc.write(content);
-    doc.close();
+Mautic.updateIframeContent = function(iframeId, content, slot) {
+    if (iframeId) {
+        var iframe = document.getElementById(iframeId);
+        var doc = iframe.contentDocument || iframe.contentWindow.document;
+        doc.open();
+        doc.write(content);
+        doc.close();
+    } else if (slot) {
+        slot.html(content);
+    }
 };
 
 /**
@@ -356,6 +367,9 @@ Mautic.closeBuilder = function(model) {
             customHtml = themeHtml.find('html').get(0).outerHTML
         }
 
+        // Convert dynamic slot definitions into tokens
+        customHtml = Mautic.convertDynamicContentSlotsToTokens(customHtml);
+
         // Store the HTML content to the HTML textarea
         mQuery('.builder-html').val(customHtml);
     } catch (error) {
@@ -642,7 +656,7 @@ Mautic.initSections = function() {
 
             mQuery('#builder-template-content', parent.document).css('overflow', 'visible');
             mQuery('#builder-template-content', parent.document).attr('scrolling', 'yes');
-        },
+        }
     }).disableSelection();
 
     // Initialize the slots
@@ -667,7 +681,7 @@ Mautic.sectionBackgroundChanged = function(element, color) {
             Mautic.setTextSlotEditorStyle(parent.mQuery('#slot_text_content'), focusedSlot);
         }
     });
-}
+};
 
 Mautic.rgb2hex = function(orig) {
     var rgb = orig.replace(/\s/g,'').match(/^rgba?\((\d+),(\d+),(\d+)/i);
@@ -675,7 +689,7 @@ Mautic.rgb2hex = function(orig) {
         ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) +
         ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) +
         ("0" + parseInt(rgb[3],10).toString(16)).slice(-2) : orig;
-}
+};
 
 Mautic.initSlots = function(slotContainers) {
     if (!slotContainers) {
@@ -689,6 +703,7 @@ Mautic.initSlots = function(slotContainers) {
     // Make slots sortable
     var bodyOverflow = {};
     Mautic.sortActive = false;
+    Mautic.parentDocument = parent.document;
 
     slotContainers.sortable({
         helper: function(e, ui) {
@@ -740,7 +755,7 @@ Mautic.initSlots = function(slotContainers) {
             }
 
             Mautic.sortActive = false;
-        },
+        }
     });
 
     // Allow to drag&drop new slots from the slot type menu
@@ -751,46 +766,132 @@ Mautic.initSlots = function(slotContainers) {
         revert: 'invalid',
         iframeOffset: iframe.offset(),
         helper: function(e, ui) {
+            // fix for Uncaught TypeError: Cannot read property 'document' of null
             // Fix body overflow that messes sortable up
-            bodyOverflow.overflowX = mQuery('body', parent.document).css('overflow-x');
-            bodyOverflow.overflowY = mQuery('body', parent.document).css('overflow-y');
-            mQuery('body', parent.document).css({
+            bodyOverflow.overflowX = mQuery('body', Mautic.parentDocument).css('overflow-x');
+            bodyOverflow.overflowY = mQuery('body', Mautic.parentDocument).css('overflow-y');
+            mQuery('body', Mautic.parentDocument).css({
                 overflowX: 'hidden',
                 overflowY: 'hidden'
             });
 
-            var helper = mQuery(this).clone()
+            return mQuery(this).clone()
                 .css('height', mQuery(this).height())
                 .css('width', mQuery(this).width());
-
-            return helper;
         },
         zIndex: 8000,
         cursorAt: {top: 15, left: 15},
         start: function(event, ui) {
-            mQuery('#builder-template-content', parent.document).css('overflow', 'hidden');
-            mQuery('#builder-template-content', parent.document).attr('scrolling', 'no');
-            slotContainers.sortable('option', 'scroll', false);
+            mQuery('#builder-template-content', Mautic.parentDocument).css('overflow', 'hidden');
+            mQuery('#builder-template-content', Mautic.parentDocument).attr('scrolling', 'no');
+            // check if it is initialized first to prevent error
+            if (slotContainers.data('sortable')) slotContainers.sortable('option', 'scroll', false);
         },
         stop: function(event, ui) {
             // Restore original overflow
-            mQuery('body', parent.document).css(bodyOverflow);
+            mQuery('body', Mautic.parentDocument).css(bodyOverflow);
 
-            mQuery('#builder-template-content', parent.document).css('overflow', 'visible');
-            mQuery('#builder-template-content', parent.document).attr('scrolling', 'yes');
-            slotContainers.sortable('option', 'scroll', true);
-        },
+            mQuery('#builder-template-content', Mautic.parentDocument).css('overflow', 'visible');
+            mQuery('#builder-template-content', Mautic.parentDocument).attr('scrolling', 'yes');
+            // check if it is initialized first to prevent error
+            if (slotContainers.data('sortable')) slotContainers.sortable('option', 'scroll', true);
+        }
     }).disableSelection();
 
     iframe.on('scroll', function() {
-        mQuery('#slot-type-container .slot-type-handle', parent.document).draggable("option", "cursorAt", { top: -1 * iframe.scrollTop() + 15 });
+        mQuery('#slot-type-container .slot-type-handle', Mautic.parentDocument).draggable("option", "cursorAt", { top: -1 * iframe.scrollTop() + 15 });
     });
 
     // Initialize the slots
     slotContainers.find('[data-slot]').each(function() {
         mQuery(this).trigger('slot:init', this);
     });
-}
+};
+
+Mautic.getSlotToolbar = function() {
+    Mautic.builderContents.find('[data-slot-toolbar]').remove();
+
+    var slotToolbar = mQuery('<div/>').attr('data-slot-toolbar', true);
+    var deleteLink  = Mautic.getSlotDeleteLink();
+
+    deleteLink.appendTo(slotToolbar);
+
+    return slotToolbar;
+};
+
+Mautic.getSlotDeleteLink = function() {
+    if (typeof Mautic.deleteLink == 'undefined') {
+        Mautic.deleteLink = mQuery('<a><i class="fa fa-lg fa-times"></i></a>')
+            .attr('data-slot-action', 'delete')
+            .attr('alt', 'delete')
+            .addClass('btn btn-delete btn-default');
+    }
+
+    return Mautic.deleteLink;
+};
+
+Mautic.getSlotFocus = function() {
+    Mautic.builderContents.find('[data-slot-focus]').remove();
+
+    return mQuery('<div/>').attr('data-slot-focus', true);
+};
+
+Mautic.cloneFocusForm = function(decId, removeFroala) {
+    // reattach DEC
+    if (typeof Mautic.activeDEC !== 'undefined') {
+        var element = Mautic.activeDEC.detach();
+        element.hide();
+        Mautic.activeDECParent.append(element);
+    }
+    var focusForm = parent.mQuery('#emailform_dynamicContent_' + decId);
+    Mautic.activeDECParent = focusForm.parent();
+    // show if hidden
+    focusForm.removeClass('fade');
+    // remove delete default button
+    focusForm.find('.tab-pane:first').find('.remove-item').hide();
+    var element =focusForm.detach();
+    element.show();
+    Mautic.activeDEC = element;
+    return element;
+};
+
+Mautic.initEmailDynamicContentSlotEdit = function (clickedSlot) {
+    var decId = clickedSlot.attr('data-param-dec-id');
+
+    var focusForm;
+
+    if (decId || decId === 0) {
+        focusForm = Mautic.cloneFocusForm(decId);
+    }
+
+    var focusFormHeader = parent.mQuery('#customize-slot-panel').find('.panel-heading h4');
+    var newDynConButton = mQuery('<button/>')
+        .css('float', 'right')
+        .addClass('btn btn-success btn-xs');
+
+    newDynConButton.text('Add Variant');
+    newDynConButton.on('click', function(e) {
+        e.stopPropagation();
+        Mautic.createNewDynamicContentFilter('#dynamicContentFilterTabs_'+decId, parent.mQuery);
+        var focusForm = Mautic.cloneFocusForm(decId, false);
+        focusForm.insertAfter(parent.mQuery('#slot_dynamiccontent > div.has-error'));
+    });
+
+    focusFormHeader.append(newDynConButton);
+
+    return focusForm;
+};
+
+Mautic.removeAddVariantButton = function() {
+    // Remove the Add Variant button for dynamicContent slots
+    parent.mQuery('#customize-slot-panel').find('.panel-heading button').remove();
+    // reattach DEC
+    if (typeof Mautic.activeDEC !== 'undefined') {
+        var element = Mautic.activeDEC.detach();
+        element.hide();
+        Mautic.activeDECParent.append(element);
+    }
+};
 
 Mautic.initSlotListeners = function() {
     Mautic.activateGlobalFroalaOptions();
@@ -800,8 +901,7 @@ Mautic.initSlotListeners = function() {
     Mautic.builderContents.on('slot:selected', function(event, slot) {
         slot = mQuery(slot);
         Mautic.builderContents.find('[data-slot-focus]').remove();
-        var focus = mQuery('<div/>').attr('data-slot-focus', true);
-        slot.append(focus);
+        mQuery(slot).append(Mautic.getSlotFocus());
     });
 
     Mautic.builderContents.on('slot:init', function(event, slot) {
@@ -809,17 +909,17 @@ Mautic.initSlotListeners = function() {
         var type = slot.attr('data-slot');
 
         // initialize the drag handle
-        var slotToolbar = mQuery('<div/>').attr('data-slot-toolbar', true);
-        var deleteLink = mQuery('<a><i class="fa fa-lg fa-times"></i></a>')
-            .attr('data-slot-action', 'delete')
-            .attr('alt', 'delete')
-            .addClass('btn btn-delete btn-default');
-        deleteLink.appendTo(slotToolbar);
+        var slotToolbar = Mautic.getSlotToolbar();
+        var deleteLink  = Mautic.getSlotDeleteLink();
+        var focus       = Mautic.getSlotFocus();
 
-        Mautic.builderContents.find('[data-slot-focus]').remove();
-        var focus = mQuery('<div/>').attr('data-slot-focus', true);
+        slot.hover(function(e) {
+            e.stopPropagation();
+
+            // Get new copies of the focus, toolbar
+            slotToolbar = Mautic.getSlotToolbar();
+            focus       = Mautic.getSlotFocus();
 
-        slot.hover(function() {
             if (Mautic.sortActive) {
                 // don't activate while sorting
 
@@ -828,6 +928,14 @@ Mautic.initSlotListeners = function() {
 
             slot.append(focus);
             deleteLink.click(function(e) {
+                // if slot is DEC, delete it from the outside form
+                if (type == 'dynamicContent') {
+                    var dynConId = slot.attr('data-param-dec-id');
+                    dynConId = '#emailform_dynamicContent_' + dynConId;
+                    var dynConTarget = parent.mQuery(dynConId);
+                    // clear name, so the slot:destroy event deletes it
+                    dynConTarget.find(dynConId + '_tokenName').val('');
+                }
                 slot.trigger('slot:destroy', {slot: slot, type: type});
                 mQuery.each(Mautic.builderSlots, function(i, slotParams) {
                     if (slotParams.slot.is(slot)) {
@@ -858,7 +966,12 @@ Mautic.initSlotListeners = function() {
             focus.remove();
         });
 
-        slot.on('click', function() {
+        slot.on('click', function(e) {
+            e.stopPropagation();
+
+            Mautic.deleteCodeModeSlot();
+            Mautic.removeAddVariantButton();
+
             var clickedSlot = mQuery(this);
 
             // Trigger the slot:change event
@@ -883,25 +996,61 @@ Mautic.initSlotListeners = function() {
             // Update form in the Customize tab to the form of the focused slot type
             var focusType = clickedSlot.attr('data-slot');
             var focusForm = mQuery(parent.mQuery('script[data-slot-type-form="'+focusType+'"]').html());
-            parent.mQuery('#slot-form-container').html(focusForm);
+            var slotFormContainer = parent.mQuery('#slot-form-container');
+
+            if (focusType == 'dynamicContent') {
+                var nff = Mautic.initEmailDynamicContentSlotEdit(clickedSlot);
+                // replace focusForm
+                nff.insertAfter(focusForm.find('#slot_dynamiccontent > div.has-error'));
+            }
+
+            slotFormContainer.html(focusForm);
 
             // Prefill the form field values with the values from slot attributes if any
             parent.mQuery.each(clickedSlot.get(0).attributes, function(i, attr) {
-                var attrPrefix = 'data-param-';
                 var regex = /data-param-(.*)/;
                 var match = regex.exec(attr.name);
 
                 if (match !== null) {
+
                     focusForm.find('input[type="text"][data-slot-param="'+match[1]+'"]').val(attr.value);
-                    focusForm.find('input[type="radio"][data-slot-param="'+match[1]+'"][value="'+attr.value+'"]').prop('checked', 1);
+
+                    var selectField = focusForm.find('select[data-slot-param="'+match[1]+'"]');
+
+                    if (selectField.length) {
+                        selectField.val(attr.value)
+                    }
+
+                    // URL fields
+                    var urlField = focusForm.find('input[type="url"][data-slot-param="'+match[1]+'"]');
+
+                    if (urlField.length) {
+                        urlField.val(attr.value);
+                    }
+
+                    // Number fields
+                    var numberField = focusForm.find('input[type="number"][data-slot-param="'+match[1]+'"]');
+
+                    if (numberField.length) {
+                        numberField.val(attr.value);
+                    }
+
+                    var radioField = focusForm.find('input[type="radio"][data-slot-param="'+match[1]+'"][value="'+attr.value+'"]');
+
+                    if (radioField.length) {
+                        radioField.parent('.btn').addClass('active');
+                        radioField.attr('checked', true);
+                    }
                 }
             });
 
-            focusForm.on('keyup', function(e) {
+            focusForm.on('keyup change', function(e) {
                 var field = mQuery(e.target);
 
                 // Store the slot settings as attributes
-                clickedSlot.attr('data-param-'+field.attr('data-slot-param'), field.val());
+                if (field.attr('data-slot-param')) {
+                    clickedSlot.attr('data-param-'+field.attr('data-slot-param'), field.val());
+                }
 
                 // Trigger the slot:change event
                 clickedSlot.trigger('slot:change', {slot: clickedSlot, field: field, type: focusType});
@@ -921,16 +1070,41 @@ Mautic.initSlotListeners = function() {
 
             // Initialize the color picker
             focusForm.find('input[data-toggle="color"]').each(function() {
-                parent.Mautic.activateColorPicker(this);
+                parent.Mautic.activateColorPicker(this, {
+                    change: function() {
+                        var field = mQuery(this);
+
+                        // Store the slot settings as attributes
+                        clickedSlot.attr('data-param-'+field.attr('data-slot-param'), field.val());
+
+                        clickedSlot.trigger('slot:change', {slot: clickedSlot, field: field, type: focusType});
+                    }
+                });
             });
 
-            focusForm.find('textarea.editor').each(function() {
+            // initialize code mode slots
+            if ('codemode' === type) {
+                Mautic.codeMode = true;
+                var element = focusForm.find('#slot_codemode_content')[0];
+                if (element) {
+                    Mautic.builderCodeMirror = CodeMirror.fromTextArea(element, {
+                        lineNumbers: true,
+                        mode: 'htmlmixed',
+                        extraKeys: {"Ctrl-Space": "autocomplete"},
+                        lineWrapping: true,
+                    });
+                    Mautic.builderCodeMirror.getDoc().setValue(slot.find('#codemodeHtmlContainer').html());
+                    Mautic.keepPreviewAlive(null, slot.find('#codemodeHtmlContainer'));
+                }
+            }
+
+            focusForm.find('textarea.editor').each(function () {
                 var theEditor = this;
                 var slotHtml = parent.mQuery('<div/>').html(clickedSlot.html());
                 slotHtml.find('[data-slot-focus]').remove();
                 slotHtml.find('[data-slot-toolbar]').remove();
 
-                var buttons = ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'paragraphFormat', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'insertLink', 'insertImage', 'insertGatedVideo', 'insertTable', 'html', 'fullscreen']
+                var buttons = ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'paragraphFormat', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'token', 'insertLink', 'insertImage', 'insertGatedVideo', 'insertTable', 'html', 'fullscreen'];
 
                 var builderEl = parent.mQuery('.builder');
 
@@ -945,39 +1119,40 @@ Mautic.initSlotListeners = function() {
                     toolbarButtonsMD: buttons,
                     toolbarButtonsSM: buttons,
                     toolbarButtonsXS: buttons,
+                    toolbarSticky: false,
                     linkList: [], // TODO push here the list of tokens from Mautic.getPredefinedLinks
                     imageEditButtons: ['imageReplace', 'imageAlign', 'imageRemove', 'imageAlt', 'imageSize', '|', 'imageLink', 'linkOpen', 'linkEdit', 'linkRemove']
                 };
 
-                // init AtWho in a froala editor
-                parent.mQuery(this).on('froalaEditor.initialized', function (e, editor) {
-                    parent.Mautic.initAtWho(editor.$el, parent.Mautic.getBuilderTokensMethod(), editor);
-
-                    Mautic.setTextSlotEditorStyle(editor.$el, clickedSlot);
-                });
+                // prevent overriding variant content in editor
+                if (focusType !== 'dynamicContent') {
+                    // init AtWho in a froala editor
+                    parent.mQuery(this).on('froalaEditor.initialized', function (e, editor) {
+                        parent.Mautic.initAtWho(editor.$el, parent.Mautic.getBuilderTokensMethod(), editor);
+                        Mautic.setTextSlotEditorStyle(editor.$el, clickedSlot);
+                    });
+                }
 
                 parent.mQuery(this).on('froalaEditor.contentChanged', function (e, editor) {
-                    var slotHtml = mQuery('<div/>').append(parent.mQuery(theEditor).froalaEditor('html.get'));
-                    clickedSlot.html(slotHtml.html());
+                    var slotHtml = mQuery('<div/>').append(editor.html.get());
+                    // replace DEC with content from the first editor
+                    if (!(focusType == 'dynamicContent' && mQuery(this).attr('id').match(/filters/))) {
+                        clickedSlot.html(slotHtml.html());
+                    }
                 });
-                parent.mQuery(this).val(slotHtml.html());
+
+                // replace only the first editor content for DEC
+                if (!(focusType == 'dynamicContent' && mQuery(this).attr('id').match(/filters/))) {
+                    parent.mQuery(this).val(slotHtml.html());
+                }
 
                 parent.mQuery(this).froalaEditor(parent.mQuery.extend({}, Mautic.basicFroalaOptions, froalaOptions));
             });
 
-            parent.mQuery('#slot-form-container').on('change.minicolors', function(e, hex) {
-                var field = mQuery(e.target);
-
-                // Store the slot settings as attributes
-                clickedSlot.attr('data-param-'+field.attr('data-slot-param'), field.val());
-
-                // Trigger the slot:change event
-                clickedSlot.trigger('slot:change', {slot: clickedSlot, field: field, type: focusType});
-            });
         });
 
         // Initialize different slot types
-        if (type === 'image') {
+        if (type === 'image' || type === 'imagecaption' || type === 'imagecard') {
             var image = slot.find('img');
             // fix of badly destroyed image slot
             image.removeAttr('data-froala.editor');
@@ -987,46 +1162,164 @@ Mautic.initSlotListeners = function() {
             });
 
             // Init Froala editor
-            image.froalaEditor(mQuery.extend({}, Mautic.basicFroalaOptions, {
+            var froalaOptions = mQuery.extend({}, Mautic.basicFroalaOptions, {
                     linkList: [], // TODO push here the list of tokens from Mautic.getPredefinedLinks
                     imageEditButtons: ['imageReplace', 'imageAlign', 'imageAlt', 'imageSize', '|', 'imageLink', 'linkOpen', 'linkEdit', 'linkRemove'],
                     useClasses: false
                 }
-            ));
+            );
+            image.froalaEditor(froalaOptions);
         } else if (type === 'button') {
             slot.find('a').click(function(e) {
                 e.preventDefault();
             });
+        } else if (type === 'dynamicContent') {
+            if (slot.html().match(/__dynamicContent__/)) {
+                var decs = mQuery('[data-slot="dynamicContent"]');
+                var ids = mQuery.map(decs, function(e){return mQuery(e).attr('data-param-dec-id');})
+                var maxId = Math.max.apply(Math, ids);
+                if (isNaN(maxId) || Number.NEGATIVE_INFINITY == maxId) maxId = 0;
+                slot.attr('data-param-dec-id', maxId + 1);
+                slot.html('Dynamic Content');
+                Mautic.createNewDynamicContentItem(parent.mQuery);
+            }
         }
 
         // Store the slot to a global var
         Mautic.builderSlots.push({slot: slot, type: type});
     });
 
+    Mautic.getPredefinedLinks = function(callback) {
+        var linkList = [];
+        Mautic.getTokens(Mautic.getBuilderTokensMethod(), function(tokens) {
+            if (tokens.length) {
+                mQuery.each(tokens, function(token, label) {
+                    if (token.startsWith('{pagelink=') ||
+                        token.startsWith('{assetlink=') ||
+                        token.startsWith('{webview_url') ||
+                        token.startsWith('{unsubscribe_url')) {
+
+                        linkList.push({
+                            text: label,
+                            href: token
+                        });
+                    }
+                });
+            }
+            return callback(linkList);
+        });
+    };
+
     Mautic.builderContents.on('slot:change', function(event, params) {
         // Change some slot styles when the values are changed in the slot edit form
         var fieldParam = params.field.attr('data-slot-param');
+        var type = params.type;
+
+        if (type !== "dynamicContent") {
+            Mautic.removeAddVariantButton();
+        }
+
+        Mautic.clearSlotFormError(fieldParam);
+
         if (fieldParam === 'padding-top' || fieldParam === 'padding-bottom') {
             params.slot.css(fieldParam, params.field.val() + 'px');
+        } else if ('glink' === fieldParam || 'flink' === fieldParam || 'tlink' === fieldParam) {
+            params.slot.find('#'+fieldParam).attr('href', params.field.val());
         } else if (fieldParam === 'href') {
-            params.slot.find('a').attr('href', params.field.val());
+            params.slot.find('a').eq(0).attr('href', params.field.val());
         } else if (fieldParam === 'link-text') {
-            params.slot.find('a').text(params.field.val());
+            params.slot.find('a').eq(0).text(params.field.val());
         } else if (fieldParam === 'float') {
             var values = ['left', 'center', 'right'];
             params.slot.find('a').parent().attr('align', values[params.field.val()]);
+        } else if (fieldParam === 'caption') {
+            params.slot.find('figcaption').text(params.field.val());
+        } else if (fieldParam === 'cardcaption') {
+            params.slot.find('td.imagecard-caption').text(params.field.val());
+        } else if (fieldParam === 'text-align') {
+            var values = ['left', 'center', 'right'];
+            if (type === 'imagecard') {
+                params.slot.find('.imagecard-caption').css(fieldParam, values[params.field.val()]);
+            } else if (type === 'imagecaption') {
+                params.slot.find('figcaption').css(fieldParam, values[params.field.val()]);
+            }
+        } else if (fieldParam === 'align') {
+            Mautic.builderContents.find('[data-slot-focus]').each( function() {
+                var focusedSlot = mQuery(this).closest('[data-slot]');
+                if (focusedSlot.attr('data-slot') == 'image') {
+                    // Deactivate froala toolbar
+                    focusedSlot.find('img').each( function() {
+                        mQuery(this).froalaEditor('popups.hideAll');
+                    });
+                    Mautic.builderContents.find('.fr-image-resizer.fr-active').removeClass('fr-active');
+                }
+            });
+
+            var values = ['left', 'center', 'right'];
+            if ('socialfollow' === type) {
+                params.slot.find('div.socialfollow').css('text-align', values[params.field.val()]);
+            } else if ('imagecaption' === type) {
+                params.slot.find('figure').css('text-align', values[params.field.val()]);
+            } else if ('imagecard' === type) {
+                params.slot.find('td.imagecard-image').css('text-align', values[params.field.val()]);
+            } else {
+                params.slot.find('img').closest('div').css('text-align', values[params.field.val()]);
+            }
         } else if (fieldParam === 'button-size') {
+            var bg_clr = params.slot.attr('data-param-background-color');
             var values = [
-                {padding: '10px 13px', fontSize: '14px'},
-                {padding: '15px 20px', fontSize: '20px'},
-                {padding: '22px 30px', fontSize: '30px'}
+                {borderWidth: '10px 20px', padding: '0', fontSize: '14px', borderColor : bg_clr, borderStyle: 'solid'},
+                {borderWidth: '20px 23px', padding: '0', fontSize: '20px', borderColor : bg_clr, borderStyle: 'solid'},
+                {borderWidth: '25px 40px', padding: '0', fontSize: '30px', borderColor : bg_clr, borderStyle: 'solid'}
             ];
             params.slot.find('a').css(values[params.field.val()]);
+        } else if (fieldParam === 'caption-color') {
+            params.slot.find('.imagecard-caption').css('background-color', '#' + params.field.val());
         } else if (fieldParam === 'background-color') {
-            params.slot.find('a').css(fieldParam, '#'+params.field.val());
-            params.slot.find('a').attr('background', '#'+params.field.val());
+            if ('imagecard' === type) {
+                params.slot.find('.imagecard').css(fieldParam, '#' + params.field.val());
+            } else {
+                params.slot.find('a').css(fieldParam, '#' + params.field.val());
+                params.slot.find('a').attr('background', '#' + params.field.val());
+                params.slot.find('a').css('border-color', '#' + params.field.val());
+            }
         } else if (fieldParam === 'color') {
-            params.slot.find('a').css(fieldParam, '#'+params.field.val());
+            if ('imagecard' === type) {
+                params.slot.find('.imagecard-caption').css(fieldParam, '#' + params.field.val());
+            } else if ('imagecaption' === type) {
+                params.slot.find('figcaption').css(fieldParam, '#' + params.field.val());
+            } else {
+                params.slot.find('a').css(fieldParam, '#' + params.field.val());
+            }
+        } else if (/gatedvideo/.test(fieldParam)) {
+            // Handle gatedVideo replacements
+            var toInsert = fieldParam.split('-')[1];
+            var insertVal = params.field.val();
+
+            if (toInsert === 'url') {
+                var videoProvider = Mautic.getVideoProvider(insertVal);
+
+                if (videoProvider == null) {
+                    Mautic.slotFormError(fieldParam, 'Please enter a valid YouTube, Vimeo, or MP4 url.');
+                } else {
+                    params.slot.find('source')
+                        .attr('src', insertVal)
+                        .attr('type', videoProvider);
+                }
+            } else if (toInsert === 'gatetime') {
+                params.slot.find('video').attr('data-gate-time', insertVal);
+            } else if (toInsert === 'formid') {
+                params.slot.find('video').attr('data-form-id', insertVal);
+            } else if (toInsert === 'height') {
+                params.slot.find('video').attr('height', insertVal);
+            } else if (toInsert === 'width') {
+                params.slot.find('video').attr('width', insertVal);
+            }
+        } else if (fieldParam === 'separator-color') {
+            params.slot.find('hr').css('border-color', '#' + params.field.val());
+        } else if (fieldParam === 'separator-thickness') {
+            var sep_color = params.slot.attr('data-param-separator-color');
+            params.slot.find('hr').css('border', params.field.val() + 'px solid #'+ sep_color);
         }
 
         if (params.type == 'text') {
@@ -1035,13 +1328,43 @@ Mautic.initSlotListeners = function() {
     });
 
     Mautic.builderContents.on('slot:destroy', function(event, params) {
-        if (params.type === 'image') {
+        // reattach DEC
+        if (typeof Mautic.activeDEC !== 'undefined') {
+            var element = Mautic.activeDEC.detach();
+            Mautic.activeDECParent.append(element);
+        }
+
+        if (params.type === 'text') {
+            if (parent.mQuery('#slot_content').length) {
+                parent.mQuery('#slot_content').froalaEditor('destroy');
+                parent.mQuery('#slot_content').find('.atwho-inserted').atwho('destroy');
+            }
+        } else if (params.type === 'image') {
+            Mautic.deleteCodeModeSlot();
+
             var image = params.slot.find('img');
             if (typeof image !== 'undefined' && image.hasClass('fr-view')) {
                 image.froalaEditor('destroy');
                 image.removeAttr('data-froala.editor');
                 image.removeClass('fr-view');
             }
+        } else if (params.type === 'dynamicContent') {
+            Mautic.removeAddVariantButton();
+            // remove new DEC if name is empty
+            var dynConId = params.slot.attr('data-param-dec-id');
+            dynConId = '#emailform_dynamicContent_'+dynConId;
+            if (Mautic.activeDEC.attr('id') === dynConId.substr(1)) {
+                delete Mautic.activeDEC;
+                delete Mautic.activeDECParent;
+            }
+            var dynConTarget = parent.mQuery(dynConId);
+            var dynConName   = dynConTarget.find(dynConId+'_tokenName').val();
+            if (dynConName === '') {
+                dynConTarget.find('a.remove-item:first').click();
+                // remove vertical tab in outside form
+                parent.mQuery('.dynamicContentFilterContainer').find('a[href=' + dynConId + ']').parent().remove();
+                params.slot.remove();
+            }
         }
 
         // Remove Symfony toolbar
@@ -1049,6 +1372,67 @@ Mautic.initSlotListeners = function() {
     });
 };
 
+Mautic.deleteCodeModeSlot = function() {
+    Mautic.killLivePreview();
+    Mautic.destroyCodeMirror();
+    delete Mautic.codeMode;
+};
+
+Mautic.clearSlotFormError = function(field) {
+    var customizeSlotField = parent.mQuery('#customize-form-container').find('[data-slot-param="'+field+'"]');
+
+    if (customizeSlotField.length) {
+        customizeSlotField.attr('style', '');
+        customizeSlotField.next('[data-error]').remove();
+    }
+};
+
+Mautic.slotFormError = function (field, message) {
+    var customizeSlotField = parent.mQuery('#customize-form-container').find('[data-slot-param="'+field+'"]');
+
+    if (customizeSlotField.length) {
+        customizeSlotField.css('border-color', 'red');
+
+        if (message.length) {
+            var messageContainer = mQuery('<p/>')
+                .text(message)
+                .attr('data-error', 'true')
+                .css({
+                    color: 'red',
+                    padding: '5px 0'
+                });
+
+            messageContainer.insertAfter(customizeSlotField);
+        }
+    }
+};
+
+Mautic.getVideoProvider = function(url) {
+    var providers = [
+        {
+            test_regex: /^.*((youtu.be)|(youtube.com))\/((v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))?\??v?=?([^#\&\?]*).*/,
+            provider: 'video/youtube'
+        },
+        {
+            test_regex: /^.*(vimeo\.com\/)((channels\/[A-z]+\/)|(groups\/[A-z]+\/videos\/))?([0-9]+)/,
+            provider: 'video/vimeo'
+        },
+        {
+            test_regex: /mp4/,
+            provider: 'video/mp4'
+        }
+    ];
+
+    for (var i = 0; i < providers.length; i++) {
+        var vp = providers[i];
+        if (vp.test_regex.test(url)) {
+            return vp.provider;
+        }
+    }
+
+    return null;
+};
+
 Mautic.setTextSlotEditorStyle = function(editorEl, slot)
 {
     // Set the editor CSS to that of the slot
@@ -1068,7 +1452,7 @@ Mautic.setTextSlotEditorStyle = function(editorEl, slot)
             wrapper.css(style, overrideStyle);
         }
     });
-}
+};
 
 Mautic.getSlotStyle = function(slot, styleName, fallback) {
     if ('background-color' == styleName) {
@@ -1116,6 +1500,81 @@ Mautic.getBuilderTokensMethod = function() {
     return method;
 };
 
+Mautic.prepareDynamicContentBlocksForBuilder = function(builderHtml) {
+    for (var token in Mautic.builderTokens) {
+        // If this is a dynamic content token
+        if (Mautic.builderTokens.hasOwnProperty(token) && /\{dynamic/.test(token)) {
+            var defaultContent = Mautic.convertDynamicContentTokenToSlot(token);
+
+            builderHtml = builderHtml.replace(token, defaultContent);
+        }
+    }
+
+    return builderHtml;
+};
+
+Mautic.convertDynamicContentTokenToSlot = function(token) {
+    var dynConData = Mautic.getDynamicContentDataForToken(token);
+
+    if (dynConData) {
+        return '<div data-slot="dynamicContent" contenteditable="false" data-param-dec-id="'+dynConData.id+'">'+dynConData.content+'</div>';
+    }
+
+    return token;
+};
+
+Mautic.getDynamicContentDataForToken = function(token) {
+    var dynConName      = /\{dynamiccontent="(.*)"}/.exec(token)[1];
+    var dynConTabs      = parent.mQuery('#dynamicContentTabs');
+    var dynConTarget    = dynConTabs.find('a:contains("'+dynConName+'")').attr('href');
+    var dynConContainer = parent.mQuery(dynConTarget);
+
+    if (dynConContainer.html()) {
+        var dynConContent = dynConContainer.find(dynConTarget+'_content');
+
+        if (dynConContent.hasClass('editor')) {
+            dynConContent = dynConContent.froalaEditor('html.get');
+        } else {
+            dynConContent = dynConContent.html();
+        }
+
+        return {
+            id: parseInt(dynConTarget.replace(/[^0-9]/g, '')),
+            content: dynConContent
+        };
+    }
+
+    return null;
+};
+
+Mautic.convertDynamicContentSlotsToTokens = function (builderHtml) {
+    var dynConSlots = mQuery(builderHtml).find('[data-slot="dynamicContent"]');
+
+    if (dynConSlots.length) {
+        dynConSlots.each(function(i) {
+            var $this    = mQuery(this);
+            // if ($this.parents('[data-slot]').length == 0) return; // prevent affecting standalone DEC slots
+            var dynConId = $this.attr('data-param-dec-id');
+
+            dynConId = '#emailform_dynamicContent_'+dynConId;
+
+            var dynConTarget = mQuery(dynConId);
+            var dynConName   = dynConTarget.find(dynConId+'_tokenName').val();
+            var dynConToken  = '{dynamiccontent="'+dynConName+'"}';
+
+            builderHtml = builderHtml.replace(this.outerHTML, dynConToken);
+
+            // If it's still wrapped in an atwho, remove that
+            if ($this.parent().hasClass('atwho-inserted')) {
+                var toReplace = $this.parent('.atwho-inserted').get(0).outerHTML;
+
+                builderHtml   = builderHtml.replace(toReplace, dynConToken);
+            }
+        });
+    }
+
+    return builderHtml;
+};
 
 Mautic.getPredefinedLinks = function(callback) {
     var linkList = [];
@@ -1136,7 +1595,7 @@ Mautic.getPredefinedLinks = function(callback) {
         }
         return callback(linkList);
     });
-}
+};
 
 // Init inside the builder's iframe
 mQuery(function() {
diff --git a/app/bundles/CoreBundle/Assets/js/6.forms.js b/app/bundles/CoreBundle/Assets/js/6.forms.js
index c4f7b259406..2a99ac2f160 100644
--- a/app/bundles/CoreBundle/Assets/js/6.forms.js
+++ b/app/bundles/CoreBundle/Assets/js/6.forms.js
@@ -398,7 +398,7 @@ Mautic.updateEntitySelect = function (response) {
 
         if (mQueryParent(el).prop('disabled')) {
             mQueryParent(el).prop('disabled', false);
-                var emptyOption = mQuery('<option value="">' + mauticLang.chosenChooseOne + '</option>');
+            var emptyOption = mQuery('<option value="">' + mauticLang.chosenChooseOne + '</option>');
         } else {
             if (mQueryParent(el + ' option[value=""]').length) {
                 emptyOption = mQueryParent(el + ' option[value=""]').clone();
@@ -417,7 +417,7 @@ Mautic.updateEntitySelect = function (response) {
             var optgroup = el + ' optgroup[label="'+response.group+'"]';
             if (mQueryParent(optgroup).length) {
                 // update option when new option equal with option item in group.
-                    var firstOptionGroups = mQueryParent(optgroup);
+                var firstOptionGroups = mQueryParent(optgroup);
                 var isUpdateOption = false;
                 firstOptionGroups.each(function () {
                     var firstOptions = mQuery(this).children();
@@ -432,7 +432,7 @@ Mautic.updateEntitySelect = function (response) {
 
                 if (!isUpdateOption) {
                     //the optgroup exist so append to it
-                        mQueryParent(optgroup).append(newOption);
+                    mQueryParent(optgroup).append(newOption);
                 }
             } else {
                 //create the optgroup
@@ -534,6 +534,17 @@ Mautic.removeFormListOption = function (el) {
     mQuery(sortableDiv).remove();
 };
 
+/**
+ * Creates a select option element with a name and label
+ * @param value
+ * @param label
+ */
+Mautic.createOption = function (value, label) {
+    return mQuery('<option/>')
+        .attr('value', value)
+        .text(label);
+}
+
 /**
  * Updates operator select and value input format based on selected field and operator
  *
@@ -564,26 +575,33 @@ Mautic.updateFieldOperatorValue = function(field, action) {
                 'id': valueField.attr('id'),
                 'name': valueField.attr('name'),
                 'autocomplete': valueField.attr('autocomplete'),
-                'value': valueField.attr('value')
+                'value': valueField.val()
             };
 
             if (mQuery('#'+fieldPrefix+'value_chosen').length) {
-                mQuery('#'+fieldPrefix+'value').chosen('destroy');
+                valueFieldAttrs['value'] = '';
+                valueField.chosen('destroy');
             }
 
-            if (!mQuery.isEmptyObject(response.options)) {
+            if (!mQuery.isEmptyObject(response.options) && response.fieldType !== 'number') {
                 var newValueField = mQuery('<select/>')
                     .attr('class', valueFieldAttrs['class'])
                     .attr('id', valueFieldAttrs['id'])
                     .attr('name', valueFieldAttrs['name'])
                     .attr('autocomplete', valueFieldAttrs['autocomplete'])
                     .attr('value', valueFieldAttrs['value']);
-                mQuery.each(response.options, function(optionKey, optionVal) {
-                    var option = mQuery("<option/>")
-                        .attr('value', optionKey)
-                        .text(optionVal);
-                    newValueField.append(option);
+                mQuery.each(response.options, function(value, optgroup) {
+                    if (typeof optgroup === 'object') {
+                        var optgroupEl = mQuery('<optgroup/>').attr('label', value);
+                        mQuery.each(optgroup, function(optVal, label) {
+                            optgroupEl.append(Mautic.createOption(optVal, label))
+                        });
+                        newValueField.append(optgroupEl);
+                    } else {
+                        newValueField.append(Mautic.createOption(value, optgroup));
+                    }
                 });
+                newValueField.val(valueFieldAttrs['value']);
                 valueField.replaceWith(newValueField);
 
                 Mautic.activateChosenSelect(newValueField);
@@ -597,6 +615,7 @@ Mautic.updateFieldOperatorValue = function(field, action) {
                     .attr('value', valueFieldAttrs['value']);
 
                 if (response.disabled) {
+                    newValueField.attr('value', '');
                     newValueField.prop('disabled', true);
                 }
 
@@ -608,17 +627,18 @@ Mautic.updateFieldOperatorValue = function(field, action) {
             }
 
             if (!mQuery.isEmptyObject(response.operators)) {
+                var operatorField = mQuery('#'+fieldPrefix+'operator');
+
                 if (mQuery('#'+fieldPrefix+'operator_chosen').length) {
-                    mQuery('#'+fieldPrefix+'operator').chosen('destroy');
+                    operatorField.chosen('destroy');
                 }
 
-                var operatorField = mQuery('#'+fieldPrefix+'operator');
                 var operatorFieldAttrs = {
                     'class': operatorField.attr('class'),
                     'id': operatorField.attr('id'),
                     'name': operatorField.attr('name'),
                     'autocomplete': operatorField.attr('autocomplete'),
-                    'value': operatorField.attr('value')
+                    'value': operatorField.val()
                 };
 
                 var newOperatorField = mQuery('<select/>')
@@ -629,11 +649,9 @@ Mautic.updateFieldOperatorValue = function(field, action) {
                     .attr('value', operatorFieldAttrs['value'])
                     .attr('onchange', 'Mautic.updateLeadFieldValues(this)');
                 mQuery.each(response.operators, function(optionKey, optionVal) {
-                    var option = mQuery("<option/>")
-                        .attr('value', optionKey)
-                        .text(optionVal);
-                    newOperatorField.append(option);
+                    newOperatorField.append(Mautic.createOption(optionKey, optionVal));
                 });
+                newOperatorField.val(operatorField.val());
                 operatorField.replaceWith(newOperatorField);
                 Mautic.activateChosenSelect(newOperatorField);
             }
diff --git a/app/bundles/CoreBundle/Assets/js/9.modals.js b/app/bundles/CoreBundle/Assets/js/9.modals.js
index 0428d6b245f..1db66d30a56 100644
--- a/app/bundles/CoreBundle/Assets/js/9.modals.js
+++ b/app/bundles/CoreBundle/Assets/js/9.modals.js
@@ -83,8 +83,14 @@ Mautic.loadAjaxModal = function (target, route, method, header, footer, preventD
 
         mQuery('body').removeClass('noscroll');
 
+        var response = {};
+        if (Mautic.modalMauticContent) {
+            response.mauticContent = Mautic.modalMauticContent;
+            delete Mautic.modalMauticContent;
+        }
+
         //unload
-        Mautic.onPageUnload(target);
+        Mautic.onPageUnload(target, response);
 
         Mautic.resetModal(target);
     });
@@ -229,23 +235,23 @@ Mautic.processModalContent = function (response, target) {
 
         //activate content specific stuff
         Mautic.onPageLoad(target, response, true);
-
+        Mautic.modalMauticContent = false;
         if (response.closeModal) {
             mQuery('body').removeClass('noscroll');
             mQuery(target).modal('hide');
 
-            if (!response.updateModalContent) {
-                Mautic.onPageUnload(target, response);
-            }
-
             if (response.mauticContent) {
                 if (typeof Mautic[response.mauticContent + "OnLoad"] == 'function') {
-                    if (typeof Mautic.loadedContent[response.mauticContent] == 'undefined') {
-                        Mautic.loadedContent[response.mauticContent] = true;
-                        Mautic[response.mauticContent + "OnLoad"](target, response);
-                    }
+                    Mautic[response.mauticContent + "OnLoad"](target, response);
                 }
             }
+
+            if (!response.updateModalContent) {
+                Mautic.onPageUnload(target, response);
+            }
+        } else {
+            // Note for the hidden event
+            Mautic.modalMauticContent = response.mauticContent ? response.mauticContent : false;
         }
     }
 };
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js b/app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js
index ff76f1d90aa..987546412a0 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js
+++ b/app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js
@@ -5514,10 +5514,14 @@
     var rnumnonpx = new RegExp("^(" + pnum + ")(?!px)[a-z%]+$", "i");
 
     var getStyles = function (elem) {
-        return elem.ownerDocument.defaultView.getComputedStyle(elem, null);
+        // prevent Uncaught error: call to getComputedStyle on undefined
+        if (elem.ownerDocument && elem.ownerDocument.defaultView)
+            return elem.ownerDocument.defaultView.getComputedStyle(elem, null);
+        else if (window.getComputedStyle)
+            return getComputedStyle(elem, null);
+        return {};
     };
 
-
     function curCSS(elem, name, computed) {
         var width, minWidth, maxWidth, ret,
             style = elem.style;
@@ -5617,8 +5621,11 @@
             docElem.appendChild(container);
 
             var divStyle = window.getComputedStyle(div, null);
-            pixelPositionVal = divStyle.top !== "1%";
-            boxSizingReliableVal = divStyle.width === "4px";
+            // fix for Uncaught TypeError: Cannot read property 'top' of undefined
+            if (divStyle) {
+                pixelPositionVal = divStyle.top !== "1%";
+                boxSizingReliableVal = divStyle.width === "4px";
+            }
 
             docElem.removeChild(container);
         }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/4j.codemirror.js b/app/bundles/CoreBundle/Assets/js/libraries/4j.codemirror.js
index 5439299b397..b0079f39b96 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/4j.codemirror.js
+++ b/app/bundles/CoreBundle/Assets/js/libraries/4j.codemirror.js
@@ -3586,12 +3586,16 @@
     }
     if (clickInGutter(cm, e)) return;
     var start = posFromMouse(cm, e);
-    window.focus();
+    var codeMode = typeof Mautic != 'undefined' && Mautic.codeMode === true;
+
+    if (!codeMode) {
+      window.focus();
+    }
 
     switch (e_button(e)) {
     case 1:
       // #3261: make sure, that we're not starting a second selection
-      if (cm.state.selectingText)
+      if (cm.state.selectingText && !codeMode)
         cm.state.selectingText(e);
       else if (start)
         leftButtonDown(cm, e, start);
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/froala/plugins/token.js b/app/bundles/CoreBundle/Assets/js/libraries/froala/plugins/token.js
index 07e130d3f34..1edf1c41c06 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/froala/plugins/token.js
+++ b/app/bundles/CoreBundle/Assets/js/libraries/froala/plugins/token.js
@@ -34,26 +34,83 @@
 
   'use strict';
 
+    $.extend($.FE.DEFAULTS, {
+        tokens: {},
+        tokenSelection: false,
+        tokenDefaultSelection: 'Token'
+    });
+
   $.FE.PLUGINS.token = function (editor) {
 
-    function apply () {
-      editor.html.insert(' {');
-      editor.$el.keyup();
+    function apply (val) {
+      editor.html.insert(val);
     }
 
     return {
       apply: apply
     }
-  }
+  };
 
   // Register the token command.
   $.FE.RegisterCommand('token', {
-    title: 'Insert token',
-    callback: function (cmd) {
-      this.token.apply();
-    },
-    plugin: 'token'
-  })
+      type: 'dropdown',
+      displaySelection: function (editor) {
+          return editor.opts.tokenSelection;
+      },
+      defaultSelection: function (editor) {
+          return editor.opts.tokenDefaultSelection;
+      },
+      displaySelectionWidth: 120,
+      html: function () {
+          var c = '<ul class="fr-dropdown-list" role="presentation">';
+          var self = this;
+          var method = location.href.match(/email/i)? 'email:getBuilderTokens' : 'page:getBuilderTokens';
+          Mautic.getTokens(method, function(tokens) {
+              mQuery.each(tokens, function(k,v){
+                  if (k.match(/assetlink=/i)){
+                      delete tokens[k];
+                      var nv = v.replace('a:', '');
+                      k = '<a title=\'Asset Link\' href=\'' + k + '\'>' + nv + '</a>';
+                      tokens[k] = nv;
+                  }
+                  if (k.match(/pagelink=/i)){
+                      delete tokens[k];
+                      var nv = v.replace('a:', '');
+                      k = '<a title=\'Page Link\' href=\'' + k + '\'>' + nv + '</a>';
+                      tokens[k] = nv;
+                  }
+                  if (k.match(/contactfield=company/i) && !v.match(/company/i)){
+                      tokens[k] = 'Company ' + v;
+                  }
+              });
+              self.opts.tokens = tokens;
+          });
+          var options = this.opts.tokens;
+          var k, keys = [];
+          for (k in options) {
+              if (options.hasOwnProperty(k)) {
+                  keys.push(k);
+              }
+          }
+          keys.sort();
+          for (var i = 0; i < keys.length; i++) {
+              var val = keys[i];
+              var str = ' <div class=\'badge-wrapper\'><span class=\'badge\'>_BADGE_</span></div>';
+              var badge = (val.match(/page link/i))? str.replace(/_BADGE_/, 'page') : (val.match(/asset link/i))? str.replace(/_BADGE_/, 'asset') : (val.match(/form=/i))? str.replace(/_BADGE_/,'form') : (val.match(/focus=/i))? str.replace(/_BADGE_/,'focus') : (val.match(/dynamiccontent=/i))? str.replace(/_BADGE_/,'dynamic') : '';
+              var title = options[val];
+              if (title.length>24) title = title.substr(0, 24) + '...';
+              c += '<li role="presentation"><a class="fr-command" tabIndex="-1" role="option" data-cmd="token" data-param1="' + val + '" title="' + title + '">' + title + badge + '</a></li>';
+          }
+          c += '</ul>';
+
+          return c;
+      },
+      title: 'Insert token',
+      callback: function (cmd, val) {
+          this.token.apply(val);
+      },
+      plugin: 'token'
+  });
 
   // Add the token icon.
   $.FE.DefineIcon('token', {
diff --git a/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php b/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
index ba39a58147c..da868585a73 100644
--- a/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
+++ b/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
@@ -51,9 +51,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Minify Mautic Form SDK
         file_put_contents(
-            $pathsHelper->getSystemPath('assets', true).'/js/mautic-form.js',
+            $pathsHelper->getSystemPath('assets', true).'/js/mautic-form-tmp.js',
             \Minify::combine([$pathsHelper->getSystemPath('assets', true).'/js/mautic-form-src.js'])
         );
+        // Fix the MauticSDK loader
+        file_put_contents(
+            $pathsHelper->getSystemPath('assets', true).'/js/mautic-form.js',
+            str_replace("'mautic-form-src.js'", "'mautic-form.js'",
+                file_get_contents($pathsHelper->getSystemPath('assets', true).'/js/mautic-form-tmp.js'))
+        );
+        // Remove temp file.
+        unlink($pathsHelper->getSystemPath('assets', true).'/js/mautic-form-tmp.js');
 
         /** @var \Symfony\Bundle\FrameworkBundle\Translation\Translator $translator */
         $translator = $container->get('translator');
diff --git a/app/bundles/CoreBundle/Config/config.php b/app/bundles/CoreBundle/Config/config.php
index 8201a86a638..2a83c950b39 100644
--- a/app/bundles/CoreBundle/Config/config.php
+++ b/app/bundles/CoreBundle/Config/config.php
@@ -85,6 +85,24 @@
                 'controller' => 'MauticCoreBundle:Api\FileApi:delete',
                 'method'     => 'DELETE',
             ],
+            'mautic_core_api_theme_list' => [
+                'path'       => '/themes',
+                'controller' => 'MauticCoreBundle:Api\ThemeApi:list',
+            ],
+            'mautic_core_api_theme_get' => [
+                'path'       => '/themes/{theme}',
+                'controller' => 'MauticCoreBundle:Api\ThemeApi:get',
+            ],
+            'mautic_core_api_theme_create' => [
+                'path'       => '/themes/new',
+                'controller' => 'MauticCoreBundle:Api\ThemeApi:new',
+                'method'     => 'POST',
+            ],
+            'mautic_core_api_theme_delete' => [
+                'path'       => '/themes/{theme}/delete',
+                'controller' => 'MauticCoreBundle:Api\ThemeApi:delete',
+                'method'     => 'DELETE',
+            ],
             'mautic_core_api_stats' => [
                'path'       => '/stats/{table}',
                'controller' => 'MauticCoreBundle:Api\StatsApi:list',
@@ -112,7 +130,7 @@
                 'route'     => 'mautic_themes_index',
                 'iconClass' => 'fa-newspaper-o',
                 'id'        => 'mautic_themes_index',
-                'access'    => 'admin',
+                'access'    => 'core:themes:view',
             ],
         ],
         'extra' => [
@@ -266,10 +284,42 @@
                 'class' => 'Mautic\CoreBundle\Form\Type\SlotButtonType',
                 'alias' => 'slot_button',
             ],
+            'mautic.form.type.slot.image' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotImageType',
+                'alias' => 'slot_image',
+            ],
+            'mautic.form.type.slot.separator' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotSeparatorType',
+                'alias' => 'slot_separator',
+            ],
+            'mautic.form.type.slot.imagecard' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotImageCardType',
+                'alias' => 'slot_imagecard',
+            ],
+            'mautic.form.type.slot.imagecaption' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotImageCaptionType',
+                'alias' => 'slot_imagecaption',
+            ],
+            'mautic.form.type.slot.socialshare' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotSocialShareType',
+                'alias' => 'slot_socialshare',
+            ],
+            'mautic.form.type.slot.socialfollow' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotSocialFollowType',
+                'alias' => 'slot_socialfollow',
+            ],
+            'mautic.form.type.slot.codemode' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotCodeModeType',
+                'alias' => 'slot_codemode',
+            ],
             'mautic.form.type.theme.upload' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\ThemeUploadType',
                 'alias' => 'theme_upload',
             ],
+            'mautic.form.type.slot.dynamiccontent' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\SlotDynamicContentType',
+                'alias' => 'slot_dynamiccontent',
+            ],
             'mautic.form.type.dynamic_content_filter' => [
                 'class' => \Mautic\CoreBundle\Form\Type\DynamicContentFilterType::class,
                 'alias' => 'dynamic_content_filter',
@@ -576,6 +626,7 @@
                 'arguments' => [
                     'mautic.helper.paths',
                     'mautic.helper.templating',
+                    'translator',
                 ],
                 'methodCalls' => [
                     'setDefaultTheme' => [
@@ -606,6 +657,7 @@
                     'mautic.security',
                     'request_stack',
                     '%mautic.parameters%',
+                    'mautic.helper.integration',
                 ],
             ],
             'mautic.menu_renderer' => [
diff --git a/app/bundles/CoreBundle/Controller/AbstractFormController.php b/app/bundles/CoreBundle/Controller/AbstractFormController.php
index bac18e112b2..fb2b74ea535 100644
--- a/app/bundles/CoreBundle/Controller/AbstractFormController.php
+++ b/app/bundles/CoreBundle/Controller/AbstractFormController.php
@@ -30,8 +30,9 @@ abstract class AbstractFormController extends CommonController
      */
     public function unlockAction($id, $modelName)
     {
-        $model  = $this->getModel($modelName);
-        $entity = $model->getEntity($id);
+        $model                = $this->getModel($modelName);
+        $entity               = $model->getEntity($id);
+        $this->permissionBase = $model->getPermissionBase();
 
         if ($this->canEdit($entity)) {
             if ($entity !== null && $entity->getCheckedOutBy() !== null) {
@@ -190,16 +191,22 @@ protected function canEdit($entity = null)
     {
         $security = $this->get('mautic.security');
 
-        if ($this->getPermissionBase()) {
-            if ($entity && $security->checkPermissionExists($this->getPermissionBase().':editown')) {
+        if ($this->permissionBase) {
+            $permissionBase = $this->permissionBase;
+        } else {
+            $permissionBase = $this->getPermissionBase();
+        }
+
+        if ($permissionBase) {
+            if ($entity && $security->checkPermissionExists($permissionBase.':editown')) {
                 return $security->hasEntityAccess(
-                    $this->getPermissionBase().':editown',
-                    $this->getPermissionBase().':editother',
+                    $permissionBase.':editown',
+                    $permissionBase.':editother',
                     $entity->getCreatedBy()
                 );
-            } elseif ($security->checkPermissionExists($this->getPermissionBase().':edit')) {
+            } elseif ($security->checkPermissionExists($permissionBase.':edit')) {
                 return $security->isGranted(
-                    $this->getPermissionBase().':edit'
+                    $permissionBase.':edit'
                 );
             }
         }
diff --git a/app/bundles/CoreBundle/Controller/AbstractStandardFormController.php b/app/bundles/CoreBundle/Controller/AbstractStandardFormController.php
index c9d17cb9fda..9c554831b67 100644
--- a/app/bundles/CoreBundle/Controller/AbstractStandardFormController.php
+++ b/app/bundles/CoreBundle/Controller/AbstractStandardFormController.php
@@ -12,6 +12,7 @@
 namespace Mautic\CoreBundle\Controller;
 
 use Mautic\CoreBundle\Entity\FormEntity;
+use Mautic\CoreBundle\Model\AbstractCommonModel;
 use Mautic\CoreBundle\Model\FormModel;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -406,8 +407,9 @@ protected function editStandard($objectId, $ignorePost = false)
             return $this->isLocked($postActionVars, $entity, $this->getModelName());
         }
 
-        $action = $this->generateUrl($this->getActionRoute(), ['objectAction' => 'edit', 'objectId' => $objectId]);
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action);
+        $options = $this->getEntityFormOptions();
+        $action  = $this->generateUrl($this->getActionRoute(), ['objectAction' => 'edit', 'objectId' => $objectId]);
+        $form    = $model->createForm($entity, $this->get('form.factory'), $action, $options);
 
         $isPost = !$ignorePost && $this->request->getMethod() == 'POST';
         $this->beforeFormProcessed($entity, $form, 'edit', $isPost, $objectId, $isClone);
@@ -753,6 +755,41 @@ protected function getViewArguments(array $args, $action)
         return $args;
     }
 
+    /**
+     * Return array of options for the form when it's being created.
+     *
+     * @return array
+     */
+    protected function getEntityFormOptions()
+    {
+        return [];
+    }
+
+    /**
+     * Return array of options update select response.
+     *
+     * @param string $updateSelect HTML id of the select
+     * @param object $entity
+     * @param string $nameMethod   name of the entity method holding the name
+     * @param string $groupMethod  name of the entity method holding the select group
+     *
+     * @return array
+     */
+    protected function getUpdateSelectParams($updateSelect, $entity, $nameMethod = 'getName', $groupMethod = 'getLanguage')
+    {
+        $options = [
+            'updateSelect' => $updateSelect,
+            'id'           => $entity->getId(),
+            'name'         => $entity->$nameMethod(),
+        ];
+
+        if ($groupMethod) {
+            $options['group'] = $entity->$groupMethod();
+        }
+
+        return $options;
+    }
+
     /**
      * @param        $objectId
      * @param        $returnUrl
@@ -929,8 +966,9 @@ protected function newStandard()
         //set the page we came from
         $page = $this->get('session')->get('mautic.'.$this->getSessionBase().'.page', 1);
 
-        $action = $this->generateUrl($this->getActionRoute(), ['objectAction' => 'new']);
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action);
+        $options = $this->getEntityFormOptions();
+        $action  = $this->generateUrl($this->getActionRoute(), ['objectAction' => 'new']);
+        $form    = $model->createForm($entity, $this->get('form.factory'), $action, $options);
 
         ///Check for a submitted form and process it
         $isPost = $this->request->getMethod() === 'POST';
@@ -963,17 +1001,31 @@ protected function newStandard()
                 $template       = $this->getControllerBase().':'.$this->getPostActionControllerAction('new');
             }
 
+            $passthrough = [
+                'mauticContent' => $this->getJsLoadMethodPrefix(),
+            ];
+
+            if ($isInPopup = isset($form['updateSelect'])) {
+                $template    = false;
+                $passthrough = array_merge(
+                    $passthrough,
+                    $this->getUpdateSelectParams($form['updateSelect']->getData(), $entity)
+                );
+            }
+
             if ($cancelled || ($valid && !$this->isFormApplied($form))) {
+                if ($isInPopup) {
+                    $passthrough['closeModal'] = true;
+                }
+
                 return $this->postActionRedirect(
                     $this->getPostActionRedirectArguments(
                         [
                             'returnUrl'       => $returnUrl,
                             'viewParameters'  => $viewParameters,
                             'contentTemplate' => $template,
-                            'passthroughVars' => [
-                                'mauticContent' => $this->getJsLoadMethodPrefix(),
-                            ],
-                            'entity' => $entity,
+                            'passthroughVars' => $passthrough,
+                            'entity'          => $entity,
                         ],
                         'new'
                     )
@@ -1008,6 +1060,7 @@ protected function newStandard()
                 ),
             ],
             'entity' => $entity,
+            'form'   => $form,
         ];
 
         return $this->delegateView(
@@ -1122,4 +1175,9 @@ protected function viewStandard($objectId, $logObject = null, $logBundle = null,
             $this->getViewArguments($delegateArgs, 'view')
         );
     }
+
+    protected function getDataForExport(AbstractCommonModel $model, array $args, callable $resultsCallback = null, $start = 0)
+    {
+        return parent::getDataForExport($model, $args, $resultsCallback, $start); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/app/bundles/CoreBundle/Controller/AjaxController.php b/app/bundles/CoreBundle/Controller/AjaxController.php
index 7e7546f7d8a..f4b19fd151d 100644
--- a/app/bundles/CoreBundle/Controller/AjaxController.php
+++ b/app/bundles/CoreBundle/Controller/AjaxController.php
@@ -689,7 +689,7 @@ protected function clearNotificationAction(Request $request)
 
         /** @var \Mautic\CoreBundle\Model\NotificationModel $model */
         $model = $this->getModel('core.notification');
-        $model->clearNotification($id);
+        $model->clearNotification($id, 200);
 
         return $this->sendJsonResponse(['success' => 1]);
     }
diff --git a/app/bundles/CoreBundle/Controller/Api/ThemeApiController.php b/app/bundles/CoreBundle/Controller/Api/ThemeApiController.php
new file mode 100644
index 00000000000..7566e207934
--- /dev/null
+++ b/app/bundles/CoreBundle/Controller/Api/ThemeApiController.php
@@ -0,0 +1,175 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Controller\Api;
+
+use Mautic\ApiBundle\Controller\CommonApiController;
+use Mautic\CoreBundle\Helper\InputHelper;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+
+/**
+ * Class ThemeApiController.
+ */
+class ThemeApiController extends CommonApiController
+{
+    /**
+     * @var Mautic\CoreBundle\Helper\ThemeHelper
+     */
+    protected $themeHelper;
+
+    /**
+     * @param FilterControllerEvent $event
+     */
+    public function initialize(FilterControllerEvent $event)
+    {
+        $this->themeHelper = $this->container->get('mautic.helper.theme');
+
+        parent::initialize($event);
+    }
+
+    /**
+     * Accepts the zip file and installs the theme from it.
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    public function newAction()
+    {
+        if (!$this->security->isGranted('core:themes:create')) {
+            return $this->accessDenied();
+        }
+
+        $response  = ['success' => false];
+        $themeZip  = $this->getRequest()->files->get('file');
+        $extension = $themeZip->getClientOriginalExtension();
+
+        if (!$themeZip) {
+            return $this->returnError(
+                $this->translator->trans('mautic.core.theme.upload.empty', [], 'validators'),
+                Response::HTTP_BAD_REQUEST
+            );
+        } elseif ($extension !== 'zip') {
+            return $this->returnError(
+                $this->translator->trans('mautic.core.not.allowed.file.extension', ['%extension%' => $extension], 'validators'),
+                Response::HTTP_BAD_REQUEST
+            );
+        } else {
+            $fileName  = InputHelper::filename($themeZip->getClientOriginalName());
+            $themeName = basename($fileName, '.zip');
+            $dir       = $this->get('mautic.helper.paths')->getSystemPath('themes', true);
+
+            if (!empty($themeZip)) {
+                try {
+                    $themeZip->move($dir, $fileName);
+                    $response['success'] = $this->themeHelper->install($dir.'/'.$fileName);
+                } catch (\Exception $e) {
+                    return $this->returnError(
+                        $this->translator->trans($e->getMessage(), [], 'validators'),
+                        Response::HTTP_INTERNAL_SERVER_ERROR
+                    );
+                }
+            } else {
+                return $this->returnError(
+                    $this->translator->trans('mautic.dashboard.upload.filenotfound', [], 'validators'),
+                    Response::HTTP_INTERNAL_SERVER_ERROR
+                );
+            }
+        }
+
+        $view = $this->view($response);
+
+        return $this->handleView($view);
+    }
+
+    /**
+     * Get zip file of a theme.
+     *
+     * @param string $theme dir name
+     *
+     * @return BinaryFileResponse
+     */
+    public function getAction($theme)
+    {
+        if (!$this->security->isGranted('core:themes:view')) {
+            return $this->accessDenied();
+        }
+
+        try {
+            $themeZip = $this->themeHelper->zip($theme);
+        } catch (\Exception $e) {
+            return $this->returnError($e->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
+        }
+
+        if (!$themeZip) {
+            return $this->returnError(
+                $this->translator->trans(
+                    'mautic.core.dir.not.accesssible',
+                    ['%dir%' => $theme]
+                ),
+                Response::HTTP_INTERNAL_SERVER_ERROR
+            );
+        }
+
+        $response = new BinaryFileResponse($themeZip);
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT);
+
+        return $response;
+    }
+
+    /**
+     * List the folders (themes) in the /themes directory.
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    public function listAction()
+    {
+        if (!$this->security->isGranted('core:themes:view')) {
+            return $this->accessDenied();
+        }
+
+        try {
+            $themes = $this->themeHelper->getInstalledThemes('all', true, false, false);
+        } catch (\Exception $e) {
+            return $this->returnError($e->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
+        }
+
+        $view = $this->view(['themes' => $themes]);
+
+        return $this->handleView($view);
+    }
+
+    /**
+     * Delete a theme.
+     *
+     * @param string $theme
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    public function deleteAction($theme)
+    {
+        if (!$this->security->isGranted('core:themes:delete')) {
+            return $this->accessDenied();
+        }
+
+        try {
+            $this->themeHelper->delete($theme);
+            $response = ['success' => true];
+        } catch (\Exception $e) {
+            return $this->returnError($e->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
+        }
+
+        $view = $this->view($response);
+
+        return $this->handleView($view);
+    }
+}
diff --git a/app/bundles/CoreBundle/Controller/CommonController.php b/app/bundles/CoreBundle/Controller/CommonController.php
index d9600885ff7..b5fe8edf0e2 100644
--- a/app/bundles/CoreBundle/Controller/CommonController.php
+++ b/app/bundles/CoreBundle/Controller/CommonController.php
@@ -13,10 +13,12 @@
 
 use Exporter\Handler;
 use Exporter\Source\ArraySourceIterator;
+use Exporter\Source\IteratorSourceIterator;
 use Exporter\Writer\CsvWriter;
 use Exporter\Writer\XlsWriter;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
+use Mautic\CoreBundle\Helper\DataExporterHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\CoreBundle\Model\AbstractCommonModel;
 use Mautic\UserBundle\Entity\User;
@@ -777,21 +779,27 @@ public function addBrowserNotification($message, $messageVars = [], $domain = 'f
      *
      * @return StreamedResponse
      */
-    public function exportResultsAs(array $toExport, $type, $filename)
+    public function exportResultsAs($toExport, $type, $filename)
     {
         if (!in_array($type, ['csv', 'xlsx'])) {
             throw new \InvalidArgumentException($this->translator->trans('mautic.error.invalid.export.type', ['%type%' => $type]));
         }
 
-        $dateFormat     = $this->coreParametersHelper->getParameter('date_format_dateonly');
-        $dateFormat     = str_replace('--', '-', preg_replace('/[^a-zA-Z]/', '-', $dateFormat));
-        $sourceIterator = new ArraySourceIterator($toExport);
-        $writer         = $type === 'xlsx' ? new XlsWriter('php://output') : new CsvWriter('php://output');
-        $contentType    = $type === 'xlsx' ? 'application/vnd.ms-excel' : 'text/csv';
-        $filename       = strtolower($filename.'_'.((new \DateTime())->format($dateFormat)).'.'.$type);
+        if ($toExport instanceof \Iterator) {
+            $sourceIterator = new IteratorSourceIterator($toExport);
+        } else {
+            $sourceIterator = new ArraySourceIterator($toExport);
+        }
+
+        $dateFormat  = $this->coreParametersHelper->getParameter('date_format_dateonly');
+        $dateFormat  = str_replace('--', '-', preg_replace('/[^a-zA-Z]/', '-', $dateFormat));
+        $writer      = $type === 'xlsx' ? new XlsWriter('php://output') : new CsvWriter('php://output');
+        $contentType = $type === 'xlsx' ? 'application/vnd.ms-excel' : 'text/csv';
+        $filename    = strtolower($filename.'_'.((new \DateTime())->format($dateFormat)).'.'.$type);
+        $handler     = Handler::create($sourceIterator, $writer);
 
-        return new StreamedResponse(function () use ($sourceIterator, $writer) {
-            Handler::create($sourceIterator, $writer)->export();
+        return new StreamedResponse(function () use ($handler, $sourceIterator, $writer) {
+            $handler->export();
         }, 200, ['Content-Type' => $contentType, 'Content-Disposition' => sprintf('attachment; filename=%s', $filename)]);
     }
 
@@ -803,49 +811,14 @@ public function exportResultsAs(array $toExport, $type, $filename)
      * @param AbstractCommonModel $model
      * @param array               $args
      * @param callable|null       $resultsCallback
+     * @param int|null            $start
      *
      * @return array
      */
-    protected function getDataForExport(AbstractCommonModel $model, array $args, callable $resultsCallback = null)
+    protected function getDataForExport(AbstractCommonModel $model, array $args, callable $resultsCallback = null, $start = 0)
     {
-        $args['limit'] = $args['limit'] < 200 ? 200 : $args['limit'];
-        $args['start'] = 0;
-
-        $results    = $model->getEntities($args);
-        $count      = $results['count'];
-        $items      = $results['results'];
-        $iterations = ceil($count / $args['limit']);
-        $loop       = 1;
-
-        // Max of 50 iterations for 10K result export
-        if ($iterations > 50) {
-            $iterations = 50;
-        }
-
-        $toExport = [];
-
-        unset($args['withTotalCount']);
-
-        while ($loop <= $iterations) {
-            if (is_callable($resultsCallback)) {
-                foreach ($items as $item) {
-                    $toExport[] = $resultsCallback($item);
-                }
-            } else {
-                foreach ($items as $item) {
-                    $toExport[] = (array) $item;
-                }
-            }
-
-            $args['start'] = $loop * $args['limit'];
-
-            $items = $model->getEntities($args);
-
-            $this->getDoctrine()->getManager()->clear();
-
-            ++$loop;
-        }
+        $data = new DataExporterHelper();
 
-        return $toExport;
+        return $data->getDataForExport($start, $model, $args, $resultsCallback);
     }
 }
diff --git a/app/bundles/CoreBundle/Controller/DefaultController.php b/app/bundles/CoreBundle/Controller/DefaultController.php
index 4098785dac7..b00f11e4b32 100644
--- a/app/bundles/CoreBundle/Controller/DefaultController.php
+++ b/app/bundles/CoreBundle/Controller/DefaultController.php
@@ -23,9 +23,9 @@
 class DefaultController extends CommonController
 {
     /**
-     * Generates default index.php.
+     * @param Request $request
      *
-     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function indexAction(Request $request)
     {
@@ -75,22 +75,24 @@ public function globalSearchAction()
     }
 
     /**
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function notificationsAction()
     {
         /** @var \Mautic\CoreBundle\Model\NotificationModel $model */
         $model = $this->getModel('core.notification');
 
-        list($notifications, $showNewIndicator, $updateMessage) = $model->getNotificationContent();
+        list($notifications, $showNewIndicator, $updateMessage) = $model->getNotificationContent(null, false, 200);
 
-        return $this->delegateView([
-            'contentTemplate' => 'MauticCoreBundle:Notification:notifications.html.php',
-            'viewParameters'  => [
-                'showNewIndicator' => $showNewIndicator,
-                'notifications'    => $notifications,
-                'updateMessage'    => $updateMessage,
-            ],
-        ]);
+        return $this->delegateView(
+            [
+                'contentTemplate' => 'MauticCoreBundle:Notification:notifications.html.php',
+                'viewParameters'  => [
+                    'showNewIndicator' => $showNewIndicator,
+                    'notifications'    => $notifications,
+                    'updateMessage'    => $updateMessage,
+                ],
+            ]
+        );
     }
 }
diff --git a/app/bundles/CoreBundle/Controller/ThemeController.php b/app/bundles/CoreBundle/Controller/ThemeController.php
index 5d8503e28c3..eb1bf0e418a 100644
--- a/app/bundles/CoreBundle/Controller/ThemeController.php
+++ b/app/bundles/CoreBundle/Controller/ThemeController.php
@@ -21,13 +21,6 @@
  */
 class ThemeController extends FormController
 {
-    /**
-     * Default themes which cannot be deleted.
-     *
-     * @var array
-     */
-    protected $defaultThemes = ['sunday', 'skyline', 'oxygen', 'goldstar', 'neopolitan', 'blank', 'system'];
-
     /**
      * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -65,13 +58,7 @@ public function indexAction()
                         $fileName  = InputHelper::filename($fileData->getClientOriginalName());
                         $themeName = basename($fileName, '.zip');
 
-                        if (in_array($themeName, $this->defaultThemes)) {
-                            $form->addError(
-                                new FormError(
-                                    $this->translator->trans('mautic.core.theme.default.cannot.overwrite', ['%name%' => $themeName], 'validators')
-                                )
-                            );
-                        } elseif (!empty($fileData)) {
+                        if (!empty($fileData)) {
                             try {
                                 $fileData->move($dir, $fileName);
                                 $themeHelper->install($dir.'/'.$fileName);
@@ -98,7 +85,7 @@ public function indexAction()
         return $this->delegateView([
             'viewParameters' => [
                 'items'         => $themeHelper->getInstalledThemes('all', true, true),
-                'defaultThemes' => $this->defaultThemes,
+                'defaultThemes' => $themeHelper->getDefaultThemes(),
                 'form'          => $form->createView(),
                 'permissions'   => $permissions,
                 'security'      => $this->get('mautic.security'),
@@ -243,7 +230,7 @@ public function deleteTheme($themeName)
             ];
         } elseif (!$this->get('mautic.security')->isGranted('core:themes:delete')) {
             return $this->accessDenied();
-        } elseif (in_array($themeName, $this->defaultThemes)) {
+        } elseif (in_array($themeName, $themeHelper->getDefaultThemes())) {
             $flashes[] = [
                 'type'    => 'error',
                 'msg'     => 'mautic.core.theme.cannot.be.removed',
diff --git a/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php b/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
index 29e65d9e975..e23c4453b81 100644
--- a/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
+++ b/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
@@ -191,4 +191,14 @@ function ($column) {
 
         return substr(strtoupper($type.'_'.$hash), 0, 63);
     }
+
+    /**
+     * Use this when you're doing a migration that
+     * purposely does not have any SQL statements,
+     * such as when moving data using the query builder.
+     */
+    protected function suppressNoSQLStatementError()
+    {
+        $this->addSql('SELECT "This migration did not generate select statements." AS purpose');
+    }
 }
diff --git a/app/bundles/CoreBundle/Entity/CommonRepository.php b/app/bundles/CoreBundle/Entity/CommonRepository.php
index 103d1cee611..fb6c928367a 100644
--- a/app/bundles/CoreBundle/Entity/CommonRepository.php
+++ b/app/bundles/CoreBundle/Entity/CommonRepository.php
@@ -912,6 +912,18 @@ protected function addAdvancedSearchWhereClause(&$qb, $filters)
      */
     protected function addCatchAllWhereClause(&$qb, $filter)
     {
+        foreach (['name', 'title'] as $column) {
+            if ($this->getClassMetadata()->hasField($column)) {
+                return $this->addStandardCatchAllWhereClause(
+                    $qb,
+                    $filter,
+                    [
+                        $this->getTableAlias().'.'.$column,
+                    ]
+                );
+            }
+        }
+
         return [
             false,
             [],
diff --git a/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php b/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
index ca6c1b5cdf7..8815964d2ec 100644
--- a/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
+++ b/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
@@ -20,10 +20,10 @@ trait DynamicContentEntityTrait
      *
      * @var array
      */
-    private $defaultDynamicContent = [
+    public static $defaultDynamicContent = [
         [
-            'tokenName' => null,
-            'content'   => null,
+            'tokenName' => 'Dynamic Content 1',
+            'content'   => 'Default Dynamic Content',
             'filters'   => [
                 [
                     'content' => null,
@@ -64,7 +64,7 @@ protected static function addDynamicContentMetadata(ClassMetadataBuilder $builde
      */
     public function getDynamicContent()
     {
-        return (empty($this->dynamicContent)) ? $this->defaultDynamicContent : $this->dynamicContent;
+        return (empty($this->dynamicContent)) ? $this->getDefaultDynamicContent() : $this->dynamicContent;
     }
 
     /**
@@ -75,7 +75,7 @@ public function getDynamicContent()
     public function setDynamicContent($dynamicContent)
     {
         if (empty($dynamicContent)) {
-            $dynamicContent = $this->defaultDynamicContent;
+            $dynamicContent = $this->getDefaultDynamicContent();
         }
 
         $this->dynamicContent = $dynamicContent;
@@ -88,6 +88,6 @@ public function setDynamicContent($dynamicContent)
      */
     public function getDefaultDynamicContent()
     {
-        return $this->defaultDynamicContent;
+        return self::$defaultDynamicContent;
     }
 }
diff --git a/app/bundles/CoreBundle/Entity/NotificationRepository.php b/app/bundles/CoreBundle/Entity/NotificationRepository.php
index 49536838350..454c6fcd2a4 100644
--- a/app/bundles/CoreBundle/Entity/NotificationRepository.php
+++ b/app/bundles/CoreBundle/Entity/NotificationRepository.php
@@ -53,18 +53,40 @@ public function markAllReadForUser($userId)
      *
      * @param      $userId
      * @param null $id     Clears all if empty
+     * @param null $limit  Clears a set number
      *
      * @throws \Doctrine\DBAL\Exception\InvalidArgumentException
      */
-    public function clearNotificationsForUser($userId, $id = null)
+    public function clearNotificationsForUser($userId, $id = null, $limit = null)
     {
-        $filter = ['user_id' => (int) $userId];
-
         if (!empty($id)) {
-            $filter['id'] = (int) $id;
+            $this->getEntityManager()->getConnection()->update(
+                MAUTIC_TABLE_PREFIX.'notifications',
+                [
+                    'is_read' => 1,
+                ],
+                [
+                    'user_id' => (int) $userId,
+                    'id'      => $id,
+                ]
+            );
+        } else {
+            // Only mark the first 30 read
+            $qb = $this->getEntityManager()->getConnection()->createQueryBuilder();
+            $qb->update(MAUTIC_TABLE_PREFIX.'notifications')
+                ->set('is_read', 1)
+                ->where('user_id = '.(int) $userId.' AND is_read = 0')
+                ->orderBy('id');
+
+            if ($limit) {
+                // Doctrine API doesn't support updates with limits
+                $this->getEntityManager()->getConnection()->executeUpdate(
+                    $qb->getSQL()." LIMIT $limit"
+                );
+            } else {
+                $qb->execute();
+            }
         }
-
-        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'notifications', ['is_read' => 1], $filter);
     }
 
     /**
@@ -91,10 +113,11 @@ public function getUpstreamLastDate()
      * @param null $afterId
      * @param bool $includeRead
      * @param null $type
+     * @param null $limit
      *
      * @return array
      */
-    public function getNotifications($userId, $afterId = null, $includeRead = false, $type = null)
+    public function getNotifications($userId, $afterId = null, $includeRead = false, $type = null, $limit = null)
     {
         $qb = $this->createQueryBuilder('n');
 
@@ -121,7 +144,12 @@ public function getNotifications($userId, $afterId = null, $includeRead = false,
             $qb->setParameter('type', $type);
         }
 
-        $qb->where($expr);
+        $qb->where($expr)
+            ->orderBy('n.id');
+
+        if ($limit) {
+            $qb->setMaxResults($limit);
+        }
 
         return $qb->getQuery()->getArrayResult();
     }
diff --git a/app/bundles/CoreBundle/Entity/VariantEntityTrait.php b/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
index 1eb9baf17ac..a3b0313174b 100644
--- a/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
+++ b/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
@@ -256,8 +256,9 @@ public function getVariants()
     /**
      * Get an array of all IDs for parent/child variants and associated translations if applicable.
      *
-     * @param VariantEntityInterface $entity
-     * @param bool                   $publishedOnly
+     * @param bool $publishedOnly
+     *
+     * @return array
      */
     public function getRelatedEntityIds($publishedOnly = false)
     {
diff --git a/app/bundles/CoreBundle/Event/BuilderEvent.php b/app/bundles/CoreBundle/Event/BuilderEvent.php
index 01d44ea2ac5..cbb73942065 100644
--- a/app/bundles/CoreBundle/Event/BuilderEvent.php
+++ b/app/bundles/CoreBundle/Event/BuilderEvent.php
@@ -47,14 +47,16 @@ public function __construct($translator, $entity = null, $requested = 'all', $to
      * @param $icon
      * @param $content
      * @param $form
-     * @param $priority
+     * @param int   $priority
+     * @param array $params
      */
-    public function addSlotType($key, $header, $icon, $content, $form, $priority = 0)
+    public function addSlotType($key, $header, $icon, $content, $form, $priority = 0, array $params = [])
     {
         $this->slotTypes[$key] = [
             'header'   => $this->translator->trans($header),
             'icon'     => $icon,
             'content'  => $content,
+            'params'   => $params,
             'form'     => $form,
             'priority' => $priority,
         ];
@@ -75,6 +77,12 @@ public function getSlotTypes()
 
         array_multisort($sort['priority'], SORT_DESC, $sort['header'], SORT_ASC, $this->slotTypes);
 
+        foreach ($this->slotTypes as $i => $slot) {
+            $slot['header'] = str_replace(' ', '<br />', $slot['header']);
+
+            $this->slotTypes[$i] = $slot;
+        }
+
         return $this->slotTypes;
     }
 
diff --git a/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php b/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
index 241941f34fd..86939c07bdb 100644
--- a/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
+++ b/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\CoreBundle\Event;
 
-@trigger_error('Mautic\CoreBundle\Event\ChannelBroadcastEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\ChannelBroadcastEvent instead', E_DEPRECATED);
+@trigger_error('Mautic\CoreBundle\Event\ChannelBroadcastEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\ChannelBroadcastEvent instead', E_USER_DEPRECATED);
 
 /**
  * Class ChannelBroadcastEvent.
diff --git a/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php b/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
index 0571ccaf3d0..f70705b5e4b 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\CoreBundle\Event;
 
-@trigger_error('Mautic\CoreBundle\Event\MessageQueueBatchProcessEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueBatchProcessEvent instead', E_DEPRECATED);
+@trigger_error('Mautic\CoreBundle\Event\MessageQueueBatchProcessEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueBatchProcessEvent instead', E_USER_DEPRECATED);
 
 /**
  * Class MessageQueueBatchProcessEvent.
diff --git a/app/bundles/CoreBundle/Event/MessageQueueEvent.php b/app/bundles/CoreBundle/Event/MessageQueueEvent.php
index 0c5c4e5cdba..0228e6ff0d9 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueEvent.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\CoreBundle\Event;
 
-@trigger_error('Mautic\CoreBundle\Event\MessageQueueEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueEvent instead', E_DEPRECATED);
+@trigger_error('Mautic\CoreBundle\Event\MessageQueueEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueEvent instead', E_USER_DEPRECATED);
 
 /**
  * Class MessageQueueEvent.
diff --git a/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php b/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
index e06c6f05eec..7fa45e98bc9 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\CoreBundle\Event;
 
-@trigger_error('Mautic\CoreBundle\Event\MessageQueueProcessEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueProcessEvent instead', E_DEPRECATED);
+@trigger_error('Mautic\CoreBundle\Event\MessageQueueProcessEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\MessageQueueProcessEvent instead', E_USER_DEPRECATED);
 
 /**
  * Class MessageQueueProcessEvent.
diff --git a/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php b/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
index e641035e6b2..754b95df004 100644
--- a/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
@@ -256,9 +256,11 @@ function s4() {
             
         // Set the id in local storage in case cookies are only allowed for sites visited and Mautic is on a different domain
         // than the current page
-        if (window.localStorage) {
+        try {
             localStorage.setItem('mtc_id', response.id);
             localStorage.setItem('mtc_sid', response.sid);
+        } catch (e) {
+            console.warn('Browser does not allow storing in local storage');
         }
     }
 };
diff --git a/app/bundles/CoreBundle/Exception/ErrorHandlerException.php b/app/bundles/CoreBundle/Exception/ErrorHandlerException.php
index e077c4860d2..8ca8713274c 100644
--- a/app/bundles/CoreBundle/Exception/ErrorHandlerException.php
+++ b/app/bundles/CoreBundle/Exception/ErrorHandlerException.php
@@ -31,6 +31,8 @@ class ErrorHandlerException extends \Exception
     public function __construct($message = '', $showMessage = false, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
+
+        $this->showMessage = $showMessage;
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/ChoiceLoader/EntityLookupChoiceLoader.php b/app/bundles/CoreBundle/Form/ChoiceLoader/EntityLookupChoiceLoader.php
index ce9a95780e1..0c8576dccf4 100644
--- a/app/bundles/CoreBundle/Form/ChoiceLoader/EntityLookupChoiceLoader.php
+++ b/app/bundles/CoreBundle/Form/ChoiceLoader/EntityLookupChoiceLoader.php
@@ -160,12 +160,17 @@ function ($v) {
             // Build choice list in case of different formats
             $choices = $this->fetchChoices($modelName, $data);
 
+            if ($choices) {
+                $this->formatChoices($choices);
+            }
+
             if ($includeNew && !empty($data)) {
                 // Fetch some extra choices
                 $extraChoices = $this->fetchChoices($modelName);
 
                 // Test if grouped
                 if ($extraChoices) {
+                    $this->formatChoices($extraChoices);
                     foreach ($extraChoices as $k => $v) {
                         if (is_array($v)) {
                             if (!isset($choices[$k])) {
@@ -181,15 +186,12 @@ function ($v) {
                 unset($extraChoices);
             }
 
-            if (!empty($choices)) {
-                $this->formatChoices($choices);
-            }
-
             $this->choices[$modelName] = $choices;
         }
 
         // must be [$label => $id]
         $prepped = $this->prepareChoices($this->choices[$modelName]);
+
         array_multisort(array_keys($prepped), SORT_NATURAL | SORT_FLAG_CASE, $prepped);
 
         if ($includeNew && $modalRoute) {
@@ -215,7 +217,26 @@ protected function prepareChoices($choices)
             }
         }
 
-        return $isGrouped ? $prepped : array_flip($prepped);
+        if (!$isGrouped) {
+            // Same labels will cause options to be merged with Symfony 2.8+ so ensure labels are unique
+            $counts     = array_count_values($prepped);
+            $duplicates = array_filter(
+                $prepped,
+                function ($value) use ($counts) {
+                    return $counts[$value] > 1;
+                }
+            );
+
+            if (count($duplicates)) {
+                foreach ($duplicates as $value => $label) {
+                    $prepped[$value] = "$label ($value)";
+                }
+            }
+
+            $prepped = array_flip($prepped);
+        }
+
+        return $prepped;
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
index dc17790088c..2341e431097 100644
--- a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
+++ b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
@@ -11,20 +11,21 @@
 
 namespace Mautic\CoreBundle\Form\Type;
 
-use Mautic\LeadBundle\Helper\FormFieldHelper;
+use Mautic\LeadBundle\Form\Type\FilterTrait;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Class DynamicContentFilterEntryFiltersType.
  */
 class DynamicContentFilterEntryFiltersType extends AbstractType
 {
+    use FilterTrait;
+
     private $translator;
 
     /**
@@ -59,219 +60,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $translator   = $this->translator;
-        $formModifier = function (FormEvent $event, $eventName) use ($translator) {
-            $data    = $event->getData();
-            $form    = $event->getForm();
-            $options = $form->getConfig()->getOptions();
-
-            $fieldType   = $data['type'];
-            $fieldName   = $data['field'];
-            $fieldObject = $data['object'];
-
-            $type = 'text';
-            $attr = [
-                'class' => 'form-control',
-            ];
-            $displayType = 'hidden';
-            $displayAttr = [];
-
-            $field = [];
-
-            if (isset($options['fields']['lead'][$fieldName])) {
-                $field = $options['fields']['lead'][$fieldName];
-            } elseif (isset($options['fields']['company'][$fieldName])) {
-                $field = $options['fields']['company'][$fieldName];
-            }
-
-            $customOptions = [];
-
-            switch ($fieldType) {
-                case 'country':
-                case 'region':
-                case 'timezone':
-                case 'stage':
-                case 'locale':
-                    switch ($fieldType) {
-                        case 'country':
-                            $choiceKey = 'countries';
-                            break;
-                        case 'region':
-                            $choiceKey = 'regions';
-                            break;
-                        case 'timezone':
-                            $choiceKey = 'timezones';
-                            break;
-                        case 'stage':
-                            $choiceKey = 'stages';
-                            break;
-                        case 'locale':
-                            $choiceKey = 'locales';
-                            break;
-                    }
-
-                    $type                     = 'choice';
-                    $customOptions['choices'] = $options[$choiceKey];
-
-                    $customOptions['multiple'] = (in_array($data['operator'], ['in', '!in']));
-
-                    if ($customOptions['multiple']) {
-                        array_unshift($customOptions['choices'], ['' => '']);
-
-                        if (!isset($data['filter'])) {
-                            $data['filter'] = [];
-                        }
-                    }
-
-                    break;
-                case 'time':
-                case 'date':
-                case 'datetime':
-                    $attr['data-toggle'] = $fieldType;
-                    break;
-                case 'lookup_id':
-                    $type        = 'hidden';
-                    $displayType = 'text';
-                    $displayAttr = array_merge(
-                        $displayAttr,
-                        [
-                            'class'       => 'form-control',
-                            'data-toggle' => 'field-lookup',
-                            'data-action' => 'lead:fieldList',
-                            'data-target' => $data['field'],
-                            'placeholder' => $translator->trans(
-                                'mautic.lead.list.form.filtervalue'
-                            ),
-                        ]
-                    );
-
-                    if (isset($options['fields'][$fieldObject][$fieldName]['properties']['list'])) {
-                        $displayAttr['data-options'] = $options['fields'][$fieldName]['properties']['list'];
-                    }
-
-                    break;
-                case 'select':
-                case 'multiselect':
-                case 'boolean':
-                    $type = 'choice';
-                    $attr = array_merge(
-                        $attr,
-                        [
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
-                        ]
-                    );
-
-                    if (in_array($data['operator'], ['in', '!in'])) {
-                        $customOptions['multiple'] = true;
-                        if (!isset($data['filter'])) {
-                            $data['filter'] = [];
-                        } elseif (!is_array($data['filter'])) {
-                            $data['filter'] = [$data['filter']];
-                        }
-                    }
-
-                    $list    = $options['fields'][$fieldObject][$fieldName]['properties']['list'];
-                    $choices = FormFieldHelper::parseList($list, true, ('boolean' === $fieldType));
-
-                    if ($fieldType == 'select') {
-                        // array_unshift cannot be used because numeric values get lost as keys
-                        $choices     = array_reverse($choices, true);
-                        $choices[''] = '';
-                        $choices     = array_reverse($choices, true);
-                    }
-
-                    $customOptions['choices'] = $choices;
-                    break;
-                case 'lookup':
-                default:
-                    if ('number' !== $fieldType) {
-                        $attr = array_merge(
-                            $attr,
-                            [
-                                'data-toggle' => 'field-lookup',
-                                'data-action' => 'lead:fieldList',
-                                'data-target' => $data['field'],
-                                'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
-                            ]
-                        );
-
-                        if (isset($options['fields'][$fieldObject][$fieldName]['properties']['list'])) {
-                            $attr['data-options'] = $options['fields'][$fieldName]['properties']['list'];
-                        }
-                    }
-
-                    break;
-            }
-
-            if ($data['operator'] === null || in_array($data['operator'], ['empty', '!empty'])) {
-                $attr['disabled'] = 'disabled';
-            } elseif (null !== $data['filter']) {
-                $customOptions['constraints'] = [
-                    new NotBlank(
-                        [
-                            'message' => 'mautic.core.value.required',
-                        ]
-                    ),
-                ];
-            }
-
-            // @todo implement in UI
-            if (in_array($data['operator'], ['between', '!between'])) {
-                $form->add(
-                    'filter',
-                    'collection',
-                    [
-                        'type'    => $type,
-                        'options' => [
-                            'label' => false,
-                            'attr'  => $attr,
-                        ],
-                        'label' => false,
-                    ]
-                );
-            } else {
-                $form->add(
-                    'filter',
-                    $type,
-                    array_merge(
-                        [
-                            'label'          => false,
-                            'attr'           => $attr,
-                            'data'           => isset($data['filter']) ? $data['filter'] : '',
-                            'error_bubbling' => false,
-                        ],
-                        $customOptions
-                    )
-                );
-            }
-
-            $form->add(
-                'display',
-                $displayType,
-                [
-                    'label'          => false,
-                    'attr'           => $displayAttr,
-                    'data'           => isset($data['display']) ? $data['display'] : '',
-                    'error_bubbling' => false,
-                ]
-            );
-
-            $form->add(
-                'operator',
-                'choice',
-                [
-                    'label'   => false,
-                    'choices' => isset($field['operators']) ? $field['operators'] : [],
-                    'attr'    => [
-                        'class'    => 'form-control not-chosen',
-                        'onchange' => 'Mautic.convertLeadFilterInput(this)',
-                    ],
-                ]
-            );
-
-            if ($eventName == FormEvents::PRE_SUBMIT) {
-                $event->setData($data);
-            }
+        $formModifier = function (FormEvent $event, $eventName) {
+            $this->buildFiltersForm($eventName, $event, $this->translator);
         };
 
         $builder->addEventListener(
diff --git a/app/bundles/CoreBundle/Form/Type/EntityLookupType.php b/app/bundles/CoreBundle/Form/Type/EntityLookupType.php
index e2f1fa6560b..4284256ca0b 100644
--- a/app/bundles/CoreBundle/Form/Type/EntityLookupType.php
+++ b/app/bundles/CoreBundle/Form/Type/EntityLookupType.php
@@ -114,15 +114,21 @@ public function configureOptions(OptionsResolver $resolver)
                 'choice_loader'          => function (Options $options) {
                     if (!isset($this->choiceLoaders[$options['model']])) {
                         // This class is defined as a service therefore the choice loader has to be unique per field that inherits this class as a parent
-                        $this->choiceLoaders[$options['model']] = new EntityLookupChoiceLoader($this->modelFactory, $this->translator, $this->connection, $options);
+                        $this->choiceLoaders[$options['model']] = new EntityLookupChoiceLoader(
+                            $this->modelFactory,
+                            $this->translator,
+                            $this->connection,
+                            $options
+                        );
                     }
 
                     return $this->choiceLoaders[$options['model']];
                 },
-                'expanded'    => false,
-                'multiple'    => false,
-                'required'    => false,
-                'empty_value' => '',
+                'choice_translation_domain' => false,
+                'expanded'                  => false,
+                'multiple'                  => false,
+                'required'                  => false,
+                'empty_value'               => '',
             ]
         );
     }
@@ -135,6 +141,11 @@ public function getParent()
         return ChoiceType::class;
     }
 
+    /**
+     * @param FormView      $view
+     * @param FormInterface $form
+     * @param array         $options
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $attr =
diff --git a/app/bundles/CoreBundle/Form/Type/GatedVideoType.php b/app/bundles/CoreBundle/Form/Type/GatedVideoType.php
new file mode 100644
index 00000000000..65cce81ff5d
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/GatedVideoType.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic, Inc.
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Mautic\FormBundle\Entity\Form;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class GatedVideoType extends SlotType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'url',
+            UrlType::class,
+            [
+                'label'      => 'Video URL',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => true,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'gatedvideo-url',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'gatetime',
+            TextType::class,
+            [
+                'label'      => 'Gate Time',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => true,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'gatedvideo-gatetime',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'formid',
+            EntityType::class,
+            [
+                'label'      => 'Form',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => true,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'gatedvideo-formid',
+                ],
+                'placeholder'  => 'Select your form',
+                'class'        => Form::class,
+                'choice_label' => function ($form) {
+                    return sprintf('%s (ID #%d)', $form->getName(), $form->getId());
+                },
+            ]
+        );
+
+        $builder->add(
+            'width',
+            TextType::class,
+            [
+                'label'      => 'Width',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => true,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'gatedvideo-width',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'height',
+            TextType::class,
+            [
+                'label'      => 'Height',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => true,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'gatedvideo-height',
+                ],
+            ]
+        );
+
+        parent::buildForm($builder, $options);
+    }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'width'  => 640,
+            'height' => 320,
+        ]);
+
+        parent::setDefaultOptions($resolver); // TODO: Change the autogenerated stub
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getName()
+    {
+        return self::class;
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/PropertiesTrait.php b/app/bundles/CoreBundle/Form/Type/PropertiesTrait.php
index 9760b263433..207c7b8ad9e 100644
--- a/app/bundles/CoreBundle/Form/Type/PropertiesTrait.php
+++ b/app/bundles/CoreBundle/Form/Type/PropertiesTrait.php
@@ -27,6 +27,11 @@ protected function addPropertiesType($builder, array $options, array &$masks)
         if (!empty($options['data'])) {
             if (is_array($options['data'])) {
                 $properties = (!empty($options['data']['properties'])) ? $options['data']['properties'] : null;
+
+                // Merge the parent data over so the child forms could use them
+                if (is_array($properties)) {
+                    $properties = array_merge($options['data'], $properties);
+                }
             } elseif (is_object($options['data']) && method_exists($options['data'], 'getProperties')) {
                 $properties = $options['data']->getProperties();
             }
diff --git a/app/bundles/CoreBundle/Form/Type/SlotCodeModeType.php b/app/bundles/CoreBundle/Form/Type/SlotCodeModeType.php
new file mode 100644
index 00000000000..a13dae93abc
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotCodeModeType.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageType.
+ */
+class SlotCodeModeType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'content',
+            TextareaType::class,
+            [
+                'label'      => false,
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'content',
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_codemode';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotDynamicContentType.php b/app/bundles/CoreBundle/Form/Type/SlotDynamicContentType.php
new file mode 100644
index 00000000000..78b434184ee
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotDynamicContentType.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotDynamicContentType.
+ */
+class SlotDynamicContentType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_dynamiccontent';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotImageCaptionType.php b/app/bundles/CoreBundle/Form/Type/SlotImageCaptionType.php
new file mode 100644
index 00000000000..dcfeb464ba6
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotImageCaptionType.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageCaptionType.
+ */
+class SlotImageCaptionType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'caption',
+            TextType::class,
+            [
+                'label'      => 'mautic.core.image.caption',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'caption',
+                ],
+            ]
+        );
+
+        $builder->add('align', 'button_group', [
+            'label'      => 'mautic.core.image.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+
+        $builder->add('text-align', 'button_group', [
+            'label'      => 'mautic.core.caption.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'text-align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+
+        $builder->add('color', 'text', [
+            'label'      => 'mautic.core.text.color',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'color',
+                'data-toggle'     => 'color',
+            ],
+        ]);
+
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_imagecaption';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotImageCardType.php b/app/bundles/CoreBundle/Form/Type/SlotImageCardType.php
new file mode 100644
index 00000000000..7d13fb17c7a
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotImageCardType.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageCardType.
+ */
+class SlotImageCardType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'caption',
+            TextType::class,
+            [
+                'label'      => 'mautic.core.image.caption',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'cardcaption',
+                ],
+            ]
+        );
+
+        $builder->add('align', 'button_group', [
+            'label'      => 'mautic.core.image.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+
+        $builder->add('text-align', 'button_group', [
+            'label'      => 'mautic.core.caption.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'text-align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+
+        $builder->add('background-color', 'text', [
+            'label'      => 'mautic.core.background.color',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'background-color',
+                'data-toggle'     => 'color',
+            ],
+        ]);
+
+        $builder->add('caption-color', 'text', [
+            'label'      => 'mautic.core.caption.color',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'caption-color',
+                'data-toggle'     => 'color',
+            ],
+        ]);
+
+        $builder->add('color', 'text', [
+            'label'      => 'mautic.core.text.color',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'color',
+                'data-toggle'     => 'color',
+            ],
+        ]);
+
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_imagecard';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotImageType.php b/app/bundles/CoreBundle/Form/Type/SlotImageType.php
new file mode 100644
index 00000000000..13c2ff155f1
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotImageType.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageType.
+ */
+class SlotImageType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('align', 'button_group', [
+            'label'      => 'mautic.core.image.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_image';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotSeparatorType.php b/app/bundles/CoreBundle/Form/Type/SlotSeparatorType.php
new file mode 100644
index 00000000000..04c2f26c123
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotSeparatorType.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageType.
+ */
+class SlotSeparatorType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('color', 'text', [
+            'label'      => 'mautic.core.separator.color',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-toggle'     => 'color',
+                'data-slot-param' => 'separator-color',
+            ],
+        ])->add('thickness', 'number', [
+            'label'      => 'mautic.core.separator.thickness',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'separator-thickness',
+            ],
+        ]);
+
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_separator';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotSocialFollowType.php b/app/bundles/CoreBundle/Form/Type/SlotSocialFollowType.php
new file mode 100644
index 00000000000..4ab60d30ec0
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotSocialFollowType.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageType.
+ */
+class SlotSocialFollowType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        $builder->add(
+            'glink',
+            TextType::class,
+            [
+                'label'      => 'mautic.core.googleplus.url',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'value'           => 'http://plus.google.com',
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'glink',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'flink',
+            TextType::class,
+            [
+                'label'      => 'mautic.core.facebook.url',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'value'           => 'http://www.facebook.com',
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'flink',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'tlink',
+            TextType::class,
+            [
+                'label'      => 'mautic.core.twitter.url',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
+                    'value'           => 'http://www.twitter.com',
+                    'class'           => 'form-control',
+                    'data-slot-param' => 'tlink',
+                ],
+            ]
+        );
+
+        $builder->add('align', 'button_group', [
+            'label'      => 'mautic.core.image.position',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'           => 'form-control',
+                'data-slot-param' => 'align',
+            ],
+            'choice_list' => new ChoiceList(
+                ['left', 'center', 'right'],
+                ['mautic.core.left', 'mautic.core.center', 'mautic.core.right']
+            ),
+        ]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_socialfollow';
+    }
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotSocialShareType.php b/app/bundles/CoreBundle/Form/Type/SlotSocialShareType.php
new file mode 100644
index 00000000000..aa24e2ad855
--- /dev/null
+++ b/app/bundles/CoreBundle/Form/Type/SlotSocialShareType.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Form\Type;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class SlotImageType.
+ */
+class SlotSocialShareType extends SlotType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'slot_socialshare';
+    }
+}
diff --git a/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php b/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
index 0ae89fee8dc..f416cf8fec4 100644
--- a/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
+++ b/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
@@ -139,7 +139,7 @@ public static function parseList($list, $removeEmpty = true, $ignoreNumerical =
 
         $choices = [];
 
-        if ($list) {
+        if (is_array($list)) {
             foreach ($list as $val => $label) {
                 if (is_array($label)) {
                     $val   = $label['value'];
diff --git a/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php b/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
index 41803279b46..bea6c3e93a1 100644
--- a/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
+++ b/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
@@ -105,8 +105,7 @@ public function applyFilters(&$query, $filters)
                     }
                 } else {
                     if (is_array($value)) {
-                        $query->andWhere('t.'.$column.' IN(:'.$valId.')');
-                        $query->setParameter($valId, implode(',', $value));
+                        $query->andWhere($query->expr()->in('t.'.$column, $value));
                     } else {
                         $query->andWhere('t.'.$column.' = :'.$valId);
                         $query->setParameter($valId, $value);
@@ -195,13 +194,13 @@ public function translateTimeUnit($unit)
      *
      * @return \Doctrine\DBAL\Query\QueryBuilder
      */
-    public function prepareTimeDataQuery($table, $column, $filters = [])
+    public function prepareTimeDataQuery($table, $column, $filters = [], $countColumn = '*')
     {
         // Convert time unitst to the right form for current database platform
         $query = $this->connection->createQueryBuilder();
         $query->from($this->prepareTable($table), 't');
 
-        $this->modifyTimeDataQuery($query, $column);
+        $this->modifyTimeDataQuery($query, $column, 't', $countColumn);
         $this->applyFilters($query, $filters);
         $this->applyDateFilters($query, $column);
 
@@ -214,8 +213,9 @@ public function prepareTimeDataQuery($table, $column, $filters = [])
      * @param QueryBuilder $query
      * @param string       $column      name
      * @param string       $tablePrefix
+     * @param string       $countColumn
      */
-    public function modifyTimeDataQuery(&$query, $column, $tablePrefix = 't')
+    public function modifyTimeDataQuery(&$query, $column, $tablePrefix = 't', $countColumn = '*')
     {
         // Convert time unitst to the right form for current database platform
         $dbUnit  = $this->translateTimeUnit($this->unit);
@@ -227,7 +227,7 @@ public function modifyTimeDataQuery(&$query, $column, $tablePrefix = 't')
             unset($filters['groupBy']);
         }
         $dateConstruct = 'DATE_FORMAT('.$tablePrefix.'.'.$column.', \''.$dbUnit.'\')';
-        $query->select($dateConstruct.' AS date, COUNT(*) AS count')
+        $query->select($dateConstruct.' AS date, COUNT('.$countColumn.') AS count')
             ->groupBy($dateConstruct.$groupBy);
 
         $query->orderBy($dateConstruct, 'ASC')->setMaxResults($limit);
diff --git a/app/bundles/CoreBundle/Helper/DataExporterHelper.php b/app/bundles/CoreBundle/Helper/DataExporterHelper.php
new file mode 100644
index 00000000000..a060afdc448
--- /dev/null
+++ b/app/bundles/CoreBundle/Helper/DataExporterHelper.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Sam
+ * Date: 05/04/2017
+ * Time: 16:58.
+ */
+
+namespace Mautic\CoreBundle\Helper;
+
+use Mautic\CoreBundle\Model\AbstractCommonModel;
+
+class DataExporterHelper
+{
+    /**
+     * Standard function to generate an array of data via any model's "getEntities" method.
+     *
+     * Overwrite in your controller if required.
+     *
+     * @param AbstractCommonModel $model
+     * @param array               $args
+     * @param callable|null       $resultsCallback
+     * @param int|null            $start
+     *
+     * @return array
+     */
+    public function getDataForExport($start, AbstractCommonModel $model, array $args, callable $resultsCallback = null)
+    {
+        $args['limit'] = $args['limit'] < 200 ? 200 : $args['limit'];
+        $args['start'] = $start;
+
+        $results = $model->getEntities($args);
+        $items   = $results['results'];
+        if (count($items) === 0) {
+            return null;
+        }
+        unset($results);
+
+        $toExport = [];
+
+        unset($args['withTotalCount']);
+
+        if (is_callable($resultsCallback)) {
+            foreach ($items as $item) {
+                $toExport[] = $resultsCallback($item);
+            }
+        } else {
+            foreach ($items as $item) {
+                $toExport[] = (array) $item;
+            }
+        }
+
+        $model->getRepository()->clear();
+
+        return $toExport;
+    }
+}
diff --git a/app/bundles/CoreBundle/Helper/InputHelper.php b/app/bundles/CoreBundle/Helper/InputHelper.php
index 9ced422d1a9..18981825358 100644
--- a/app/bundles/CoreBundle/Helper/InputHelper.php
+++ b/app/bundles/CoreBundle/Helper/InputHelper.php
@@ -393,7 +393,7 @@ public static function html($value)
 
             // Slecial handling for XML tags used in Outlook optimized emails <o:*/> and <w:/>
             $value = preg_replace_callback(
-                "/<\/*[o|w]:[^>]*>/is",
+                "/<\/*[o|w|v]:[^>]*>/is",
                 function ($matches) {
                     return '<mencoded>'.htmlspecialchars($matches[0]).'</mencoded>';
                 },
diff --git a/app/bundles/CoreBundle/Helper/IpLookupHelper.php b/app/bundles/CoreBundle/Helper/IpLookupHelper.php
index 61ff9349180..1facb68bdab 100644
--- a/app/bundles/CoreBundle/Helper/IpLookupHelper.php
+++ b/app/bundles/CoreBundle/Helper/IpLookupHelper.php
@@ -163,7 +163,7 @@ public function getIpAddress($ip = null)
 
             $ipAddress->setDoNotTrackList($doNotTrack);
 
-            if($ipAddress->isTrackable()) {
+            if ($ipAddress->isTrackable() && $this->request) {
                 $userAgent = $this->request->headers->get('User-Agent');
                 foreach ($this->doNotTrackBots as $bot) {
                     if (strpos($userAgent, $bot) !== false) {
diff --git a/app/bundles/CoreBundle/Helper/ThemeHelper.php b/app/bundles/CoreBundle/Helper/ThemeHelper.php
index 10a7d835e77..39527071e31 100644
--- a/app/bundles/CoreBundle/Helper/ThemeHelper.php
+++ b/app/bundles/CoreBundle/Helper/ThemeHelper.php
@@ -15,6 +15,7 @@
 use Mautic\CoreBundle\Templating\Helper\ThemeHelper as TemplatingThemeHelper;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class ThemeHelper
 {
@@ -23,6 +24,16 @@ class ThemeHelper
      */
     private $pathsHelper;
 
+    /**
+     * @var TemplatingHelper
+     */
+    private $templatingHelper;
+
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
     /**
      * @var array|mixed
      */
@@ -48,15 +59,35 @@ class ThemeHelper
      */
     private $themeHelpers = [];
 
+    /**
+     * Default themes which cannot be deleted.
+     *
+     * @var array
+     */
+    protected $defaultThemes = ['sunday', 'skyline', 'oxygen', 'goldstar', 'neopolitan', 'blank', 'system'];
+
     /**
      * ThemeHelper constructor.
      *
-     * @param PathsHelper $pathsHelper
+     * @param PathsHelper         $pathsHelper
+     * @param TemplatingHelper    $templatingHelper
+     * @param TranslatorInterface $translator
      */
-    public function __construct(PathsHelper $pathsHelper, TemplatingHelper $templatingHelper)
+    public function __construct(PathsHelper $pathsHelper, TemplatingHelper $templatingHelper, TranslatorInterface $translator)
     {
         $this->pathsHelper      = $pathsHelper;
         $this->templatingHelper = $templatingHelper;
+        $this->translator       = $translator;
+    }
+
+    /**
+     * Get theme names which are stock Mautic.
+     *
+     * @return array
+     */
+    public function getDefaultThemes()
+    {
+        return $this->defaultThemes;
     }
 
     /**
@@ -247,10 +278,12 @@ public function checkForTwigTemplate($template)
     /**
      * @param string $specificFeature
      * @param bool   $extended        returns extended information about the themes
+     * @param bool   $ignoreCache     true to get the fresh info
+     * @param bool   $includeDirs     true to get the theme dir details
      *
      * @return mixed
      */
-    public function getInstalledThemes($specificFeature = 'all', $extended = false, $ignoreCache = false)
+    public function getInstalledThemes($specificFeature = 'all', $extended = false, $ignoreCache = false, $includeDirs = true)
     {
         if (empty($this->themes[$specificFeature]) || $ignoreCache === true) {
             $dir      = $this->pathsHelper->getSystemPath('themes', true);
@@ -277,13 +310,16 @@ public function getInstalledThemes($specificFeature = 'all', $extended = false,
                 }
 
                 if ($addTheme) {
-                    $this->themes[$specificFeature][$theme->getBasename()]                       = $config['name'];
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]                   = [];
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['name']           = $config['name'];
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['key']            = $theme->getBasename();
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['dir']            = $theme->getRealPath();
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['config']         = $config;
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['themesLocalDir'] = $this->pathsHelper->getSystemPath('themes', false);
+                    $this->themes[$specificFeature][$theme->getBasename()]               = $config['name'];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]           = [];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['name']   = $config['name'];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['key']    = $theme->getBasename();
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['config'] = $config;
+
+                    if ($includeDirs) {
+                        $this->themesInfo[$specificFeature][$theme->getBasename()]['dir']            = $theme->getRealPath();
+                        $this->themesInfo[$specificFeature][$theme->getBasename()]['themesLocalDir'] = $this->pathsHelper->getSystemPath('themes', false);
+                    }
                 }
             }
         }
@@ -363,6 +399,13 @@ public function install($zipFile)
         }
 
         $themeName = basename($zipFile, '.zip');
+
+        if (in_array($themeName, $this->getDefaultThemes())) {
+            throw new \Exception(
+                $this->translator->trans('mautic.core.theme.default.cannot.overwrite', ['%name%' => $themeName], 'validators')
+            );
+        }
+
         $themePath = $this->pathsHelper->getSystemPath('themes', true).'/'.$themeName;
         $zipper    = new \ZipArchive();
         $archive   = $zipper->open($zipFile);
@@ -371,7 +414,7 @@ public function install($zipFile)
             throw new \Exception($this->getExtractError($archive));
         } else {
             $containsConfig    = false;
-            $allowedExtensions = ['', 'json', 'twig', 'css', 'js', 'htm', 'html', 'txt', 'jpg', 'jpeg', 'png', 'gif', 'tiff', 'eot', 'woff'];
+            $allowedExtensions = ['', 'json', 'twig', 'css', 'js', 'htm', 'html', 'txt', 'jpg', 'jpeg', 'png', 'gif', 'tiff', 'ico', 'icns', 'eot', 'woff', 'svg'];
             $allowedFiles      = [];
             for ($i = 0; $i < $zipper->numFiles; ++$i) {
                 $entry     = $zipper->getNameIndex($i);
diff --git a/app/bundles/CoreBundle/Menu/MenuHelper.php b/app/bundles/CoreBundle/Menu/MenuHelper.php
index 42f7b7cada4..2cda6f122e0 100644
--- a/app/bundles/CoreBundle/Menu/MenuHelper.php
+++ b/app/bundles/CoreBundle/Menu/MenuHelper.php
@@ -12,6 +12,7 @@
 namespace Mautic\CoreBundle\Menu;
 
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -42,18 +43,25 @@ class MenuHelper
      */
     protected $mauticParameters;
 
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
     /**
      * MenuHelper constructor.
      *
-     * @param CorePermissions $security
-     * @param RequestStack    $requestStack
-     * @param array           $mauticParameters
+     * @param CorePermissions   $security
+     * @param RequestStack      $requestStack
+     * @param array             $mauticParameters
+     * @param IntegrationHelper $integrationHelper
      */
-    public function __construct(CorePermissions $security, RequestStack $requestStack, array $mauticParameters)
+    public function __construct(CorePermissions $security, RequestStack $requestStack, array $mauticParameters, IntegrationHelper $integrationHelper)
     {
-        $this->security         = $security;
-        $this->mauticParameters = $mauticParameters;
-        $this->request          = $requestStack->getCurrentRequest();
+        $this->security          = $security;
+        $this->mauticParameters  = $mauticParameters;
+        $this->request           = $requestStack->getCurrentRequest();
+        $this->integrationHelper = $integrationHelper;
     }
 
     /**
@@ -71,40 +79,10 @@ public function createMenuStructure(&$items, $depth = 0, $defaultPriority = 9999
                 continue;
             }
 
-            // Check to see if menu is restricted
-            if (isset($i['access'])) {
-                if ($i['access'] == 'admin') {
-                    if (!$this->security->isAdmin()) {
-                        unset($items[$k]);
-                        continue;
-                    }
-                } elseif (!$this->security->isGranted($i['access'], 'MATCH_ONE')) {
-                    unset($items[$k]);
-                    continue;
-                }
-            }
-
-            if (isset($i['checks'])) {
-                $passChecks = true;
-                foreach ($i['checks'] as $checkGroup => $checks) {
-                    foreach ($checks as $name => $value) {
-                        if ($checkGroup == 'parameters') {
-                            if ($this->getParameter($name) != $value) {
-                                $passChecks = false;
-                                break;
-                            }
-                        } elseif ($checkGroup == 'request') {
-                            if ($this->request->get($name) != $value) {
-                                $passChecks = false;
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (!$passChecks) {
-                    unset($items[$k]);
-                    continue;
-                }
+            // Remove the item if the checks fail
+            if ($this->handleChecks($i) === false) {
+                unset($items[$k]);
+                continue;
             }
 
             //Set ID to route name
@@ -276,4 +254,112 @@ protected function getParameter($name)
     {
         return isset($this->mauticParameters[$name]) ? $this->mauticParameters[$name] : false;
     }
+
+    /**
+     * @param string $integrationName
+     * @param array  $config
+     *
+     * @return bool
+     */
+    protected function handleIntegrationChecks($integrationName, array $config)
+    {
+        $integration = $this->integrationHelper->getIntegrationObject($integrationName);
+
+        if (!$integration) {
+            return false;
+        }
+
+        $settings = $integration->getIntegrationSettings();
+
+        $passChecks = true;
+
+        foreach ($config as $key => $value) {
+            switch ($key) {
+                case 'enabled':
+                    $passChecks = $settings->getIsPublished() == $value;
+                    break;
+                case 'features':
+                    $supportedFeatures = $settings->getSupportedFeatures();
+
+                    foreach ($value as $featureName) {
+                        if (!in_array($featureName, $supportedFeatures)) {
+                            $passChecks = false;
+                            break;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        return $passChecks;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return bool
+     */
+    protected function handleParametersChecks($name, $value)
+    {
+        return $this->getParameter($name) == $value;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return bool
+     */
+    protected function handleRequestChecks($name, $value)
+    {
+        return $this->request->get($name) == $value;
+    }
+
+    /**
+     * @param $accessLevel
+     *
+     * @return bool
+     */
+    protected function handleAccessCheck($accessLevel)
+    {
+        switch ($accessLevel) {
+            case 'admin':
+                return $this->security->isAdmin();
+            default:
+                return $this->security->isGranted($accessLevel, 'MATCH_ONE');
+        }
+    }
+
+    /**
+     * Handle access check and other checks for menu items.
+     *
+     * @param array $menuItem
+     *
+     * @return bool Returns false if the item fails the access check or any other checks
+     */
+    protected function handleChecks(array $menuItem)
+    {
+        if (isset($menuItem['access']) && $this->handleAccessCheck($menuItem['access']) === false) {
+            return false;
+        }
+
+        if (isset($menuItem['checks']) && is_array($menuItem['checks'])) {
+            foreach ($menuItem['checks'] as $checkGroup => $checkConfig) {
+                $checkMethod = 'handle'.ucfirst($checkGroup).'Checks';
+
+                if (!method_exists($this, $checkMethod)) {
+                    continue;
+                }
+
+                foreach ($checkConfig as $name => $value) {
+                    if ($this->$checkMethod($name, $value) === false) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/bundles/CoreBundle/Model/IteratorExportDataModel.php b/app/bundles/CoreBundle/Model/IteratorExportDataModel.php
new file mode 100644
index 00000000000..d8d47fa657b
--- /dev/null
+++ b/app/bundles/CoreBundle/Model/IteratorExportDataModel.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\CoreBundle\Model;
+
+use Mautic\CoreBundle\Helper\DataExporterHelper;
+
+/**
+ * Class IteratorExportDataModel.
+ */
+class IteratorExportDataModel implements \Iterator
+{
+    private $position;
+    private $model;
+    private $args;
+    private $callback;
+    private $total;
+    private $data;
+    private $page;
+    private $totalResult;
+
+    /**
+     * IteratorExportDataModel constructor.
+     */
+    public function __construct(AbstractCommonModel $model, $args, callable $callback)
+    {
+        $this->model       = $model;
+        $this->args        = $args;
+        $this->callback    = $callback;
+        $this->position    = 0;
+        $this->total       = 0;
+        $this->page        = 1;
+        $this->totalResult = 0;
+        $this->data        = 0;
+    }
+
+    /**
+     * Return the current element.
+     *
+     * @link http://php.net/manual/en/iterator.current.php
+     *
+     * @return mixed Can return any type
+     *
+     * @since 5.0.0
+     */
+    public function current()
+    {
+        return $this->data[$this->position];
+    }
+
+    /**
+     * Move forward to next element.
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     * @since 5.0.0
+     */
+    public function next()
+    {
+        ++$this->position;
+        if ($this->position === $this->totalResult) {
+            $data              = new DataExporterHelper();
+            $this->data        = $data->getDataForExport($this->total, $this->model, $this->args, $this->callback);
+            $this->total       = $this->total + count($this->data);
+            $this->totalResult = count($this->data);
+            $this->position    = 0;
+            ++$this->page;
+        }
+    }
+
+    /**
+     * Return the key of the current element.
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed scalar on success, or null on failure
+     *
+     * @since 5.0.0
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Checks if current position is valid.
+     *
+     * @link http://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool The return value will be casted to boolean and then evaluated.
+     *              Returns true on success or false on failure
+     *
+     * @since 5.0.0
+     */
+    public function valid()
+    {
+        if ($this->position <= $this->totalResult && !is_null($this->data)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Rewind the Iterator to the first element.
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     * @since 5.0.0
+     */
+    public function rewind()
+    {
+        $data              = new DataExporterHelper();
+        $this->data        = $data->getDataForExport($this->total, $this->model, $this->args, $this->callback);
+        $this->total       = $this->total + count($this->data);
+        $this->totalResult = count($this->data);
+        $this->position    = 0;
+    }
+}
diff --git a/app/bundles/CoreBundle/Model/NotificationModel.php b/app/bundles/CoreBundle/Model/NotificationModel.php
index 5b4b521690e..d045e483a13 100644
--- a/app/bundles/CoreBundle/Model/NotificationModel.php
+++ b/app/bundles/CoreBundle/Model/NotificationModel.php
@@ -158,21 +158,24 @@ public function markAllRead()
     /**
      * Clears a notification for a user.
      *
-     * @param $id Notification to clear; will clear all if empty
+     * @param $id       Notification to clear; will clear all if empty
+     * @param $limit    Maximum number of notifications to clear if $id is empty
      */
-    public function clearNotification($id)
+    public function clearNotification($id, $limit = null)
     {
-        $this->getRepository()->clearNotificationsForUser($this->userHelper->getUser()->getId(), $id);
+        $this->getRepository()->clearNotificationsForUser($this->userHelper->getUser()->getId(), $id, $limit);
     }
 
     /**
      * Get content for notifications.
      *
      * @param null $afterId
+     * @param bool $includeRead
+     * @param int  $limit
      *
      * @return array
      */
-    public function getNotificationContent($afterId = null, $includeRead = false)
+    public function getNotificationContent($afterId = null, $includeRead = false, $limit = null)
     {
         if ($this->userHelper->getUser()->isGuest) {
             return [[], false, ''];
@@ -180,10 +183,10 @@ public function getNotificationContent($afterId = null, $includeRead = false)
 
         $this->updateUpstreamNotifications();
 
-        $userId        = ($this->userHelper->getUser()) ? $this->userHelper->getUser()->getId() : 0;
-        $notifications = $this->getRepository()->getNotifications($userId, $afterId, $includeRead);
-
         $showNewIndicator = false;
+        $userId           = ($this->userHelper->getUser()) ? $this->userHelper->getUser()->getId() : 0;
+
+        $notifications = $this->getRepository()->getNotifications($userId, $afterId, $includeRead, null, $limit);
 
         //determine if the new message indicator should be shown
         foreach ($notifications as $n) {
diff --git a/app/bundles/CoreBundle/Translations/en_US/messages.ini b/app/bundles/CoreBundle/Translations/en_US/messages.ini
index 9e71a5858f8..61eb641d697 100644
--- a/app/bundles/CoreBundle/Translations/en_US/messages.ini
+++ b/app/bundles/CoreBundle/Translations/en_US/messages.ini
@@ -70,6 +70,7 @@ mautic.core.config.cors.valid.domains="Valid Domains"
 mautic.core.config.cors.valid.domains.tooltip="Enter the domains (http://yourdomain.com), one per line, to which you'd like to restrict incoming CORS requests."
 mautic.core.config.form.cache.path="Path to the cache directory"
 mautic.core.config.form.cache.path.tooltip="Set the absolute path to the cache directory. %kernel.root_dir% can be used as a placeholder to the app directory in the public web root. It is advised to use a directory outside of the public web root to prevent the cache from being accessible by the public."
+mautic.core.dir.not.accesssible="%dir% is not accessible"
 mautic.core.config.form.date.format.dateonly="Default format for date only"
 mautic.core.config.form.date.format.dateonly.tooltip="Set the default format for date only. Use PHP's date format (http://php.net/manual/en/function.date.php) to customize. For example, F j, Y will be formatted to December 21, 2014."
 mautic.core.config.form.date.format.full="Default format for full dates"
@@ -356,6 +357,7 @@ mautic.core.translations="Translations"
 mautic.core.translation_of="Translation of %parent%"
 mautic.core.type="Type"
 mautic.core.type.date="Date"
+mautic.core.type.datetime="Date/Time"
 mautic.core.type.boolean="Boolean"
 mautic.core.type.country="List - Country"
 mautic.core.type.email="Email"
@@ -430,6 +432,13 @@ mautic.core.button.text="Button Text"
 mautic.core.button.link="Button Link"
 mautic.core.button.size="Button Size"
 mautic.core.button.position="Button Position"
+mautic.core.caption.position="Caption Position"
+mautic.core.image.position="Image Position"
+mautic.core.image.caption="Image Caption"
+mautic.core.twitter.url="Twitter URL"
+mautic.core.facebook.url="Facebook URL"
+mautic.core.googleplus.url="Google+ URL"
+mautic.core.caption.color="Caption background Color"
 mautic.core.background.color="Background Color"
 mautic.core.content.background.color="Content Background Color"
 mautic.core.continue="Continue"
@@ -437,6 +446,8 @@ mautic.core.wrapper.background.color="Wrapper Background Color"
 mautic.core.text.color="Text color"
 mautic.core.slot.types="Slot types"
 mautic.core.section.types="Section types"
+mautic.core.separator.color="Separator color"
+mautic.core.separator.thickness="Separator thickness"
 mautic.core.drag.info="Drag the type to the desired position."
 mautic.core.customize.slot="Customize Slot"
 mautic.core.customize.section="Customize Section"
diff --git a/app/bundles/CoreBundle/Translations/en_US/validators.ini b/app/bundles/CoreBundle/Translations/en_US/validators.ini
index d911c1f935d..531f4f78204 100644
--- a/app/bundles/CoreBundle/Translations/en_US/validators.ini
+++ b/app/bundles/CoreBundle/Translations/en_US/validators.ini
@@ -11,4 +11,5 @@ mautic.core.theme.missing.config="The theme you tried to install doesn't have th
 mautic.core.theme.default.cannot.overwrite="%name% is the default theme and therefore cannot be overwritten."
 mautic.core.valid_url_required="A valid URL is required."
 mautic.core.theme.upload.empty="The file was not selected. Select a ZIP file to upload."
-mautic.core.invalid_file_type="Invalid file type {{ type }}. Use a file that matches of of the following mime types: {{ types }}."
\ No newline at end of file
+mautic.core.invalid_file_type="Invalid file type {{ type }}. Use a file that matches of of the following mime types: {{ types }}."
+mautic.core.not.allowed.file.extension="%extension% is not allowed file extension"
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Helper/builder.html.php b/app/bundles/CoreBundle/Views/Helper/builder.html.php
index 48859b76b97..0f3a1888730 100644
--- a/app/bundles/CoreBundle/Views/Helper/builder.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/builder.html.php
@@ -48,9 +48,9 @@
                             <div class="slot-type-handle btn btn-default btn-lg btn-nospin" data-slot-type="<?php echo $slotKey; ?>">
                                 <i class="fa fa-<?php echo $slot['icon']; ?>" aria-hidden="true"></i>
                                 <br>
-                                <?php echo $slot['header']; ?>
+                                <span class="slot-caption"><?php echo $slot['header']; ?></span>
                                 <script type="text/html">
-                                    <?php echo $view->render($slot['content']); ?>
+                                    <?php echo $view->render($slot['content'], isset($slot['params']) ? $slot['params'] : []); ?>
                                 </script>
                             </div>
                         <?php endforeach; ?>
@@ -72,7 +72,7 @@
                             <div class="section-type-handle btn btn-default btn-lg btn-nospin" data-section-type="<?php echo $sectionKey; ?>">
                                 <i class="fa fa-<?php echo $section['icon']; ?>" aria-hidden="true"></i>
                                 <br>
-                                <?php echo $section['header']; ?>
+                                <span class="slot-caption"><?php echo $section['header']; ?></span>
                                 <script type="text/html">
                                     <?php echo $view->render($section['content']); ?>
                                 </script>
@@ -85,7 +85,7 @@
                 </div>
             </div>
 
-            <div class="panel panel-default">
+            <div class="panel panel-default" id="customize-slot-panel">
                 <div class="panel-heading">
                     <h4 class="panel-title"><?php echo $view['translator']->trans('mautic.core.customize.slot'); ?></h4>
                 </div>
diff --git a/app/bundles/CoreBundle/Views/Helper/pagination.html.php b/app/bundles/CoreBundle/Views/Helper/pagination.html.php
index 8c2302aafdc..37e582e8310 100644
--- a/app/bundles/CoreBundle/Views/Helper/pagination.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/pagination.html.php
@@ -32,6 +32,7 @@
     $page = (int) $page;
 }
 
+$linkType            = !empty($inModal) ? 'ajaxmodal' : 'ajax';
 $pageClass           = (!isset($paginationClass)) ? '' : " pagination-$paginationClass";
 $menuLink            = (!empty($menuLinkId)) ? " data-menu-link=\"$menuLinkId\"" : '';
 $paginationWrapper   = isset($paginationWrapper) ? $paginationWrapper : 'pagination-wrapper ml-md mr-md';
@@ -49,6 +50,42 @@
     100 => '100',
 ];
 
+if (!isset($jsCallback)) {
+    $jsCallback = '';
+}
+if (!isset($jsArguments)) {
+    $jsArguments = [];
+} else {
+    $jsArguments = (array) $jsArguments;
+}
+if (!isset($baseUrl)) {
+    $baseUrl = null;
+}
+
+$getAction = function ($page, $active) use ($jsCallback, $jsArguments, $baseUrl, $queryString) {
+    if (!$active) {
+        return 'href="javascript:void(0);"';
+    }
+
+    if ($jsCallback) {
+        if ($jsArguments) {
+            foreach ($jsArguments as $key => $argument) {
+                if (is_array($argument)) {
+                    $jsArguments[$key] = json_encode($argument);
+                } else {
+                    $jsArguments[$key] = "\"{$jsArguments[$key]}\"";
+                }
+            }
+
+            return 'href="javascript:void(0);"'." onclick='".$jsCallback.'('.implode(',', $jsArguments).", $page, this);'";
+        }
+
+        return 'href="javascript:void(0);"'." onclick='".$jsCallback."($page, this);'";
+    }
+
+    return "href=\"$baseUrl/$page{$queryString}\"";
+};
+
 foreach ($responsiveViewports as $viewport):
 
     if ($viewport == 'mobile'):
@@ -68,38 +105,36 @@
                 <select autocomplete="false" class="form-control not-chosen pagination-limit<?php echo $class; ?>" onchange="Mautic.limitTableData('<?php echo $sessionVar; ?>',this.value,'<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);">
                     <?php foreach ($limitOptions as $value => $label): ?>
                         <?php $selected = ($limit === $value) ? ' selected="selected"' : ''; ?>
-                        <option<?php echo $selected; ?> value="<?php echo $value; ?>"><?php echo $view['translator']->trans(
-                                'mautic.core.pagination.'.$label
-                            ); ?></option>
+                        <option<?php echo $selected; ?> value="<?php echo $value; ?>">
+                            <?php echo $view['translator']->trans('mautic.core.pagination.'.$label); ?>
+                        </option>
                     <?php endforeach; ?>
                 </select>
             </div>
         <?php endif; ?>
 
         <div class="<?php echo $paginationWrapper; ?> text-center">
-            <ul class="pagination nm <?php echo $pageClass; ?>">
+            <ul class="pagination np nm <?php echo $pageClass; ?>">
                 <?php
-                $urlPage = '/1';
-                $url     = ($page > 1) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
-                $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
-                $class   = ($page <= 1) ? ' class="disabled"' : '';
+                $action = $getAction(1, ($page > 1));
+                $data   = strpos($action, 'javascript:void(0);') !== false ? '' : ' data-toggle="'.$linkType.'" data-target="'.$target.'"'.$menuLink;
+                $class  = ($page <= 1) ? ' class="disabled"' : '';
                 ?>
                 <li<?php echo $class; ?>>
                     <?php ?>
-                    <a href="<?php echo $url; ?>"<?php echo $data.$formExit; ?>>
+                    <a <?php echo $action; ?><?php echo $data.$formExit; ?>>
                         <i class="fa fa-angle-double-left"></i>
                     </a>
                 </li>
 
                 <?php
-                $urlPage = '/'.($page - 1);
-                $url     = (($page - 1) >= 1) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
-                $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
-                $class   = (($page - 1) <= 0) ? ' class="disabled"' : '';
+                $action = $getAction(($page - 1), ($page - 1) >= 1);
+                $data   = strpos($action, 'javascript:void(0);') !== false ? '' : ' data-toggle="'.$linkType.'" data-target="'.$target.'"'.$menuLink;
+                $class  = (($page - 1) <= 0) ? ' class="disabled"' : '';
                 ?>
                 <li<?php echo $class; ?>>
                     <?php ?>
-                    <a href="<?php echo $url; ?>"<?php echo $data.$formExit; ?>>
+                    <a <?php echo $action; ?><?php echo $data.$formExit; ?>>
                         <i class="fa fa-angle-left"></i>
                     </a>
                 </li>
@@ -116,39 +151,37 @@
                 ?>
                 <?php for ($i = $startPage; $i <= $lastPage; ++$i): ?>
                     <?php
-                    $class = ($page === (int) $i) ? ' class="active"' : '';
-                    $url   = ($page === (int) $i) ? 'javascript: void(0);' : $baseUrl.'/'.$i.$queryString;
-                    $data  = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
+                    $class  = ($page === (int) $i) ? ' class="active"' : '';
+                    $action = $getAction($i, ($page !== (int) $i));
+                    $data   = strpos($action, 'javascript:void(0);') !== false ? '' : ' data-toggle="'.$linkType.'" data-target="'.$target.'"'.$menuLink;
                     ?>
                     <li<?php echo $class; ?>>
-                        <a href="<?php echo $url; ?>"<?php echo $data.$formExit; ?>>
+                        <a <?php echo $action; ?><?php echo $data.$formExit; ?>>
                             <span><?php echo $i; ?></span>
                         </a>
                     </li>
                 <?php endfor; ?>
 
                 <?php
-                $urlPage = '/'.($page + 1);
-                $url     = (($page + 1) <= $totalPages) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
-                $data    = ($url == 'javascript: void(0);') ? '' : 'data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
-                $class   = (($page + 1) > $totalPages) ? ' class="disabled"' : '';
+                $action = $getAction(($page + 1), (($page + 1) <= $totalPages));
+                $data   = strpos($action, 'javascript:void(0);') !== false ? '' : ' data-toggle="'.$linkType.'" data-target="'.$target.'"'.$menuLink;
+                $class  = (($page + 1) > $totalPages) ? ' class="disabled"' : '';
                 ?>
                 <li<?php echo $class; ?>>
                     <?php ?>
-                    <a href="<?php echo $url; ?>" <?php echo $data.$formExit; ?>>
+                    <a <?php echo $action; ?><?php echo $data.$formExit; ?>>
                         <i class="fa fa-angle-right"></i>
                     </a>
                 </li>
 
                 <?php
-                $urlPage = '/'.$totalPages;
-                $url     = ($page < $totalPages) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
-                $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
-                $class   = ($page === $totalPages) ? ' class="disabled"' : '';
+                $action = $getAction($totalPages, ($page < $totalPages));
+                $data   = strpos($action, 'javascript:void(0);') !== false ? '' : ' data-toggle="'.$linkType.'" data-target="'.$target.'"'.$menuLink;
+                $class  = ($page === $totalPages) ? ' class="disabled"' : '';
                 ?>
                 <li<?php echo $class; ?>>
                     <?php ?>
-                    <a href="<?php echo $url; ?>"<?php echo $data.$formExit; ?>>
+                    <a <?php echo $action; ?><?php echo $data.$formExit; ?>>
                         <i class="fa fa-angle-double-right"></i>
                     </a>
                 </li>
diff --git a/app/bundles/CoreBundle/Views/Sections/three-column.html.php b/app/bundles/CoreBundle/Views/Sections/three-column.html.php
index 7ad147eb12f..dcaa261a936 100644
--- a/app/bundles/CoreBundle/Views/Sections/three-column.html.php
+++ b/app/bundles/CoreBundle/Views/Sections/three-column.html.php
@@ -11,22 +11,36 @@
 ?>
 <div data-section-wrapper="1">
     <center>
-        <table data-section="1" style="margin: 0 auto;border-collapse: collapse !important;width: 600px;" class="w320" cellpadding="0" cellspacing="0" width="600">
+        <table data-section="1" style="margin: 0 auto;border-collapse: collapse !important;width: 600px;" class="w320" border="0" cellpadding="0" cellspacing="0" width="600">
             <tr>
-                <td data-slot-container="1" valign="top" class="mobile-block" style="padding-left: 5px; padding-right: 5px;">
-                    <div data-slot="text">
-                        <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
-                    </div>
-                </td>
-                <td data-slot-container="1" valign="top" class="mobile-block" style="padding-left: 5px; padding-right: 5px;">
-                    <div data-slot="text">
-                        <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
-                    </div>
-                </td>
-                <td data-slot-container="1" valign="top" class="mobile-block" style="padding-left: 5px; padding-right: 5px;">
-                    <div data-slot="text">
-                        <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
-                    </div>
+                <td align="center" valign="top">
+                    <table align="left" border="0" cellpadding="10" cellspacing="0" width="200" class="mobile-block">
+                        <tr>
+                            <td data-slot-container="1" valign="top" style="padding-left: 5px; padding-right: 5px;">
+                                <div data-slot="text">
+                                    <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                    <table align="left" border="0" cellpadding="10" cellspacing="0" width="200" class="mobile-block">
+                        <tr>
+                            <td data-slot-container="1" valign="top" style="padding-left: 5px; padding-right: 5px;">
+                                <div data-slot="text">
+                                    <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                    <table align="right" border="0" cellpadding="10" cellspacing="0" width="200" class="mobile-block">
+                        <tr>
+                            <td data-slot-container="1" valign="top" style="padding-left: 5px; padding-right: 5px;">
+                                <div data-slot="text">
+                                    <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
                 </td>
             </tr>
         </table>
diff --git a/app/bundles/CoreBundle/Views/Sections/two-column.html.php b/app/bundles/CoreBundle/Views/Sections/two-column.html.php
index 0382a86087b..ba1f0635b42 100644
--- a/app/bundles/CoreBundle/Views/Sections/two-column.html.php
+++ b/app/bundles/CoreBundle/Views/Sections/two-column.html.php
@@ -11,17 +11,27 @@
 ?>
 <div data-section-wrapper="1">
     <center>
-        <table data-section="1" style="margin: 0 auto;border-collapse: collapse !important;width: 600px;" class="w320" cellpadding="0" cellspacing="0" width="600">
+        <table data-section="1" style="margin: 0 auto;border-collapse: collapse !important;width: 600px;" class="w320" border="0" cellpadding="0" cellspacing="0" width="600">
             <tr>
-                <td data-slot-container="1" valign="top" class="mobile-block" style="padding-left: 5px; padding-right: 5px;">
-                    <div data-slot="text">
-                        <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
-                    </div>
-                </td>
-                <td data-slot-container="1" valign="top" class="mobile-block" style="padding-left: 5px; padding-right: 5px;">
-                    <div data-slot="text">
-                        <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
-                    </div>
+                <td align="center" valign="top">
+                    <table align="left" border="0" cellpadding="10" cellspacing="0" width="300" class="mobile-block">
+                        <tr>
+                            <td data-slot-container="1" valign="top" style="padding-left: 5px; padding-right: 5px;">
+                                <div data-slot="text">
+                                    <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                    <table align="right" border="0" cellpadding="10" cellspacing="0" width="300" class="mobile-block">
+                        <tr>
+                            <td data-slot-container="1" valign="top" style="padding-left: 5px; padding-right: 5px;">
+                                <div data-slot="text">
+                                    <p>Lorem ipsum dolor sit amet, alterum definitiones eu est. Eos no scripta voluptatum necessitatibus, ea his case movet. Porro vivendo delicatissimi ea qui, in usu aliquam consulatu conclusionemque. Eu vel mazim periculis consequat, quo fastidii salutandi eu, et sed nibh exerci consequuntur. Cu diam efficiendi eum, pri eu delenit insolens. Usu nihil oporteat an, et stet mucius vix, ex nostro assueverit mel.</p>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
                 </td>
             </tr>
         </table>
diff --git a/app/bundles/CoreBundle/Views/Slots/button.html.php b/app/bundles/CoreBundle/Views/Slots/button.html.php
index 8d26411ff48..35865c1339f 100644
--- a/app/bundles/CoreBundle/Views/Slots/button.html.php
+++ b/app/bundles/CoreBundle/Views/Slots/button.html.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
@@ -9,7 +8,8 @@
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
-<a href="#" target="_blank" class="button" style="font-size: 16px; color: #ffffff; text-decoration: none; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; padding: 12px 18px; background-color: #4e5e9e; display: inline-block;">
+
+<a href="#"  class="button" target="_blank" style="display:inline-block;text-decoration:none;border-color:#4e5d9d;border-width: 10px 20px;border-style:solid; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; background-color: #4e5d9d; display: inline-block;font-size: 16px; color: #ffffff; ">
     I want this!
 </a>
-<div style="clear:both"></div>
+<div style="clear:both"></div>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Slots/codemode.html.php b/app/bundles/CoreBundle/Views/Slots/codemode.html.php
new file mode 100644
index 00000000000..df0af135675
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/codemode.html.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+<div id="codemodeHtmlContainer">
+    <p>Place your content here</p>
+</div>
+
diff --git a/app/bundles/CoreBundle/Views/Slots/dynamiccontent.html.php b/app/bundles/CoreBundle/Views/Slots/dynamiccontent.html.php
new file mode 100644
index 00000000000..262818f948d
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/dynamiccontent.html.php
@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+<span>__dynamicContent__</span>
+
diff --git a/app/bundles/CoreBundle/Views/Slots/gatedvideo.html.php b/app/bundles/CoreBundle/Views/Slots/gatedvideo.html.php
new file mode 100644
index 00000000000..c596ef37f72
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/gatedvideo.html.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+<span class="fr-gatedvideo">
+    <video width="640" height="360" data-form-id="" data-gate-time="">
+        <source type="video/youtube" src="">
+    </video>
+</span>
diff --git a/app/bundles/CoreBundle/Views/Slots/imagecaption.html.php b/app/bundles/CoreBundle/Views/Slots/imagecaption.html.php
new file mode 100644
index 00000000000..e48bf00de9e
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/imagecaption.html.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+<figure style="text-align:center;">
+    <img src="<?php echo $view['assets']->getUrl('themes/blank.png', null, null, true); ?>" alt="An image"/>
+    <figcaption style="line-height:16px;padding: 5px;color:#000;font-size:16px;text-align: left;">Your image caption goes here. You can change the position of the caption and style in the customize slot tab.</figcaption>
+</figure>
+<div style="clear:both"></div>
diff --git a/app/bundles/CoreBundle/Views/Slots/imagecard.html.php b/app/bundles/CoreBundle/Views/Slots/imagecard.html.php
new file mode 100644
index 00000000000..24f0c351502
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/imagecard.html.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+<table class="imagecard" align="center" style="background-color: #ddd;">
+    <tr><td class="imagecard-image" align="center"><img width="100%" src="<?php echo $view['assets']->getUrl('themes/blank-big.png', null, null, true); ?>" alt="An image"/></td></tr>
+    <tr><td class="imagecard-caption" style="line-height:16px;padding: 5px;background-color: #bbb;font-size:16px;color:#000" align="center">Your image caption goes here. You can change the position of the caption and style in the customize slot tab.</td></tr>
+</table>
+<div style="clear:both"></div>
diff --git a/app/bundles/CoreBundle/Views/Slots/socialfollow.html.php b/app/bundles/CoreBundle/Views/Slots/socialfollow.html.php
new file mode 100644
index 00000000000..deaab67f8cf
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/socialfollow.html.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+<div class="socialfollow">
+    <a id="glink" href="http://plus.google.com" target="_blank"><img
+            src="<?php echo $view['assets']->getUrl('themes/neopolitan/img/gplus.gif', null, null, true); ?>"
+            alt="google+"
+            class="fr-view fr-dii fr-draggable"></a>
+    <a id="flink" href="http://www.facebook.com" target="_blank"><img
+            src="<?php echo $view['assets']->getUrl('themes/neopolitan/img/facebook.gif', null, null, true); ?>"
+            alt="facebook"
+            class="fr-view fr-dii fr-draggable"></a>
+    <a id="tlink" href="http://www.twitter.com" target="_blank"><img
+            src="<?php echo $view['assets']->getUrl('themes/neopolitan/img/twitter.gif', null, null, true); ?>"
+            alt="twitter"
+            class="fr-view fr-dii fr-draggable"></a>
+</div>
diff --git a/app/bundles/CoreBundle/Views/Slots/socialshare.html.php b/app/bundles/CoreBundle/Views/Slots/socialshare.html.php
new file mode 100644
index 00000000000..dc56a0d1b74
--- /dev/null
+++ b/app/bundles/CoreBundle/Views/Slots/socialshare.html.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+{sharebuttons}
diff --git a/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php b/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
index df8c3d64e18..89c01aeddc6 100644
--- a/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
+++ b/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
@@ -66,9 +66,14 @@ public function indexAction($page = 1)
         // fetch
         $search = $this->request->get('search', $this->get('session')->get('mautic.dynamicContent.filter', ''));
         $this->get('session')->set('mautic.dynamicContent.filter', $search);
-        //do not list variants in the main list
-        $filter['force'][] = ['column' => 'e.variantParent', 'expr' => 'isNull'];
-        $filter['force'][] = ['column' => 'e.translationParent', 'expr' => 'isNull'];
+
+        $filter = [
+            'string' => $search,
+            'force'  => [
+                ['column' => 'e.variantParent', 'expr' => 'isNull'],
+                ['column' => 'e.translationParent', 'expr' => 'isNull'],
+            ],
+        ];
 
         $orderBy    = $this->get('session')->get('mautic.dynamicContent.orderby', 'e.name');
         $orderByDir = $this->get('session')->get('mautic.dynamicContent.orderbydir', 'DESC');
diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php b/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
index f2304eeea94..ebee2f1b11a 100644
--- a/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
+++ b/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
@@ -66,7 +66,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
 
         $builder->createManyToOne('dynamicContent', 'DynamicContent')
             ->inversedBy('id')
-            ->addJoinColumn('dynamic_content_id', 'id')
+            ->addJoinColumn('dynamic_content_id', 'id', true, false, 'CASCADE')
             ->build();
 
         $builder->createField('slot', 'text')
diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php b/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
index 409f515e2ed..3d77e87a37f 100644
--- a/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
+++ b/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
@@ -198,6 +198,11 @@ public function getDynamicContentList($search = '', $limit = 10, $start = 0, $vi
         return $q->getQuery()->getArrayResult();
     }
 
+    /**
+     * @param $slot
+     *
+     * @return bool|null|object
+     */
     public function getDynamicContentForSlotFromCampaign($slot)
     {
         $qb = $this->_em->getConnection()->createQueryBuilder();
diff --git a/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php b/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
index abd537a1567..8dd2e4075f5 100644
--- a/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
@@ -114,6 +114,10 @@ public function onBuildJs(BuildJsEvent $event)
                             MauticJS.insertScript(m[1]);
                         }
                     }
+
+                    if (response.search("fr-gatedvideo") > 0) {
+                        MauticJS.initGatedVideo();
+                    }
                 }
             });
         });
diff --git a/app/bundles/EmailBundle/Assets/js/email.js b/app/bundles/EmailBundle/Assets/js/email.js
index 7090354abd4..62694496cc7 100644
--- a/app/bundles/EmailBundle/Assets/js/email.js
+++ b/app/bundles/EmailBundle/Assets/js/email.js
@@ -177,33 +177,35 @@ Mautic.getTotalAttachmentSize = function() {
 };
 
 Mautic.standardEmailUrl = function(options) {
-    if (!options) {
-        return;
-    }
-
-    var url = options.windowUrl;
-    if (url) {
+    if (options && options.windowUrl && options.origin) {
+        var url = options.windowUrl;
         var editEmailKey = '/emails/edit/emailId';
         var previewEmailKey = '/email/preview/emailId';
         if (url.indexOf(editEmailKey) > -1 ||
             url.indexOf(previewEmailKey) > -1) {
-            options.windowUrl = url.replace('emailId', mQuery('#campaignevent_properties_email').val());
+            options.windowUrl = url.replace('emailId', mQuery(options.origin).val());
         }
     }
 
     return options;
 };
 
-Mautic.disabledEmailAction = function(opener) {
+/**
+ * Enables/Disables email preview and edit. Can be triggered from campaign or form actions
+ * @param opener
+ * @param origin
+ */
+Mautic.disabledEmailAction = function(opener, origin) {
     if (typeof opener == 'undefined') {
         opener = window;
     }
-    var email = opener.mQuery('#campaignevent_properties_email').val();
+    var email = opener.mQuery(origin);
+    if (email.length == 0) return;
+    var emailId = email.val();
+    var disabled = emailId === '' || emailId === null;
 
-    var disabled = email === '' || email === null;
-
-    opener.mQuery('#campaignevent_properties_editEmailButton').prop('disabled', disabled);
-    opener.mQuery('#campaignevent_properties_previewEmailButton').prop('disabled', disabled);
+    opener.mQuery('[id$=_editEmailButton]').prop('disabled', disabled);
+    opener.mQuery('[id$=_previewEmailButton]').prop('disabled', disabled);
 };
 
 Mautic.initEmailDynamicContent = function() {
@@ -229,113 +231,145 @@ Mautic.initEmailDynamicContent = function() {
         mQuery('#addNewDynamicContent').on('click', function (e) {
             e.preventDefault();
 
-            var tabHolder               = mQuery('#dynamicContentTabs');
-            var filterHolder            = mQuery('#dynamicContentContainer');
-            var dynamicContentPrototype = mQuery('#dynamicContentPrototype').data('prototype');
-            var dynamicContentIndex     = tabHolder.find('li').length - 1;
-            var tabId                   = '#emailform_dynamicContent_' + dynamicContentIndex;
-            var tokenName               = 'Dynamic Content ' + (dynamicContentIndex + 1);
-            var newForm                 = dynamicContentPrototype.replace(/__name__/g, dynamicContentIndex);
-            var newTab                  = mQuery('<li><a role="tab" data-toggle="tab" href="' + tabId + '">' + tokenName + '</a></li>');
+            Mautic.createNewDynamicContentItem();
+        });
 
+        Mautic.initDynamicContentItem();
+    }
+};
 
-            tabHolder.append(newTab);
-            filterHolder.append(newForm);
+Mautic.createNewDynamicContentItem = function(jQueryVariant) {
+    // To support the parent.mQuery from the builder
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
 
-            var itemContainer = mQuery(tabId);
-            var textarea      = itemContainer.find('.editor');
-            var firstInput    = itemContainer.find('input[type="text"]').first();
+    var tabHolder               = mQuery('#dynamicContentTabs');
+    var filterHolder            = mQuery('#dynamicContentContainer');
+    var dynamicContentPrototype = mQuery('#dynamicContentPrototype').data('prototype');
+    var dynamicContentIndex     = tabHolder.find('li').length - 1;
+    while (mQuery('#emailform_dynamicContent_' + dynamicContentIndex).length > 0) {
+        dynamicContentIndex++; // prevent duplicate ids
+    }
+    var tabId                   = '#emailform_dynamicContent_' + dynamicContentIndex;
+    var tokenName               = 'Dynamic Content ' + (dynamicContentIndex + 1);
+    var newForm                 = dynamicContentPrototype.replace(/__name__/g, dynamicContentIndex);
+    var newTab                  = mQuery('<li><a role="tab" data-toggle="tab" href="' + tabId + '">' + tokenName + '</a></li>');
 
-            textarea.froalaEditor(mQuery.extend({}, Mautic.basicFroalaOptions, {
-                // Set custom buttons with separator between them.
-                toolbarButtons: ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'insertLink', 'insertImage'],
-                heightMin: 100
-            }));
+    tabHolder.append(newTab);
+    filterHolder.append(newForm);
 
-            tabHolder.find('i').first().removeClass('fa-spinner fa-spin').addClass('fa-plus text-success');
-            newTab.find('a').tab('show');
+    var itemContainer = mQuery(tabId);
+    var textarea      = itemContainer.find('.editor');
+    var firstInput    = itemContainer.find('input[type="text"]').first();
 
-            firstInput.focus();
+    textarea.froalaEditor(mQuery.extend({}, Mautic.basicFroalaOptions, {
+        // Set custom buttons with separator between them.
+        toolbarSticky: false,
+        toolbarButtons: ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'paragraphFormat', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'token', 'insertLink', 'insertImage', 'insertTable', 'html', 'fullscreen'],
+        heightMin: 100
+    }));
 
-            Mautic.updateDynamicContentDropdown();
+    tabHolder.find('i').first().removeClass('fa-spinner fa-spin').addClass('fa-plus text-success');
+    newTab.find('a').tab('show');
 
-            Mautic.initDynamicContentItem(tabId);
-        });
+    firstInput.focus();
 
-        Mautic.initDynamicContentItem();
-    }
-};
+    Mautic.updateDynamicContentDropdown();
 
-Mautic.initDynamicContentItem = function (tabId) {
-    var $el = mQuery('#dynamic-content-container');
+    Mautic.initDynamicContentItem(tabId, mQuery, tokenName);
 
-    if (typeof tabId != "undefined") {
-        $el = mQuery(tabId);
+    return tabId;
+};
+
+Mautic.createNewDynamicContentFilter = function(el, jQueryVariant) {
+    // To support the parent.mQuery from the builder
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
+
+    var $this                = mQuery(el);
+    var parentElement        = $this.parents('.panel');
+    var tabHolder            = parentElement.find('.nav');
+    var filterHolder         = parentElement.find('.tab-content');
+    var filterBlockPrototype = mQuery('#filterBlockPrototype');
+    var filterIndex          = filterHolder.find('.tab-pane').length - 1;
+    var dynamicContentIndex  = $this.attr('id').match(/\d+$/)[0];
+
+    var filterPrototype   = filterBlockPrototype.data('prototype');
+    var filterContainerId = '#emailform_dynamicContent_' + dynamicContentIndex + '_filters_' + filterIndex ;
+    // prevent duplicate ids
+    while (mQuery(filterContainerId).length > 0) {
+        filterIndex++;
+        filterContainerId = '#emailform_dynamicContent_' + dynamicContentIndex + '_filters_' + filterIndex ;
     }
+    var newTab            = mQuery('<li><a role="tab" data-toggle="tab" href="' + filterContainerId + '">Variation ' + (filterIndex + 1) + '</a></li>');
+    var newForm           = filterPrototype.replace(/__name__/g, filterIndex)
+        .replace(/dynamicContent_0_filters/g, 'dynamicContent_' + dynamicContentIndex + '_filters')
+        .replace(/dynamicContent]\[0]\[filters/g, 'dynamicContent][' + dynamicContentIndex + '][filters');
 
-    $el.find('.addNewDynamicContentFilter').on('click', function (e) {
-        e.preventDefault();
+    tabHolder.append(newTab);
+    filterHolder.append(newForm);
 
-        var $this                = mQuery(this);
-        var parentElement        = $this.parents('.panel');
-        var tabHolder            = parentElement.find('.nav');
-        var filterHolder         = parentElement.find('.tab-content');
-        var filterBlockPrototype = mQuery('#filterBlockPrototype');
-        var filterIndex          = filterHolder.find('.tab-pane').length;
-        var dynamicContentIndex  = $this.data('index');
-
-        var filterPrototype   = filterBlockPrototype.data('prototype');
-        var filterContainerId = '#emailform_dynamicContent_' + dynamicContentIndex + '_filters_' + filterIndex;
-        var newTab            = mQuery('<li><a role="tab" data-toggle="tab" href="' + filterContainerId + '">Variation ' + (filterIndex + 1) + '</a></li>');
-        var newForm           = filterPrototype.replace(/__name__/g, filterIndex)
-            .replace(/dynamicContent_0_filters/g, 'dynamicContent_' + dynamicContentIndex + '_filters')
-            .replace(/dynamicContent]\[0]\[filters/g, 'dynamicContent][' + dynamicContentIndex + '][filters');
-
-        tabHolder.append(newTab);
-        filterHolder.append(newForm);
-
-        var filterContainer  = mQuery(filterContainerId);
-        var availableFilters = filterContainer.find('select[data-mautic="available_filters"]');
-        var altTextarea      = filterContainer.find('.editor');
-        var removeButton     = filterContainer.find('.remove-item');
-
-        Mautic.activateChosenSelect(availableFilters);
-
-        availableFilters.on('change', function() {
-            var $this = mQuery(this);
-
-            if ($this.val()) {
-                Mautic.addDynamicContentFilter($this.val());
-                $this.val('');
-                $this.trigger('chosen:updated');
-            }
-        });
+    var filterContainer  = mQuery(filterContainerId);
+    var availableFilters = filterContainer.find('select[data-mautic="available_filters"]');
+    var altTextarea      = filterContainer.find('.editor');
+    var removeButton     = filterContainer.find('.remove-item');
 
-        altTextarea.froalaEditor(mQuery.extend({}, Mautic.basicFroalaOptions, {
-            // Set custom buttons with separator between them.
-            toolbarButtons: ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'fontFamily', 'fontSize', 'color', 'align', 'orderedList', 'unorderedList', 'quote', 'clearFormatting', 'insertLink', 'insertImage'],
-            heightMin: 100
-        }));
+    Mautic.activateChosenSelect(availableFilters, false, mQuery);
 
-        Mautic.initRemoveEvents(removeButton);
+    availableFilters.on('change', function() {
+        var $this = mQuery(this);
 
-        newTab.find('a').tab('show');
+        if ($this.val()) {
+            Mautic.addDynamicContentFilter($this.val(), mQuery);
+            $this.val('');
+            $this.trigger('chosen:updated');
+        }
     });
 
-    $el.find('.dynamic-content-token-name').on('input', function (e) {
-        var $this = mQuery(this);
-        var parentTab = $this.parents('.tab-pane');
-        var correspondingTabLink = mQuery('a[href="#' + parentTab.attr('id') + '"]');
-        var tabContainer = correspondingTabLink.parents('ul').first();
-        var correspondingTabLinkIndex = tabContainer.find('a[data-toggle="tab"]').index(correspondingTabLink);
+    altTextarea.froalaEditor(mQuery.extend({}, Mautic.basicFroalaOptions, {
+        // Set custom buttons with separator between them.
+        toolbarSticky: false,
+        toolbarButtons: ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'paragraphFormat', 'fontFamily', 'fontSize', 'color', 'align', 'formatOL', 'formatUL', 'quote', 'clearFormatting', 'token', 'insertLink', 'insertImage', 'insertTable', 'html', 'fullscreen'],
+        heightMin: 100
+    }));
 
-        var tokenName = $this.val() || 'Dynamic Content ' + (correspondingTabLinkIndex + 1);
+    Mautic.initRemoveEvents(removeButton, mQuery);
 
-        correspondingTabLink.text(tokenName);
+    newTab.find('a').tab('show');
 
-        Mautic.updateDynamicContentDropdown();
+    return filterContainerId;
+};
+
+Mautic.initDynamicContentItem = function (tabId, jQueryVariant, tokenName) {
+    // To support the parent.mQuery from the builder
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
+
+    var $el = mQuery('#dynamic-content-container');
+    if ($el.size() == 0){
+        mQuery = parent.mQuery;
+        $el = mQuery('#dynamic-content-container');
+    }
+
+    if (tabId || typeof tabId != "undefined") {
+        $el = mQuery(tabId);
+    }
+
+    $el.find('.addNewDynamicContentFilter').on('click', function (e) {
+        e.preventDefault();
+
+        Mautic.createNewDynamicContentFilter(this);
     });
 
+    if (typeof tokenName != 'undefined') {
+        $el.find('.dynamic-content-token-name').val(tokenName);
+    }
+
+    if ($el.find('.dynamic-content-token-name').val() == '') {
+        var dynamicContent = $el.attr('id').match(/\d+$/);
+        if (dynamicContent) {
+            var dynamicContentIndex  = dynamicContent[0];
+            $el.find('.dynamic-content-token-name').val('Dynamic Content ' + dynamicContentIndex);
+        }
+    }
+
     $el.find('a.remove-selected').on('click', function() {
         mQuery(this).closest('.panel').animate(
             {'opacity': 0},
@@ -350,15 +384,13 @@ Mautic.initDynamicContentItem = function (tabId) {
         var $this = mQuery(this);
 
         if ($this.val()) {
-            Mautic.addDynamicContentFilter($this.val());
+            Mautic.addDynamicContentFilter($this.val(), mQuery);
             $this.val('');
             $this.trigger('chosen:updated');
         }
     });
 
-    Mautic.initRemoveEvents($el.find('.remove-item'));
-
-
+    Mautic.initRemoveEvents($el.find('.remove-item'), mQuery);
 };
 
 Mautic.updateDynamicContentDropdown = function () {
@@ -374,7 +406,8 @@ Mautic.updateDynamicContentDropdown = function () {
     mQuery('button[data-cmd="dynamicContent"]').next().find('ul').html(options.join(''));
 };
 
-Mautic.initRemoveEvents = function (elements) {
+Mautic.initRemoveEvents = function (elements, jQueryVariant) {
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
     if (elements.hasClass('remove-selected')) {
         elements.on('click', function() {
             mQuery(this).closest('.panel').animate(
@@ -388,7 +421,6 @@ Mautic.initRemoveEvents = function (elements) {
     } else {
         elements.on('click', function (e) {
             e.preventDefault();
-
             var $this         = mQuery(this);
             var parentElement = $this.parents('.tab-pane.dynamic-content');
 
@@ -401,17 +433,24 @@ Mautic.initRemoveEvents = function (elements) {
 
             parentElement.remove();
             tabLink.remove();
-            tabContainer.find('li').first().next().find('a').tab('show');
+            // if tabContainer is for variants, show the first one, if it is the DEC vertical list, show the second one
+            if (tabContainer.hasClass('tabs-left')) {
+                tabContainer.find('li').first().next().find('a').tab('show');
+            } else {
+                tabContainer.find('li').first().find('a').tab('show');
+            }
 
             Mautic.updateDynamicContentDropdown();
         });
     }
 };
 
-Mautic.addDynamicContentFilter = function (selectedFilter) {
+Mautic.addDynamicContentFilter = function (selectedFilter, jQueryVariant) {
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
+
     var dynamicContentItems  = mQuery('.tab-pane.dynamic-content');
     var activeDynamicContent = dynamicContentItems.filter(':visible');
-    var dynamicContentIndex  = dynamicContentItems.index(activeDynamicContent);
+    var dynamicContentIndex  = activeDynamicContent.attr('id').match(/\d+$/)[0]; //dynamicContentItems.index(activeDynamicContent);
 
     var dynamicContentFilterContainers      = activeDynamicContent.find('div[data-filter-container]');
     var activeDynamicContentFilterContainer = dynamicContentFilterContainers.filter(':visible');
@@ -484,7 +523,7 @@ Mautic.addDynamicContentFilter = function (selectedFilter) {
 
     activeDynamicContentFilterContainer.append(prototype);
 
-    Mautic.initRemoveEvents(activeDynamicContentFilterContainer.find("a.remove-selected"));
+    Mautic.initRemoveEvents(activeDynamicContentFilterContainer.find("a.remove-selected"), mQuery);
 
     var filter = '#' + filterIdBase + '_filter';
 
@@ -564,10 +603,11 @@ Mautic.addDynamicContentFilter = function (selectedFilter) {
     });
 
     // Convert based on first option in list
-    Mautic.convertDynamicContentFilterInput('#' + filterIdBase + '_operator');
+    Mautic.convertDynamicContentFilterInput('#' + filterIdBase + '_operator', mQuery);
 };
 
-Mautic.convertDynamicContentFilterInput = function(el) {
+Mautic.convertDynamicContentFilterInput = function(el, jQueryVariant) {
+    var mQuery = (typeof jQueryVariant != 'undefined') ? jQueryVariant : window.mQuery;
     var operator = mQuery(el).val();
     // Extract the filter number
     var regExp    = /emailform_dynamicContent_(\d+)_filters_(\d+)_filters_(\d+)_operator/;
@@ -641,7 +681,7 @@ Mautic.convertDynamicContentFilterInput = function(el) {
 
         filterEl.attr('data-placeholder', placeholder);
 
-        Mautic.activateChosenSelect(filterEl);
+        Mautic.activateChosenSelect(filterEl, false, mQuery);
     }
 };
 
diff --git a/app/bundles/EmailBundle/Config/config.php b/app/bundles/EmailBundle/Config/config.php
index 99a92157f21..1a49c9a6353 100644
--- a/app/bundles/EmailBundle/Config/config.php
+++ b/app/bundles/EmailBundle/Config/config.php
@@ -155,7 +155,10 @@
                 ],
             ],
             'mautic.email.webhook.subscriber' => [
-                'class' => 'Mautic\EmailBundle\EventListener\WebhookSubscriber',
+                'class'       => 'Mautic\EmailBundle\EventListener\WebhookSubscriber',
+                'methodCalls' => [
+                    'setWebhookModel' => ['mautic.webhook.model.webhook'],
+                ],
             ],
             'mautic.email.configbundle.subscriber' => [
                 'class'     => 'Mautic\EmailBundle\EventListener\ConfigSubscriber',
diff --git a/app/bundles/EmailBundle/Controller/EmailController.php b/app/bundles/EmailBundle/Controller/EmailController.php
index b1e72c7d5d7..90227ea1657 100644
--- a/app/bundles/EmailBundle/Controller/EmailController.php
+++ b/app/bundles/EmailBundle/Controller/EmailController.php
@@ -17,6 +17,10 @@
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Form\Type\ExampleSendType;
+use Mautic\LeadBundle\Model\ListModel;
+use MauticPlugin\MauticCitrixBundle\Helper\CitrixHelper;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Response;
 
 class EmailController extends FormController
@@ -225,7 +229,6 @@ public function indexAction($page = 1)
                     'tmpl'        => $this->request->get('tmpl', 'index'),
                     'permissions' => $permissions,
                     'model'       => $model,
-                    'security'    => $this->get('mautic.security'),
                 ],
                 'contentTemplate' => 'MauticEmailBundle:Email:list.html.php',
                 'passthroughVars' => [
@@ -508,7 +511,8 @@ public function newAction($entity = null)
         if ($method == 'POST') {
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
-                if ($valid = $this->isFormValid($form)) {
+                $formData = $this->request->request->get('emailform');
+                if ($valid = $this->isFormValid($form) && $this->isFormValidForWebinar($formData, $form, $entity)) {
                     $content = $entity->getCustomHtml();
 
                     $entity->setCustomHtml($content);
@@ -687,14 +691,15 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             // Force type to template
             $entity->setEmailType('template');
         }
-
+        /** @var Form $form */
         $form = $model->createForm($entity, $this->get('form.factory'), $action, ['update_select' => $updateSelect]);
 
         ///Check for a submitted form and process it
         if (!$ignorePost && $method == 'POST') {
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
-                if ($valid = $this->isFormValid($form)) {
+                $formData = $this->request->request->get('emailform');
+                if ($valid = $this->isFormValid($form) && $this->isFormValidForWebinar($formData, $form, $entity)) {
                     $content = $entity->getCustomHtml();
                     $entity->setCustomHtml($content);
 
@@ -1521,4 +1526,61 @@ private function processSlots($slots, $entity)
         <?php
         $slotsHelper->stop();
     }
+
+    /**
+     * Checks the form data for webinar tokens and validates that the segment has webinar filters.
+     *
+     * @param array $data
+     * @param Form  $form
+     * @param Email $email
+     *
+     * @return int
+     */
+    protected function isFormValidForWebinar(array $data, Form &$form, Email $email)
+    {
+        if (!CitrixHelper::isAuthorized('Gotowebinar')) {
+            return true;
+        }
+
+        // search for webinar filters in the email segments
+        if (!array_key_exists('lists', $data) || 0 === count($data['lists'])) {
+            return true;
+        }
+
+        // search for token in content
+        $html         = $email->getCustomHtml();
+        $isTokenFound = preg_match('/\{webinar_button\}/', $html);
+        if (!$isTokenFound) {
+            return true;
+        }
+
+        $isWebinarFilterPresent = false;
+        $webinarFiltersCount    = 0;
+        $lists                  = $data['lists'];
+        /** @var ListModel $model */
+        $model = $this->getModel('lead.list');
+        foreach ($lists as $listId) {
+            $list    = $model->getEntity($listId);
+            $filters = $list->getFilters();
+            foreach ($filters as $filter) {
+                if ('webinar-registration' == $filter['field'] && 'in' == $filter['operator']) {
+                    $isWebinarFilterPresent = true;
+                    ++$webinarFiltersCount;
+                }
+            }
+        }
+        // make sure that each list has a webinar-registration filter
+        if (count($lists) !== $webinarFiltersCount) {
+            $isWebinarFilterPresent = false;
+        }
+        if (!$isWebinarFilterPresent) {
+            $error = $this->get('translator')->trans('plugin.citrix.webinar.token_error');
+            $form->addError(new FormError($error));
+
+            return false;
+        }
+
+        // everything is ok
+        return true;
+    }
 }
diff --git a/app/bundles/EmailBundle/Controller/PublicController.php b/app/bundles/EmailBundle/Controller/PublicController.php
index 94d2af81282..47178a3cc39 100644
--- a/app/bundles/EmailBundle/Controller/PublicController.php
+++ b/app/bundles/EmailBundle/Controller/PublicController.php
@@ -166,6 +166,10 @@ public function unsubscribeAction($idHash)
                 // Set the lead as current lead
                 $leadModel->setCurrentLead($lead);
             }
+            // Set lead lang
+            if ($lead->getPreferredLocale()) {
+                $translator->setLocale($lead->getPreferredLocale());
+            }
 
             if (!$this->get('mautic.helper.core_parameters')->getParameter('show_contact_preferences')) {
                 $model->setDoNotContact($stat, $translator->trans('mautic.email.dnc.unsubscribed'), DoNotContact::UNSUBSCRIBED);
@@ -191,7 +195,6 @@ public function unsubscribeAction($idHash)
                     ],
                     $message
                 );
-                $message = '<h2>'.$message.'</h2>';
             } elseif ($lead) {
                 $action = $this->generateUrl('mautic_email_unsubscribe', ['idHash' => $idHash]);
 
@@ -285,6 +288,11 @@ public function resubscribeAction($idHash)
                 $leadModel->setCurrentLead($lead);
             }
 
+            // Set lead lang
+            if ($lead->getPreferredLocale()) {
+                $this->translator->setLocale($lead->getPreferredLocale());
+            }
+
             $model->removeDoNotContact($stat->getEmailAddress());
 
             $message = $this->coreParametersHelper->getParameter('resubscribe_message');
@@ -292,8 +300,8 @@ public function resubscribeAction($idHash)
                 $message = $this->translator->trans(
                     'mautic.email.resubscribed.success',
                     [
-                        '%unsubscribedUrl%' => '|URL|',
-                        '%email%'           => '|EMAIL|',
+                        '%unsubscribeUrl%' => '|URL|',
+                        '%email%'          => '|EMAIL|',
                     ]
                 );
             }
diff --git a/app/bundles/EmailBundle/Entity/Email.php b/app/bundles/EmailBundle/Entity/Email.php
index e4dbd42e8bb..c9d4ff339e9 100644
--- a/app/bundles/EmailBundle/Entity/Email.php
+++ b/app/bundles/EmailBundle/Entity/Email.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\PersistentCollection;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\AssetBundle\Entity\Asset;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
@@ -841,7 +842,7 @@ public function setVariantSentCount($variantSentCount)
     }
 
     /**
-     * @return mixed
+     * @return PersistentCollection
      */
     public function getLists()
     {
diff --git a/app/bundles/EmailBundle/Entity/EmailRepository.php b/app/bundles/EmailBundle/Entity/EmailRepository.php
index f146e2398ae..4d7c0986cd6 100644
--- a/app/bundles/EmailBundle/Entity/EmailRepository.php
+++ b/app/bundles/EmailBundle/Entity/EmailRepository.php
@@ -13,9 +13,9 @@
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Tools\Pagination\Paginator;
+use Mautic\ChannelBundle\Entity\MessageQueue;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\LeadBundle\Entity\DoNotContact;
-use Mautic\LeadBundle\Entity\Lead;
 
 /**
  * Class EmailRepository.
@@ -25,6 +25,8 @@ class EmailRepository extends CommonRepository
     /**
      * Get an array of do not email emails.
      *
+     * @param array $leadIds
+     *
      * @return array
      */
     public function getDoNotEmailList($leadIds = [])
@@ -187,9 +189,22 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
         $dncQb->select('null')
             ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
             ->where(
-                $dncQb->expr()->eq('dnc.lead_id', 'l.id')
-            )
-            ->andWhere('dnc.channel = "email"');
+                $dncQb->expr()->andX(
+                    $dncQb->expr()->eq('dnc.lead_id', 'l.id'),
+                    $dncQb->expr()->eq('dnc.channel', $dncQb->expr()->literal('email'))
+                )
+            );
+
+        // Do not include contacts where the message is pending in the message queue
+        $mqQb = $this->getEntityManager()->getConnection()->createQueryBuilder();
+        $mqQb->select('null')
+            ->from(MAUTIC_TABLE_PREFIX.'message_queue', 'mq');
+
+        $messageExpr = $mqQb->expr()->andX(
+            $mqQb->expr()->eq('mq.lead_id', 'l.id'),
+            $mqQb->expr()->eq('mq.channel', $mqQb->expr()->literal('email')),
+            $mqQb->expr()->neq('mq.status', $mqQb->expr()->literal(MessageQueue::STATUS_SENT))
+        );
 
         // Do not include leads that have already been emailed
         $statQb = $this->getEntityManager()->getConnection()->createQueryBuilder()
@@ -207,12 +222,19 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
             $statExpr->add(
                 $statQb->expr()->in('stat.email_id', $variantIds)
             );
+            $messageExpr->add(
+                $mqQb->expr()->in('mq.channel_id', $variantIds)
+            );
         } else {
             $statExpr->add(
                 $statQb->expr()->eq('stat.email_id', (int) $emailId)
             );
+            $messageExpr->add(
+                $mqQb->expr()->eq('mq.channel_id', (int) $emailId)
+            );
         }
         $statQb->where($statExpr);
+        $mqQb->where($messageExpr);
 
         // Only include those who belong to the associated lead lists
         if (null === $listIds) {
@@ -242,7 +264,6 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
         if ($countOnly) {
             // distinct with an inner join seems faster
             $q->select('count(distinct(l.id)) as count');
-
             $q->innerJoin('l', MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll',
                 $q->expr()->andX(
                     $q->expr()->in('ll.leadlist_id', $listIds),
@@ -269,6 +290,7 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
         $q->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
             ->andWhere(sprintf('NOT EXISTS (%s)', $dncQb->getSQL()))
             ->andWhere(sprintf('NOT EXISTS (%s)', $statQb->getSQL()))
+            ->andWhere(sprintf('NOT EXISTS (%s)', $mqQb->getSQL()))
             ->setParameter('false', false, 'boolean');
 
         // Has an email
@@ -322,7 +344,7 @@ public function getEmailList($search = '', $limit = 10, $start = 0, $viewOther =
                     ->setParameter('search', $search);
             } else {
                 $q->andWhere($q->expr()->like('e.name', ':search'))
-                  ->setParameter('search', "%{$search}%");
+                    ->setParameter('search', "%{$search}%");
             }
         }
 
@@ -468,7 +490,7 @@ public function getTableAlias()
     /**
      * Resets variant_start_date, variant_read_count, variant_sent_count.
      *
-     * @param $variantParentId
+     * @param $relatedIds
      * @param $date
      */
     public function resetVariants($relatedIds, $date)
diff --git a/app/bundles/EmailBundle/Entity/Stat.php b/app/bundles/EmailBundle/Entity/Stat.php
index c31ba2379be..e1daebc9bc0 100644
--- a/app/bundles/EmailBundle/Entity/Stat.php
+++ b/app/bundles/EmailBundle/Entity/Stat.php
@@ -405,6 +405,9 @@ public function setRetryCount($retryCount)
         $this->retryCount = $retryCount;
     }
 
+    /**
+     * Increase the retry count.
+     */
     public function upRetryCount()
     {
         ++$this->retryCount;
diff --git a/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php b/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
index a6fe0b20f05..40cb722d428 100644
--- a/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
@@ -14,6 +14,7 @@
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Form\Type\SlotTextType;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
+use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Event\EmailBuilderEvent;
 use Mautic\EmailBundle\Event\EmailSendEvent;
@@ -148,9 +149,25 @@ public function onEmailBuild(EmailBuilderEvent $event)
                 'Image',
                 'image',
                 'MauticCoreBundle:Slots:image.html.php',
-                'slot',
+                'slot_image',
                 900
             );
+            $event->addSlotType(
+                'imagecard',
+                'Image Card',
+                'id-card-o',
+                'MauticCoreBundle:Slots:imagecard.html.php',
+                'slot_imagecard',
+                870
+            );
+            $event->addSlotType(
+                'imagecaption',
+                'Image+Caption',
+                'image',
+                'MauticCoreBundle:Slots:imagecaption.html.php',
+                'slot_imagecaption',
+                850
+            );
             $event->addSlotType(
                 'button',
                 'Button',
@@ -159,13 +176,38 @@ public function onEmailBuild(EmailBuilderEvent $event)
                 'slot_button',
                 800
             );
+            $event->addSlotType(
+                'socialfollow',
+                'Social Follow',
+                'twitter',
+                'MauticCoreBundle:Slots:socialfollow.html.php',
+                'slot_socialfollow',
+                600
+            );
+            $event->addSlotType(
+                'codemode',
+                'Code Mode',
+                'code',
+                'MauticCoreBundle:Slots:codemode.html.php',
+                'slot_codemode',
+                500
+            );
             $event->addSlotType(
                 'separator',
                 'Separator',
                 'minus',
                 'MauticCoreBundle:Slots:separator.html.php',
-                'slot',
-                700
+                'slot_separator',
+                400
+            );
+
+            $event->addSlotType(
+                'dynamicContent',
+                'Dynamic Content',
+                'tag',
+                'MauticCoreBundle:Slots:dynamiccontent.html.php',
+                'slot_dynamiccontent',
+                300
             );
         }
 
@@ -216,7 +258,7 @@ public function onEmailGenerate(EmailSendEvent $event)
             $unsubscribeText = $this->translator->trans('mautic.email.unsubscribe.text', ['%link%' => '|URL|']);
         }
         $unsubscribeText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_unsubscribe', ['idHash' => $idHash]), $unsubscribeText);
-        $event->addToken('{unsubscribe_text}', $unsubscribeText);
+        $event->addToken('{unsubscribe_text}', EmojiHelper::toHtml($unsubscribeText));
 
         $event->addToken('{unsubscribe_url}', $this->emailModel->buildUrl('mautic_email_unsubscribe', ['idHash' => $idHash]));
 
@@ -225,7 +267,7 @@ public function onEmailGenerate(EmailSendEvent $event)
             $webviewText = $this->translator->trans('mautic.email.webview.text', ['%link%' => '|URL|']);
         }
         $webviewText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_webview', ['idHash' => $idHash]), $webviewText);
-        $event->addToken('{webview_text}', $webviewText);
+        $event->addToken('{webview_text}', EmojiHelper::toHtml($webviewText));
 
         // Show public email preview if the lead is not known to prevent 404
         if (empty($lead['id']) && $email) {
@@ -236,19 +278,10 @@ public function onEmailGenerate(EmailSendEvent $event)
 
         $signatureText = $this->coreParametersHelper->getParameter('default_signature_text');
         $fromName      = $this->coreParametersHelper->getParameter('mailer_from_name');
-
-        if (!empty($lead['owner_id'])) {
-            $owner = $this->factory->getModel('lead')->getRepository()->getLeadOwner($lead['owner_id']);
-            if ($owner && !empty($owner['signature'])) {
-                $fromName      = $owner['first_name'].' '.$owner['last_name'];
-                $signatureText = $owner['signature'];
-            }
-        }
-
         $signatureText = str_replace('|FROM_NAME|', $fromName, nl2br($signatureText));
-        $event->addToken('{signature}', $signatureText);
+        $event->addToken('{signature}', EmojiHelper::toHtml($signatureText));
 
-        $event->addToken('{subject}', $event->getSubject());
+        $event->addToken('{subject}', EmojiHelper::toHtml($event->getSubject()));
     }
 
     /**
diff --git a/app/bundles/EmailBundle/EventListener/ReportSubscriber.php b/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
index e71e88254c6..a9f5546332a 100644
--- a/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
@@ -154,7 +154,8 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $columns = array_merge(
                 $columns,
                 $event->getStandardColumns($prefix, [], 'mautic_email_action'),
-                $event->getCategoryColumns()
+                $event->getCategoryColumns(),
+                $event->getCampaignByChannelColumns()
             );
             $data = [
                 'display_name' => 'mautic.email.emails',
@@ -214,7 +215,12 @@ public function onReportBuilder(ReportBuilderEvent $event)
 
                 $data = [
                     'display_name' => 'mautic.email.stats.report.table',
-                    'columns'      => array_merge($columns, $statColumns, $event->getLeadColumns(), $event->getIpColumn()),
+                    'columns'      => array_merge(
+                        $columns,
+                        $statColumns,
+                        $event->getLeadColumns(),
+                        $event->getIpColumn()
+                    ),
                 ];
                 $event->addTable('email.stats', $data, 'emails');
 
@@ -237,8 +243,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
-        $context = $event->getContext();
-        $qb      = $event->getQueryBuilder();
+        $context    = $event->getContext();
+        $qb         = $event->getQueryBuilder();
+        $hasGroupBy = $event->hasGroupBy();
 
         // channel_url_trackables subquery
         $qbcut        = $this->db->createQueryBuilder();
@@ -248,10 +255,13 @@ public function onReportGenerate(ReportGeneratorEvent $event)
         switch ($context) {
             case 'emails':
                 $qb->from(MAUTIC_TABLE_PREFIX.'emails', 'e')
-                   ->leftJoin('e', MAUTIC_TABLE_PREFIX.'emails', 'vp', 'vp.id = e.variant_parent_id')
-                   ->groupBy('e.id');
+                   ->leftJoin('e', MAUTIC_TABLE_PREFIX.'emails', 'vp', 'vp.id = e.variant_parent_id');
+
                 $event->addCategoryLeftJoin($qb, 'e');
 
+                if (!$hasGroupBy) {
+                    $qb->groupBy('e.id');
+                }
                 if ($event->hasColumn($clickColumns) || $event->hasFilter($clickColumns)) {
                     $qbcut->select(
                         'COUNT(cut2.channel_id) AS trackable_count, SUM(cut2.hits) AS hits',
@@ -272,6 +282,9 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                         'e.id = dnc.channel_id and dnc.channel=\'email\' and dnc.reason='.DoNotContact::UNSUBSCRIBED
                     );
                 }
+
+                $event->addCampaignByChannelJoin($qb, 'e', 'email');
+
                 break;
             case 'email.stats':
                 $qb->from(MAUTIC_TABLE_PREFIX.'email_stats', 'es')
@@ -306,6 +319,8 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                     );
                 }
 
+                $event->addCampaignByChannelJoin($qb, 'e', 'email');
+
                 break;
         }
 
@@ -336,9 +351,10 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
 
             switch ($g) {
                 case 'mautic.email.graph.line.stats':
-                    $chart       = new LineChart(null, $options['dateFrom'], $options['dateTo']);
-                    $sendQuery   = clone $queryBuilder;
-                    $readQuery   = clone $origQuery;
+                    $chart     = new LineChart(null, $options['dateFrom'], $options['dateTo']);
+                    $sendQuery = clone $queryBuilder;
+                    $readQuery = clone $origQuery;
+                    $readQuery->andWhere($qb->expr()->isNotNull('date_read'));
                     $failedQuery = clone $queryBuilder;
                     $failedQuery->andWhere($qb->expr()->eq('es.is_failed', ':true'));
                     $failedQuery->setParameter('true', true, 'boolean');
diff --git a/app/bundles/EmailBundle/EventListener/TokenSubscriber.php b/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
index 83cde998383..d19a96f28e1 100644
--- a/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
@@ -147,24 +147,73 @@ private function matchFilterForLead(array $filter, array $lead)
                 continue;
             }
 
-            $leadVal   = $isCompanyField ? $primaryCompany[$data['field']] : $lead[$data['field']];
+            /*
+             * If we are checking the first filter in a group
+             * assume that the group will not match.
+             */
+            if ($groups[$groupNum] === null) {
+                $groups[$groupNum] = false;
+            }
+
+            $leadVal   = ($isCompanyField ? $primaryCompany[$data['field']] : $lead[$data['field']]);
             $filterVal = $data['filter'];
 
-            if (!is_array($filterVal) && in_array($data['type'], ['number', 'boolean'])) {
-                $filterVal = $data['type'] === 'number' ? (float) $filterVal : (bool) $filterVal;
-            }
+            switch ($data['type']) {
+                case 'boolean':
+                    if ($leadVal !== null) {
+                        $leadVal = (bool) $leadVal;
+                    }
+
+                    if ($filterVal !== null) {
+                        $filterVal = (bool) $filterVal;
+                    }
+                    break;
+                case 'date':
+                    if (!$leadVal instanceof \DateTime) {
+                        $leadVal = new \DateTime($leadVal);
+                    }
+
+                    if (!$filterVal instanceof \DateTime) {
+                        $filterVal = new \DateTime($filterVal);
+                    }
+                    break;
+                case 'datetime':
+                case 'time':
+                    $leadValCount   = substr_count($leadVal, ':');
+                    $filterValCount = substr_count($filterVal, ':');
+
+                    if ($leadValCount === 2 && $filterValCount === 1) {
+                        $filterVal .= ':00';
+                    }
+                    break;
+                case 'multiselect':
+                    if (!is_array($leadVal)) {
+                        $leadVal = explode('|', $leadVal);
+                    }
 
-            if (in_array($data['operator'], ['like', '!like'])) {
-                $leadVal   = (string) $leadVal;
-                $filterVal = (string) $filterVal;
+                    if (!is_array($filterVal)) {
+                        $filterVal = explode('|', $filterVal);
+                    }
+                    break;
+                case 'number':
+                    $leadVal   = (int) $leadVal;
+                    $filterVal = (int) $filterVal;
+                    break;
+                case 'select':
+                default:
+                    if (is_numeric($leadVal)) {
+                        $leadVal   = (int) $leadVal;
+                        $filterVal = (int) $filterVal;
+                    }
+                    break;
             }
 
             switch ($data['operator']) {
                 case '=':
-                    $groups[$groupNum] = $leadVal === $filterVal;
+                    $groups[$groupNum] = $leadVal == $filterVal;
                     break;
                 case '!=':
-                    $groups[$groupNum] = $leadVal !== $filterVal;
+                    $groups[$groupNum] = $leadVal != $filterVal;
                     break;
                 case 'gt':
                     $groups[$groupNum] = $leadVal > $filterVal;
@@ -191,10 +240,26 @@ private function matchFilterForLead(array $filter, array $lead)
                     $groups[$groupNum] = strpos($leadVal, $filterVal) === false;
                     break;
                 case 'in':
-                    $groups[$groupNum] = in_array($leadVal, $filterVal) !== false;
+                    foreach ($leadVal as $k => $v) {
+                        if (in_array($v, $filterVal)) {
+                            $groups[$groupNum] = true;
+                            // Break once we find a match
+                            break;
+                        }
+                    }
                     break;
                 case '!in':
-                    $groups[$groupNum] = in_array($leadVal, $filterVal) === false;
+                    $leadValNotMatched = true;
+
+                    foreach ($leadVal as $k => $v) {
+                        if (in_array($v, $filterVal)) {
+                            $leadValNotMatched = false;
+                            // Break once we find a match
+                            break;
+                        }
+                    }
+
+                    $groups[$groupNum] = $leadValNotMatched;
                     break;
                 case 'regexp':
                     $groups[$groupNum] = preg_match('/'.$filterVal.'/i', $leadVal) === 1;
diff --git a/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php b/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
index caf936a23fc..238ff358dfa 100644
--- a/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
@@ -13,7 +13,9 @@
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Event\EmailOpenEvent;
 use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\EventListener\WebhookModelTrait;
 use Mautic\WebhookBundle\WebhookEvents;
 
 /**
@@ -21,12 +23,15 @@
  */
 class WebhookSubscriber extends CommonSubscriber
 {
+    use WebhookModelTrait;
+
     /**
      * @return array
      */
     public static function getSubscribedEvents()
     {
         return [
+            EmailEvents::EMAIL_ON_OPEN      => ['onEmailOpen', 0],
             WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
         ];
     }
@@ -47,4 +52,22 @@ public function onWebhookBuild(WebhookBuilderEvent $event)
         // add it to the list
         $event->addEvent(EmailEvents::EMAIL_ON_OPEN, $mailOpen);
     }
+
+    /**
+     * @param EmailOpenEvent $event
+     */
+    public function onEmailOpen(EmailOpenEvent $event)
+    {
+        $this->webhookModel->queueWebhooksByType(
+            EmailEvents::EMAIL_ON_OPEN,
+            [
+                'stat' => $event->getStat(),
+            ],
+            [
+                'statDetails',
+                'leadList',
+                'emailDetails',
+            ]
+        );
+    }
 }
diff --git a/app/bundles/EmailBundle/Form/Type/EmailSendType.php b/app/bundles/EmailBundle/Form/Type/EmailSendType.php
index ea2314d34ba..a07c8d90674 100644
--- a/app/bundles/EmailBundle/Form/Type/EmailSendType.php
+++ b/app/bundles/EmailBundle/Form/Type/EmailSendType.php
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.email.choose.emails_descr',
-                    'onchange' => 'Mautic.disabledEmailAction()',
+                    'onchange' => 'Mautic.disabledEmailAction(window, this)',
                 ],
                 'multiple'    => false,
                 'required'    => true,
@@ -122,7 +122,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
-                        'onclick'  => 'Mautic.loadNewWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
+                        'onclick'  => 'Mautic.loadNewWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlEdit.'","origin":"#'.$options['update_select'].'"}))',
                         'disabled' => !isset($options['data']['email']),
                         'icon'     => 'fa fa-edit',
                     ],
@@ -139,7 +139,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
-                        'onclick'  => 'Mautic.loadNewWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlPreview.'"}))',
+                        'onclick'  => 'Mautic.loadNewWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlPreview.'","origin":"#'.$options['update_select'].'"}))',
                         'disabled' => !isset($options['data']['email']),
                         'icon'     => 'fa fa-external-link',
                     ],
diff --git a/app/bundles/EmailBundle/Helper/MailHelper.php b/app/bundles/EmailBundle/Helper/MailHelper.php
index a19abb8354f..5b51ab9abab 100644
--- a/app/bundles/EmailBundle/Helper/MailHelper.php
+++ b/app/bundles/EmailBundle/Helper/MailHelper.php
@@ -15,14 +15,12 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\EmailBundle\EmailEvents;
-use Mautic\EmailBundle\Entity\Copy;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Entity\Stat;
 use Mautic\EmailBundle\Event\EmailSendEvent;
 use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
 use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
 use Mautic\EmailBundle\Swiftmailer\Transport\InterfaceTokenTransport;
-use Mautic\LeadBundle\Entity\Lead;
 
 /**
  * Class MailHelper.
@@ -69,6 +67,11 @@ class MailHelper
      */
     protected $from;
 
+    /**
+     * @var
+     */
+    protected $systemFrom;
+
     /**
      * @var string
      */
@@ -138,6 +141,11 @@ class MailHelper
      */
     protected $queuedRecipients = [];
 
+    /**
+     * @var array
+     */
+    public $metadata = [];
+
     /**
      * @var string
      */
@@ -233,7 +241,7 @@ public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from
             $this->logError($e);
         }
 
-        $this->from       = (!empty($from)) ? $from : [$factory->getParameter('mailer_from_email') => $factory->getParameter('mailer_from_name')];
+        $this->from       = $this->systemFrom       = (!empty($from)) ? $from : [$factory->getParameter('mailer_from_email') => $factory->getParameter('mailer_from_name')];
         $this->returnPath = $factory->getParameter('mailer_return_path');
 
         // Check if batching is supported by the transport
@@ -302,35 +310,26 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             // properly populate metadata for this transport
 
             if ($result = $this->queue($dispatchSendEvent)) {
-                $result = $this->flushQueue();
+                $result = $this->flushQueue(['To', 'Cc', 'Bcc'], $useOwnerAsMailer);
             }
 
             return $result;
         }
 
         // Set from email
-        if (!$isQueueFlush && $useOwnerAsMailer && $this->factory->getParameter('mailer_is_owner') && isset($this->lead['id'])) {
-            if (!isset($this->lead['owner_id'])) {
-                $this->lead['owner_id'] = 0;
-            } elseif (isset($this->lead['owner_id'])) {
-                if (!isset(self::$leadOwners[$this->lead['owner_id']])) {
-                    $owner = $this->factory->getModel('lead')->getRepository()->getLeadOwner($this->lead['owner_id']);
-                    if ($owner) {
-                        self::$leadOwners[$owner['id']] = $owner;
-                    }
+        $ownerSignature = false;
+        if (!$isQueueFlush) {
+            if ($useOwnerAsMailer) {
+                if ($owner = $this->getContactOwner($this->lead)) {
+                    $this->setFrom($owner['email'], $owner['first_name'].' '.$owner['last_name']);
+                    $ownerSignature = $this->getContactOwnerSignature($owner);
                 } else {
-                    $owner = self::$leadOwners[$this->lead['owner_id']];
+                    $this->setFrom($this->from);
                 }
-            }
-
-            if (!empty($owner)) {
-                $this->setFrom($owner['email'], $owner['first_name'].' '.$owner['last_name']);
-            } else {
+            } elseif (!$from = $this->message->getFrom()) {
                 $this->setFrom($this->from);
             }
-        } elseif (!$from = $this->message->getFrom()) {
-            $this->setFrom($this->from);
-        }
+        } // from is set in flushQueue
 
         // Set system return path if applicable
         if (!$isQueueFlush && ($bounceEmail = $this->generateBounceEmail($this->idHash))) {
@@ -339,7 +338,7 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             $this->message->setReturnPath($this->returnPath);
         }
 
-        if (empty($this->errors)) {
+        if (empty($this->fatal)) {
             if (!$isQueueFlush) {
                 // Only add unsubscribe header to one-off sends as tokenized sends are built by the transport
                 $this->addUnsubscribeHeader();
@@ -364,29 +363,32 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             $this->setMessagePlainText($isQueueFlush);
 
             if (!$isQueueFlush) {
+                // Replace token content
+                $tokens = $this->getTokens();
+                if ($ownerSignature) {
+                    $tokens['{signature}'] = $ownerSignature;
+                }
+
                 // Set metadata if applicable
                 if (method_exists($this->message, 'addMetadata')) {
                     foreach ($this->queuedRecipients as $email => $name) {
-                        $this->message->addMetadata($email,
+                        $this->message->addMetadata(
+                            $email,
                             [
                                 'leadId'  => (!empty($this->lead)) ? $this->lead['id'] : null,
                                 'emailId' => (!empty($this->email)) ? $this->email->getId() : null,
                                 'hashId'  => $this->idHash,
                                 'source'  => $this->source,
-                                'tokens'  => $this->getTokens(),
+                                'tokens'  => $tokens,
                             ]
                         );
                     }
-                } else {
-                    // Replace token content
-                    $tokens = $this->getTokens();
-                    if (!empty($tokens)) {
-                        // Replace tokens
-                        $search  = array_keys($tokens);
-                        $replace = $tokens;
-
-                        self::searchReplaceTokens($search, $replace, $this->message);
-                    }
+                } elseif (!empty($tokens)) {
+                    // Replace tokens
+                    $search  = array_keys($tokens);
+                    $replace = $tokens;
+
+                    self::searchReplaceTokens($search, $replace, $this->message);
                 }
             }
 
@@ -450,7 +452,9 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
 
         $error = empty($this->errors);
 
-        $this->createAssetDownloadEntries();
+        if (!$isQueueFlush) {
+            $this->createAssetDownloadEntries();
+        } // else handled in flushQueue
 
         return $error;
     }
@@ -481,20 +485,35 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
 
             // Metadata has to be set for each recipient
             foreach ($this->queuedRecipients as $email => $name) {
-                $this->message->addMetadata($email,
+                $fromKey = 'default';
+                $tokens  = $this->getTokens();
+
+                if ($owner = $this->getContactOwner($this->lead)) {
+                    $fromKey = $owner['email'];
+
+                    // Override default signature with owner
+                    if ($ownerSignature = $this->getContactOwnerSignature($owner)) {
+                        $tokens['{signature}'] = $ownerSignature;
+                    }
+                }
+
+                if (!isset($this->metadata[$fromKey])) {
+                    $this->metadata[$fromKey] = [
+                        'from'     => $owner,
+                        'contacts' => [],
+                    ];
+                }
+
+                $this->metadata[$fromKey]['contacts'][$email] =
                     [
                         'leadId'  => (!empty($this->lead)) ? $this->lead['id'] : null,
                         'emailId' => (!empty($this->email)) ? $this->email->getId() : null,
                         'hashId'  => $this->idHash,
                         'source'  => $this->source,
-                        'tokens'  => $this->getTokens(),
-                    ]
-                );
+                        'tokens'  => $tokens,
+                    ];
             }
 
-            // Add asset stats if applicable
-            $this->queueAssetDownloadEntry();
-
             // Reset recipients
             $this->queuedRecipients = [];
 
@@ -538,16 +557,57 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
     /**
      * Send batched mail to mailer.
      *
-     * @param array $resetEmailTypes Array of email types to clear after flusing the queue
+     * @param array $resetEmailTypes  Array of email types to clear after flusing the queue
+     * @param bool  $useOwnerAsMailer
      *
      * @return bool
      */
-    public function flushQueue($resetEmailTypes = ['To', 'Cc', 'Bcc'])
+    public function flushQueue($resetEmailTypes = ['To', 'Cc', 'Bcc'], $useOwnerAsMailer = true)
     {
         if ($this->tokenizationEnabled) {
-            $to = $this->message->getTo();
-            if (!empty($to)) {
-                $result = $this->send(false, true);
+            if (count($this->metadata) && empty($this->fatal)) {
+                $errors             = $this->errors;
+                $errors['failures'] = [];
+
+                $result = true;
+
+                foreach ($this->metadata as $fromKey => $metadatum) {
+                    $this->errors = [];
+
+                    if ($useOwnerAsMailer && 'default' !== $fromKey) {
+                        $this->setFrom($metadatum['from']['email'], $metadatum['from']['first_name'].' '.$metadatum['from']['last_name']);
+                    } else {
+                        $this->setFrom($this->from);
+                    }
+
+                    foreach ($metadatum['contacts'] as $email => $contact) {
+                        $this->message->addMetadata($email, $contact);
+
+                        // Add asset stats if applicable
+                        if (!empty($contact['leadId'])) {
+                            $this->queueAssetDownloadEntry($email, $contact);
+                        }
+                    }
+
+                    if (!$this->send(false, true)) {
+                        $result = false;
+                    }
+
+                    // Clear metadata for the previous recipients
+                    $this->message->clearMetadata();
+
+                    // Merge errors
+                    if (isset($this->errors['failures'])) {
+                        $errors['failures'] = array_merge($errors['failures'], $this->errors['failures']);
+                        unset($this->errors['failures']);
+                    }
+
+                    if (!empty($this->errors)) {
+                        $errors = array_merge($errors, $this->errors);
+                    }
+                }
+
+                $this->errors = $errors;
 
                 // Clear queued to recipients
                 $this->queuedRecipients = [];
@@ -557,9 +617,6 @@ public function flushQueue($resetEmailTypes = ['To', 'Cc', 'Bcc'])
                     $this->message->{'set'.$type}([]);
                 }
 
-                // Clear metadata for the previous recipients
-                $this->message->clearMetadata();
-
                 return $result;
             }
 
@@ -589,7 +646,7 @@ public function reset($cleanSlate = true)
             $this->appendTrackingPixel = false;
 
             unset($this->headers, $this->email, $this->source, $this->assets, $this->globalTokens, $this->message, $this->subject, $this->body, $this->plainText, $this->assets, $this->attachedAssets);
-
+            $this->from    = $this->systemFrom;
             $this->headers = $this->source = $this->assets = $this->globalTokens = $this->assets = $this->attachedAssets = [];
             $this->email   = null;
             $this->subject = $this->plainText = '';
@@ -1223,8 +1280,7 @@ public function getLead()
      */
     public function setLead($lead, $interalSend = false)
     {
-        $this->lead = $lead;
-
+        $this->lead         = $lead;
         $this->internalSend = $interalSend;
     }
 
@@ -1254,6 +1310,9 @@ public function setSource($source)
         $this->source = $source;
     }
 
+    /**
+     * @return Email|null
+     */
     public function getEmail()
     {
         return $this->email;
@@ -1282,12 +1341,17 @@ public function setEmail(Email $email, $allowBcc = true, $slots = [], $assetAtta
 
         $fromEmail = $email->getFromAddress();
         $fromName  = $email->getFromName();
-        if (!empty($fromEmail) && !empty($fromEmail)) {
+        if (!empty($fromEmail) || !empty($fromName)) {
+            if (empty($fromName)) {
+                $fromName = array_values($this->from)[0];
+            } elseif (empty($fromEmail)) {
+                $fromEmail = key($this->from);
+            }
+
             $this->setFrom($fromEmail, $fromName);
-        } elseif (!empty($fromEmail)) {
-            $this->setFrom($fromEmail, $this->from);
-        } elseif (!empty($fromName)) {
-            $this->setFrom(key($this->from), $fromName);
+            $this->from = [$fromEmail => $fromName];
+        } else {
+            $this->from = $this->systemFrom;
         }
 
         $replyTo = $email->getReplyToAddress();
@@ -1475,7 +1539,7 @@ public function parsePlainText($content = null)
      */
     public function useMailerTokenization($tokenizationEnabled = true)
     {
-        @trigger_error('useMailerTokenization() is now deprecated. Use enableQueue() instead.', E_DEPRECATED);
+        @trigger_error('useMailerTokenization() is now deprecated. Use enableQueue() instead.', E_USER_DEPRECATED);
 
         $this->enableQueue($tokenizationEnabled);
     }
@@ -1619,17 +1683,37 @@ protected function createAssetDownloadEntries()
 
     /**
      * Queues the details to note if a lead received an asset if no errors are generated.
+     *
+     * @param null $contactEmail
+     * @param null $metadata
      */
-    protected function queueAssetDownloadEntry()
+    protected function queueAssetDownloadEntry($contactEmail = null, array $metadata = null)
     {
-        if (!$this->internalSend && !empty($this->lead) && !empty($this->assets)) {
-            $this->assetStats[$this->lead['email']] = [
-                'lead'        => $this->lead['id'],
-                'email'       => $this->email->getId(),
-                'source'      => ['email', $this->email->getId()],
-                'tracking_id' => $this->idHash,
-            ];
+        if ($this->internalSend || empty($this->assets)) {
+            return;
+        }
+
+        if (null === $contactEmail) {
+            if (!$this->lead) {
+                return;
+            }
+
+            $contactEmail = $this->lead['email'];
+            $contactId    = $this->lead['id'];
+            $emailId      = $this->email->getId();
+            $idHash       = $this->idHash;
+        } else {
+            $contactId = $metadata['leadId'];
+            $emailId   = $metadata['emailId'];
+            $idHash    = $metadata['hashId'];
         }
+
+        $this->assetStats[$contactEmail] = [
+            'lead'        => $contactId,
+            'email'       => $emailId,
+            'source'      => ['email', $emailId],
+            'tracking_id' => $idHash,
+        ];
     }
 
     /**
@@ -1877,7 +1961,7 @@ public function processSlots($slots, $entity)
      *
      * @return null|string
      */
-    private function cleanName($name)
+    protected function cleanName($name)
     {
         if (null !== $name) {
             $name = trim($name);
@@ -1890,4 +1974,42 @@ private function cleanName($name)
 
         return $name;
     }
+
+    /**
+     * @param $contact
+     *
+     * @return bool|array
+     */
+    protected function getContactOwner(&$contact)
+    {
+        $owner = false;
+
+        if ($this->factory->getParameter('mailer_is_owner') && is_array($contact) && isset($contact['id'])) {
+            if (!isset($contact['owner_id'])) {
+                $contact['owner_id'] = 0;
+            } elseif (isset($contact['owner_id'])) {
+                if (isset(self::$leadOwners[$contact['owner_id']])) {
+                    $owner = self::$leadOwners[$contact['owner_id']];
+                } elseif ($owner = $this->factory->getModel('lead')->getRepository()->getLeadOwner($contact['owner_id'])) {
+                    self::$leadOwners[$owner['id']] = $owner;
+                }
+            }
+        }
+
+        return $owner;
+    }
+
+    /**
+     * @param $owner
+     *
+     * @return mixed
+     */
+    protected function getContactOwnerSignature($owner)
+    {
+        return empty($owner['signature'])
+            ? false
+            : EmojiHelper::toHtml(
+                str_replace('|FROM_NAME|', $owner['first_name'].' '.$owner['last_name'], nl2br($owner['signature']))
+            );
+    }
 }
diff --git a/app/bundles/EmailBundle/Model/EmailModel.php b/app/bundles/EmailBundle/Model/EmailModel.php
index a6f2d86eb77..87fd5f18fb9 100644
--- a/app/bundles/EmailBundle/Model/EmailModel.php
+++ b/app/bundles/EmailBundle/Model/EmailModel.php
@@ -617,9 +617,9 @@ public function getEmailListStats($email, $includeVariants = false, \DateTime $d
             $sentCounts         = $statRepo->getSentCount($emailIds, true, $query);
             $readCounts         = $statRepo->getReadCount($emailIds, true, $query);
             $failedCounts       = $statRepo->getFailedCount($emailIds, true, $query);
-            $clickCounts        = $trackableRepo->getCount('email', $emailIds, true, $query);
-            $unsubscribedCounts = $dncRepo->getCount('email', $emailIds, DoNotContact::UNSUBSCRIBED, true, $query);
-            $bouncedCounts      = $dncRepo->getCount('email', $emailIds, DoNotContact::BOUNCED, true, $query);
+            $clickCounts        = $trackableRepo->getCount('email', $emailIds, $lists->getKeys(), $query);
+            $unsubscribedCounts = $dncRepo->getCount('email', $emailIds, DoNotContact::UNSUBSCRIBED, $lists->getKeys(), $query);
+            $bouncedCounts      = $dncRepo->getCount('email', $emailIds, DoNotContact::BOUNCED, $lists->getKeys(), $query);
 
             foreach ($lists as $l) {
                 $sentCount = isset($sentCounts[$l->getId()]) ? $sentCounts[$l->getId()] : 0;
@@ -826,13 +826,30 @@ public function getPendingLeads(Email $email, $listId = null, $countOnly = false
         return $total;
     }
 
+    /**
+     * @param Email $email
+     * @param bool  $includeVariants
+     *
+     * @return array|int
+     */
+    public function getQueuedCounts(Email $email, $includeVariants = true)
+    {
+        $ids = ($includeVariants) ? $email->getRelatedEntityIds() : null;
+        if (!in_array($email->getId(), $ids)) {
+            $ids[] = $email->getId();
+        }
+
+        return $this->messageQueueModel->getQueuedChannelCount('email', $ids);
+    }
+
     /**
      * Send an email to lead lists.
      *
-     * @param Email $email
-     * @param array $lists
-     * @param int   $limit
-     * @param bool  $batch True to process and batch all pending leads
+     * @param Email           $email
+     * @param array           $lists
+     * @param int             $limit
+     * @param bool            $batch  True to process and batch all pending leads
+     * @param OutputInterface $output
      *
      * @return array array(int $sentCount, int $failedCount, array $failedRecipientsByList)
      */
@@ -1165,7 +1182,7 @@ public function sendEmail($email, $leads, $options = [])
         //get a count of leads
         $count = count($sendTo);
 
-        //noone to send to so bail or if marketing email from a campaign has been put in a queue
+        //no one to send to so bail or if marketing email from a campaign has been put in a queue
         if (empty($count)) {
             return $singleEmail ? true : [];
         }
@@ -1184,6 +1201,9 @@ public function sendEmail($email, $leads, $options = [])
         // Store stat entities
         $errors          = [];
         $saveEntities    = [];
+        $deleteEntities  = [];
+        $statEntities    = [];
+        $statBatchCount  = 0;
         $emailSentCounts = [];
 
         // Setup the mailer
@@ -1191,7 +1211,7 @@ public function sendEmail($email, $leads, $options = [])
         $mailer->enableQueue();
 
         // Flushes the batch in case of using API mailers
-        $flushQueue = function ($reset = true) use (&$mailer, &$saveEntities, &$errors, &$emailSentCounts, $sendBatchMail) {
+        $flushQueue = function ($reset = true) use (&$mailer, &$statEntities, &$saveEntities, &$deleteEntities, &$errors, &$emailSentCounts, $sendBatchMail) {
             if ($sendBatchMail) {
                 $flushResult = $mailer->flushQueue();
                 if (!$flushResult) {
@@ -1202,7 +1222,7 @@ public function sendEmail($email, $leads, $options = [])
                         // Prevent the stat from saving
                         foreach ($sendFailures['failures'] as $failedEmail) {
                             /** @var Stat $stat */
-                            $stat = $saveEntities[$failedEmail];
+                            $stat = $statEntities[$failedEmail];
                             // Add lead ID to list of failures
                             $errors[$stat->getLead()->getId()] = $failedEmail;
 
@@ -1210,8 +1230,10 @@ public function sendEmail($email, $leads, $options = [])
                             $emailId = $stat->getEmail()->getId();
                             ++$emailSentCounts[$emailId];
 
-                            // Delete the stat
-                            unset($saveEntities[$failedEmail]);
+                            if ($stat->getId()) {
+                                $deleteEntities[] = $stat;
+                            }
+                            unset($statEntities[$failedEmail], $saveEntities[$failedEmail]);
                         }
                     }
                 }
@@ -1342,7 +1364,15 @@ public function sendEmail($email, $leads, $options = [])
                     }
 
                     //create a stat
-                    $saveEntities[$contact['email']] = $mailer->createEmailStat(false, null, $listId);
+                    $saveEntities[$contact['email']] = $statEntities[$contact['email']] = $mailer->createEmailStat(false, null, $listId);
+                    ++$statBatchCount;
+
+                    if (20 === $statBatchCount) {
+                        // Save in batches of 20 to prevent email loops if the there are issuses with persisting a large number of stats at once
+                        $statRepo->saveEntities($saveEntities);
+                        $statBatchCount = 0;
+                        $saveEntities   = [];
+                    }
 
                     // Up sent counts
                     if (!isset($emailSentCounts[$translatedId])) {
@@ -1363,8 +1393,13 @@ public function sendEmail($email, $leads, $options = [])
         // Send batched mail if applicable
         $flushQueue();
 
-        // Persist stats
-        $statRepo->saveEntities($saveEntities);
+        // Persist left over stats
+        if (count($saveEntities)) {
+            $statRepo->saveEntities($saveEntities);
+        }
+        if (count($deleteEntities)) {
+            $statRepo->deleteEntities($deleteEntities);
+        }
 
         // Update bad emails as bounces
         if (count($badEmails)) {
@@ -1399,7 +1434,7 @@ public function sendEmail($email, $leads, $options = [])
         $this->em->clear('Mautic\EmailBundle\Entity\Stat');
         $this->em->clear('Mautic\LeadBundle\Entity\DoNotContact');
 
-        unset($saveEntities, $badEmails, $emailSentCounts, $emailSettings, $options, $tokens, $useEmail, $sendTo);
+        unset($saveEntities, $saveEntities, $badEmails, $emailSentCounts, $emailSettings, $options, $tokens, $useEmail, $sendTo);
 
         $success = empty($errors);
         if (!$success && $returnErrorMessages) {
@@ -1746,8 +1781,7 @@ public function getEmailsLineChartData($unit, \DateTime $dateFrom, \DateTime $da
 
             if (isset($filter['email_id'])) {
                 if (is_array($filter['email_id'])) {
-                    $q->andWhere('cut.channel_id IN(:channel_id)');
-                    $q->setParameter('channel_id', implode(',', $filter['email_id']));
+                    $q->andWhere($q->expr()->in('cut.channel_id', $filter['email_id']));
                 } else {
                     $q->andWhere('cut.channel_id = :channel_id');
                     $q->setParameter('channel_id', $filter['email_id']);
@@ -1759,6 +1793,7 @@ public function getEmailsLineChartData($unit, \DateTime $dateFrom, \DateTime $da
             }
 
             $data = $query->loadAndBuildTimeData($q);
+
             $chart->setDataset($this->translator->trans('mautic.email.clicked'), $data);
         }
 
@@ -1778,10 +1813,12 @@ public function getEmailsLineChartData($unit, \DateTime $dateFrom, \DateTime $da
     /**
      * Modifies the line chart query for the DNC.
      *
-     * @param ChartQuery $q
+     * @param ChartQuery $query
      * @param array      $filter
-     * @param bool       $reason
-     * @param bool       $canViewOthers
+     * @param            $reason
+     * @param            $canViewOthers
+     *
+     * @return array
      */
     public function getDncLineChartDataset(ChartQuery &$query, array $filter, $reason, $canViewOthers)
     {
@@ -1843,14 +1880,12 @@ public function getIgnoredVsReadPieChartData($dateFrom, $dateTo, $filters = [],
     /**
      * Get pie chart data of ignored vs opened emails.
      *
-     * @param string $dateFrom
-     * @param string $dateTo
-     * @param array  $filters
-     * @param bool   $canViewOthers
+     * @param   $dateFrom
+     * @param   $dateTo
      *
      * @return array
      */
-    public function getDeviceGranularityPieChartData($dateFrom, $dateTo, $canViewOthers = true)
+    public function getDeviceGranularityPieChartData($dateFrom, $dateTo)
     {
         $chart = new PieChart();
 
@@ -1869,7 +1904,10 @@ public function getDeviceGranularityPieChartData($dateFrom, $dateTo, $canViewOth
         }
 
         foreach ($deviceStats as $device) {
-            $chart->setDataset($device['device'], $device['count']);
+            $chart->setDataset(
+                ($device['device']) ? $device['device'] : $this->translator->trans('mautic.core.unknown'),
+                $device['count']
+            );
         }
 
         return $chart->render();
@@ -1990,13 +2028,18 @@ public function getVariants(Email $entity)
      * @param string $filter
      * @param int    $limit
      * @param int    $start
+     * @param array  $options
+     *
+     * @return array
      */
     public function getLookupResults($type, $filter = '', $limit = 10, $start = 0, $options = [])
     {
         $results = [];
         switch ($type) {
             case 'email':
-                $emails = $this->getRepository()->getEmailList(
+                $emailRepo = $this->getRepository();
+                $emailRepo->setCurrentUser($this->userHelper->getUser());
+                $emails = $emailRepo->getEmailList(
                     $filter,
                     $limit,
                     $start,
diff --git a/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php b/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
index 0ac499761a0..b1dec1f2ef8 100644
--- a/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
+++ b/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
@@ -12,11 +12,48 @@
 namespace Mautic\EmailBundle\Tests\Helper;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\EmailBundle\Entity\Email;
+use Mautic\EmailBundle\MonitoredEmail\Mailbox;
 use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
 use Mautic\EmailBundle\Tests\Helper\Transport\BatchTransport;
+use Mautic\EmailBundle\Tests\Helper\Transport\SmtpTransport;
+use Mautic\LeadBundle\Entity\LeadRepository;
+use Mautic\LeadBundle\Model\LeadModel;
+use Monolog\Logger;
 
 class MailHelperTest extends \PHPUnit_Framework_TestCase
 {
+    protected $contacts = [
+        [
+            'id'        => 1,
+            'email'     => 'contact1@somewhere.com',
+            'firstname' => 'Contact',
+            'lastname'  => '1',
+            'owner_id'  => 1,
+        ],
+        [
+            'id'        => 2,
+            'email'     => 'contact2@somewhere.com',
+            'firstname' => 'Contact',
+            'lastname'  => '2',
+            'owner_id'  => 0,
+        ],
+        [
+            'id'        => 3,
+            'email'     => 'contact3@somewhere.com',
+            'firstname' => 'Contact',
+            'lastname'  => '3',
+            'owner_id'  => 2,
+        ],
+        [
+            'id'        => 4,
+            'email'     => 'contact4@somewhere.com',
+            'firstname' => 'Contact',
+            'lastname'  => '4',
+            'owner_id'  => 1,
+        ],
+    ];
+
     /**
      * @expectedException \Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException
      */
@@ -75,4 +112,191 @@ public function testQueueModeDisabledDoesNotThrowsExceptionWhenBatchLimitHit()
         // Otherwise success
         $this->assertTrue(true);
     }
+
+    public function testQueuedEmailFromOverride()
+    {
+        $mockFactory = $this->getMockFactory(false);
+
+        $transport   = new BatchTransport();
+        $swiftMailer = new \Swift_Mailer($transport);
+
+        $mailer = new \Mautic\EmailBundle\Helper\MailHelper($mockFactory, $swiftMailer, ['nobody@nowhere.com' => 'No Body']);
+
+        $email = new Email();
+        $email->setFromAddress('override@nowhere.com');
+        $email->setFromName('Test');
+
+        $mailer->setEmail($email);
+
+        foreach ($this->contacts as $contact) {
+            $mailer->setTo($contact['email']);
+            $mailer->setLead($contact);
+            $mailer->queue();
+        }
+
+        $mailer->flushQueue();
+        $from = $mailer->message->getFrom();
+
+        $this->assertTrue(array_key_exists('override@nowhere.com', $from));
+        $this->assertTrue(count($from) === 1);
+
+        $mailer->reset();
+        foreach ($this->contacts as $contact) {
+            $mailer->setTo($contact['email']);
+            $mailer->setLead($contact);
+            $mailer->queue();
+        }
+        $mailer->flushQueue();
+        $from = $mailer->message->getFrom();
+
+        $this->assertTrue(array_key_exists('nobody@nowhere.com', $from));
+        $this->assertTrue(count($from) === 1);
+    }
+
+    public function testQueuedOwnerAsMailer()
+    {
+        $mockFactory = $this->getMockFactory();
+
+        $transport   = new BatchTransport();
+        $swiftMailer = new \Swift_Mailer($transport);
+
+        $mailer = new \Mautic\EmailBundle\Helper\MailHelper($mockFactory, $swiftMailer, ['nobody@nowhere.com' => 'No Body']);
+
+        foreach ($this->contacts as $contact) {
+            $mailer->setTo($contact['email']);
+            $mailer->setLead($contact);
+            $mailer->queue();
+        }
+
+        $mailer->flushQueue();
+
+        $fromAddresses = $transport->getFromAddresses();
+        $metadatas     = $transport->getMetadatas();
+
+        $this->assertEquals(3, count($fromAddresses));
+        $this->assertEquals(3, count($metadatas));
+        $this->assertEquals(['owner1@owner.com', 'nobody@nowhere.com', 'owner2@owner.com'], $fromAddresses);
+
+        foreach ($metadatas as $key => $metadata) {
+            $this->assertTrue(isset($metadata[$this->contacts[$key]['email']]));
+
+            if (0 === $key) {
+                // Should have two contacts
+                $this->assertEquals(2, count($metadata));
+                $this->assertTrue(isset($metadata['contact4@somewhere.com']));
+            } else {
+                $this->assertEquals(1, count($metadata));
+            }
+
+            // Check that signatures are valid
+            if (1 === $key) {
+                // There should not be a signature token because owner was not set and token events have not been dispatched
+                $this->assertFalse(isset($metadata['tokens']['{signature}']));
+            } else {
+                $this->assertEquals($metadata[$this->contacts[$key]['email']]['tokens']['{signature}'], 'owner '.$this->contacts[$key]['owner_id']);
+
+                if (0 === $key) {
+                    // Ensure the last contact has the correct signature
+                    $this->assertEquals($metadata['contact4@somewhere.com']['tokens']['{signature}'], 'owner '.$this->contacts[$key]['owner_id']);
+                }
+            }
+        }
+    }
+
+    public function testStandardOwnerAsMailer()
+    {
+        $mockFactory = $this->getMockFactory();
+
+        $transport   = new SmtpTransport();
+        $swiftMailer = new \Swift_Mailer($transport);
+
+        $mailer = new \Mautic\EmailBundle\Helper\MailHelper($mockFactory, $swiftMailer, ['nobody@nowhere.com' => 'No Body']);
+        $mailer->setBody('{signature}');
+
+        foreach ($this->contacts as $key => $contact) {
+            $mailer->setTo($contact['email']);
+            $mailer->setLead($contact);
+            $mailer->send();
+
+            $body = $mailer->message->getBody();
+            $from = key($mailer->message->getFrom());
+
+            if ($contact['owner_id']) {
+                $this->assertEquals('owner'.$contact['owner_id'].'@owner.com', $from);
+                $this->assertEquals('owner '.$contact['owner_id'], $body);
+            } else {
+                $this->assertEquals('nobody@nowhere.com', $from);
+                $this->assertEquals('{signature}', $body);
+            }
+        }
+    }
+
+    protected function getMockFactory($mailIsOwner = true)
+    {
+        $mockLeadRepository = $this->getMockBuilder(LeadRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLeadRepository->method('getLeadOwner')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [1, ['id' => 1, 'email' => 'owner1@owner.com', 'first_name' => '', 'last_name' => '', 'signature' => 'owner 1']],
+                        [2, ['id' => 2, 'email' => 'owner2@owner.com', 'first_name' => '', 'last_name' => '', 'signature' => 'owner 2']],
+                    ]
+                )
+            );
+
+        $mockLeadModel = $this->getMockBuilder(LeadModel::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockLeadModel->method('getRepository')
+            ->willReturn($mockLeadRepository);
+
+        $mockFactory = $this->getMockBuilder(MauticFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockFactory->method('getParameter')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['mailer_return_path', false, null],
+                        ['mailer_spool_type', false, 'memory'],
+                        ['mailer_is_owner', false, $mailIsOwner],
+                    ]
+                )
+            );
+        $mockFactory->method('getModel')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['lead', $mockLeadModel],
+                    ]
+                )
+            );
+
+        $mockLogger = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockFactory->method('getLogger')
+            ->willReturn($mockLogger);
+
+        $mockMailboxHelper = $this->getMockBuilder(Mailbox::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockMailboxHelper->method('isConfigured')
+            ->willReturn(false);
+
+        $mockFactory->method('getHelper')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['mailbox', $mockMailboxHelper],
+                    ]
+                )
+            );
+
+        return $mockFactory;
+    }
 }
diff --git a/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php b/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
index 02848016638..a47e158143e 100644
--- a/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
+++ b/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
@@ -13,17 +13,54 @@
 
 class BatchTransport extends AbstractTokenArrayTransport implements \Swift_Transport
 {
+    private $fromAddresses = [];
+    private $metadatas     = [];
+
+    /**
+     * @param \Swift_Mime_Message $message
+     * @param null                $failedRecipients
+     */
     public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     {
+        $this->message = $message;
+
+        $this->fromAddresses[] = key($message->getFrom());
+        $this->metadatas[]     = $this->getMetadata();
     }
 
+    /**
+     * @return int
+     */
     public function getMaxBatchLimit()
     {
         return 1;
     }
 
+    /**
+     * @param \Swift_Message $message
+     * @param int            $toBeAdded
+     * @param string         $type
+     *
+     * @return int
+     */
     public function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1, $type = 'to')
     {
         return count($message->getTo()) + $toBeAdded;
     }
+
+    /**
+     * @return array
+     */
+    public function getFromAddresses()
+    {
+        return $this->fromAddresses;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMetadatas()
+    {
+        return $this->metadatas;
+    }
 }
diff --git a/app/bundles/EmailBundle/Tests/Helper/Transport/SmtpTransport.php b/app/bundles/EmailBundle/Tests/Helper/Transport/SmtpTransport.php
new file mode 100644
index 00000000000..03d7499bcdb
--- /dev/null
+++ b/app/bundles/EmailBundle/Tests/Helper/Transport/SmtpTransport.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic, Inc.
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\EmailBundle\Tests\Helper\Transport;
+
+use Swift_Mime_Message;
+
+class SmtpTransport implements \Swift_Transport
+{
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+    }
+
+    /**
+     * Test if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return true;
+    }
+
+    /**
+     * Start this Transport mechanism.
+     */
+    public function start()
+    {
+        return true;
+    }
+
+    /**
+     * Stop this Transport mechanism.
+     */
+    public function stop()
+    {
+        return true;
+    }
+
+    /**
+     * Register a plugin in the Transport.
+     *
+     * @param \Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(\Swift_Events_EventListener $plugin)
+    {
+    }
+}
diff --git a/app/bundles/EmailBundle/Translations/en_US/messages.ini b/app/bundles/EmailBundle/Translations/en_US/messages.ini
index e682cbcbab6..e73ab937a26 100644
--- a/app/bundles/EmailBundle/Translations/en_US/messages.ini
+++ b/app/bundles/EmailBundle/Translations/en_US/messages.ini
@@ -293,6 +293,9 @@ mautic.email.stat.readcount="%count% Read"
 mautic.email.stat.sentcount="%count% Sent"
 mautic.email.stat.failed="Failed"
 mautic.email.stat.leadcount="%count% Pending"
+mautic.email.stat.leadcount.tooltip="Number of contacts that have not received this email."
+mautic.email.stat.queued="%count% Queued"
+mautic.email.stat.queued.tooltip="Number of contacts that has this emailed queued to be sent based on their frequency rules."
 mautic.email.stat.read="Read"
 mautic.email.stat.readcount="%count% Read"
 mautic.email.stat.readpercent="%count%% Read"
diff --git a/app/bundles/EmailBundle/Views/Email/form.html.php b/app/bundles/EmailBundle/Views/Email/form.html.php
index f8aa0f76a99..ee29a4c777b 100644
--- a/app/bundles/EmailBundle/Views/Email/form.html.php
+++ b/app/bundles/EmailBundle/Views/Email/form.html.php
@@ -68,7 +68,7 @@
                             <?php echo $view['translator']->trans('mautic.core.advanced'); ?>
                         </a>
                     </li>
-                    <li>
+                    <li id="dynamic-content-tab" class="hidden">
                         <a href="#dynamic-content-container" role="tab" data-toggle="tab">
                             <?php echo $view['translator']->trans('mautic.core.dynamicContent'); ?>
                         </a>
@@ -252,7 +252,7 @@
 
 <?php
 $type = $email->getEmailType();
-if ((empty($updateSelect) && !$isExisting && !$view['form']->containsErrors($form)) || empty($type) || !empty($forceTypeSelection)):
+if ((empty($updateSelect) && !$isExisting && !$view['form']->containsErrors($form) && !$variantParent) || empty($type) || !empty($forceTypeSelection)):
     echo $view->render('MauticCoreBundle:Helper:form_selecttype.html.php',
         [
             'item'       => $email,
diff --git a/app/bundles/EmailBundle/Views/Email/list.html.php b/app/bundles/EmailBundle/Views/Email/list.html.php
index c8bdf1f9667..f5a785f4db7 100644
--- a/app/bundles/EmailBundle/Views/Email/list.html.php
+++ b/app/bundles/EmailBundle/Views/Email/list.html.php
@@ -11,10 +11,9 @@
 if ($tmpl == 'index') {
     $view->extend('MauticEmailBundle:Email:index.html.php');
 }
+?>
 
-if (count($items)):
-
-    ?>
+<?php if (count($items)): ?>
     <div class="table-responsive">
         <table class="table table-hover table-striped table-bordered email-list">
             <thead>
@@ -125,23 +124,23 @@
                             ); ?>" data-toggle="ajax">
                                 <?php echo $item->getName(); ?>
                                 <?php if ($hasVariants): ?>
-                                    <span data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.core.icon_tooltip.ab_test'); ?>">
-                                <i class="fa fa-fw fa-sitemap"></i>
-                            </span>
+                                <span data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.core.icon_tooltip.ab_test'); ?>">
+                                    <i class="fa fa-fw fa-sitemap"></i>
+                                </span>
                                 <?php endif; ?>
                                 <?php if ($hasTranslations): ?>
-                                    <span data-toggle="tooltip" title="<?php echo $view['translator']->trans(
+                                <span data-toggle="tooltip" title="<?php echo $view['translator']->trans(
                                         'mautic.core.icon_tooltip.translation'
                                     ); ?>">
-                                <i class="fa fa-fw fa-language"></i>
-                            </span>
+                                    <i class="fa fa-fw fa-language"></i>
+                                </span>
                                 <?php endif; ?>
                                 <?php if ($type == 'list'): ?>
-                                    <span data-toggle="tooltip" title="<?php echo $view['translator']->trans(
+                                <span data-toggle="tooltip" title="<?php echo $view['translator']->trans(
                                         'mautic.email.icon_tooltip.list_email'
                                     ); ?>">
-                                <i class="fa fa-fw fa-pie-chart"></i>
-                            </span>
+                                    <i class="fa fa-fw fa-pie-chart"></i>
+                                </span>
                                 <?php endif; ?>
                                 <?php echo $view['content']->getCustomContent('email.name', $mauticTemplateVars); ?>
                             </a>
@@ -156,24 +155,51 @@
                         <?php $category = $item->getCategory(); ?>
                         <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
                         <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
-                        <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
+                        <span style="white-space: nowrap;">
+                            <span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span>
+                        </span>
                     </td>
                     <td class="visible-sm visible-md visible-lg col-stats">
-                        <?php if ($type == 'list'): ?>
-                            <span class="mt-xs label label-info"><?php echo $view['translator']->trans(
-                                    'mautic.email.stat.leadcount',
-                                    ['%count%' => $model->getPendingLeads($item, null, true)]
-                                ); ?></span>
+                        <?php $pending = $model->getPendingLeads($item, null, true); ?>
+                        <?php if ($type == 'list' && !empty($pending)): ?>
+                        <span class="mt-xs label label-default"
+                              data-toggle="tooltip"
+                              title="<?php echo $view['translator']->trans('mautic.email.stat.leadcount.tooltip'); ?>">
+                            <?php echo $view['translator']->trans(
+                                'mautic.email.stat.leadcount',
+                                ['%count%' => $pending]
+                            ); ?>
+                        </span>
+                        <?php endif; ?>
+                        <?php $queued = $model->getQueuedCounts($item); ?>
+                        <?php if (!empty($queued)): ?>
+                        <span class="mt-xs label label-default"
+                              data-toggle="tooltip"
+                              title="<?php echo $view['translator']->trans('mautic.email.stat.queued.tooltip'); ?>">
+                            <?php echo $view['translator']->trans(
+                                'mautic.email.stat.queued',
+                                ['%count%' => $queued]
+                            ); ?>
+                        </span>
                         <?php endif; ?>
-                        <span class="mt-xs label label-warning"><?php echo $view['translator']->trans(
+                        <span class="mt-xs label label-warning">
+                            <?php echo $view['translator']->trans(
                                 'mautic.email.stat.sentcount',
                                 ['%count%' => $item->getSentCount(true)]
-                            ); ?></span>
-                        <span class="mt-xs label label-success"><?php echo $view['translator']->trans(
+                            ); ?>
+                        </span>
+                        <span class="mt-xs label label-success">
+                            <?php echo $view['translator']->trans(
                                 'mautic.email.stat.readcount',
                                 ['%count%' => $item->getReadCount(true)]
-                            ); ?></span>
-			<span class="mt-xs label label-primary"><?php echo $view['translator']->trans('mautic.email.stat.readpercent', ['%count%' => $item->getReadPercentage(true)]); ?></span>
+                            ); ?>
+                        </span>
+                        <span class="mt-xs label label-primary">
+                            <?php echo $view['translator']->trans(
+                                'mautic.email.stat.readpercent',
+                                ['%count%' => $item->getReadPercentage(true)]
+                            ); ?>
+                        </span>
                         <?php echo $view['content']->getCustomContent('email.stats', $mauticTemplateVars); ?>
                     </td>
                     <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
index a0a702ac085..f4d575882bd 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
@@ -9,7 +9,7 @@
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
-<div class="tab-pane dynamic-content-filter bdr-w-0<?php echo $form->vars['name'] === '0' ? ' active' : ' fade' ?>" id="<?php echo $form->vars['id'] ?>">
+<div class="tab-pane dynamic-content-filter bdr-w-0" id="<?php echo $form->vars['id'] ?>">
     <div class="row form-group">
         <div class="col-xs-10">
             <?php echo $view['form']->label($form['content']); ?>
@@ -19,7 +19,9 @@
         </div>
     </div>
     <div class="row form-group">
-        <?php echo $view['form']->widget($form['content']); ?>
+        <div class="col-xs-12">
+            <?php echo $view['form']->widget($form['content']); ?>
+        </div>
     </div>
     <div class="row">
         <div class="col-xs-7">
@@ -43,7 +45,7 @@
                                     $callback  = (!empty($params['properties']['callback'])) ? $params['properties']['callback'] : '';
                                     $operators = (!empty($params['operators'])) ? $view->escape(json_encode($params['operators'])) : '{}';
                                     ?>
-                                    <option value="<?php echo $value; ?>" data-mautic="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon; ?>"><?php echo $view['translator']->trans($params['label']); ?></option>
+                                    <option value="<?php echo $value; ?>" data-mautic="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators='<?php echo $operators; ?>' class="segment-filter fa <?php echo $icon; ?>"><?php echo $view['translator']->trans($params['label']); ?></option>
                                 <?php endforeach; ?>
                             </optgroup>
                         <?php endforeach; ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
index 2b8823d2efe..fab7d8a75d8 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
@@ -11,25 +11,22 @@
 ?>
 
 <div class="tab-pane dynamic-content bdr-w-0<?php echo $form->vars['name'] === '0' ? ' active' : ' fade'; ?>" id="<?php echo $form->vars['id'] ?>">
-    <div class="row">
-        <div class="col-xs-10">
-            <?php echo $view['form']->row($form['tokenName']); ?>
-        </div>
-        <div class="col-xs-2">
-            <label>&nbsp;<!--for alignment--></label>
-            <a href="javascript: void(0);" class="remove-item btn btn-default text-danger"><i class="fa fa-trash-o"></i></a>
-        </div>
-    </div>
-    <?php echo $view['form']->row($form['content']); ?>
     <div class="panel">
         <?php
         $tabHtml = '<ul class="bg-auto nav nav-tabs pr-md pl-md" id="dynamicContentFilterTabs_'.$form->vars['name'].'">';
-        $tabHtml .= '<li><a href="javascript:void(0);" role="tab" class="addNewDynamicContentFilter" data-index="'.$form->vars['name'].'"><i class="fa fa-plus text-success"></i> '.$view['translator']->trans('mautic.core.form.new').'</a></li>';
-        $tabContentHtml = '<div class="tab-content pa-md">';
+        $tabHtml .= '<li class="active"><a data-toggle="tab" href="#emailform_dynamicContent_'.$form->vars['name'].'_default" role="tab">Default</a></li>';
+        $tabContentHtml = '<div class="tab-content pa-md"><div class="tab-pane bdr-w-0 active" id="emailform_dynamicContent_'.$form->vars['name'].'_default">';
+
+        $tabContentHtml .= '<div class="row hidden"><div class="col-xs-10">';
+        $tabContentHtml .= $view['form']->row($form['tokenName']);
+        $tabContentHtml .= '</div><div class="col-xs-2"><label>&nbsp;<!--for alignment--></label><a href="javascript: void(0);" class="remove-item btn btn-default text-danger"><i class="fa fa-trash-o"></i></a></div></div>';
+
+        $tabContentHtml .= $view['form']->row($form['content']);
+        $tabContentHtml .= '</div>';
 
         foreach ($form['filters'] as $i => $filter) {
             $isFirst = $i === 0 ? ' active' : '';
-            $tabHtml .= '<li class="'.($i === 0 ? ' active' : '').'"><a role="tab" data-toggle="tab" href="#'.$filter->vars['id'].'">'.$view['translator']->trans('mautic.core.dynamicContent.tab').' '.($i + 1).'</a></li>';
+            $tabHtml .= '<li><a role="tab" data-toggle="tab" href="#'.$filter->vars['id'].'">'.$view['translator']->trans('mautic.core.dynamicContent.tab').' '.($i + 1).'</a></li>';
 
             $tabContentHtml .= $view['form']->widget($filter);
         }
diff --git a/app/bundles/FormBundle/Assets/css/form.css b/app/bundles/FormBundle/Assets/css/form.css
index 5b85b32c378..dd2de8baa8f 100644
--- a/app/bundles/FormBundle/Assets/css/form.css
+++ b/app/bundles/FormBundle/Assets/css/form.css
@@ -49,6 +49,10 @@
     width: 50%;
 }
 
+#mauticforms_fields .chosen-container-single .chosen-search input[type="text"] {
+    width:100%;
+}
+
 .mauticform-row {
     min-height: 60px;
 }
diff --git a/app/bundles/FormBundle/Assets/js/form.js b/app/bundles/FormBundle/Assets/js/form.js
index c3efdf89a59..84ef7558c1f 100644
--- a/app/bundles/FormBundle/Assets/js/form.js
+++ b/app/bundles/FormBundle/Assets/js/form.js
@@ -40,6 +40,14 @@ Mautic.formOnLoad = function (container) {
             }
         });
 
+        mQuery('#available_fields').change(function (e) {
+            mQuery(this).find('option:selected');
+            Mautic.ajaxifyModal(mQuery(this).find('option:selected'));
+            // Reset the dropdown
+            mQuery(this).val('');
+            mQuery(this).trigger('chosen:updated');
+        });
+
         Mautic.initFormFieldButtons();
     }
 
@@ -189,7 +197,6 @@ Mautic.formFieldOnLoad = function (container, response) {
         //initialize ajax'd modals
         mQuery(fieldContainer).find("[data-toggle='ajaxmodal']").on('click.ajaxmodal', function (event) {
             event.preventDefault();
-            console.log(this);
             Mautic.ajaxifyModal(this, event);
         });
 
diff --git a/app/bundles/FormBundle/Config/config.php b/app/bundles/FormBundle/Config/config.php
index 3dd8fd90cf1..170ae3c8322 100644
--- a/app/bundles/FormBundle/Config/config.php
+++ b/app/bundles/FormBundle/Config/config.php
@@ -167,7 +167,10 @@
                 ],
             ],
             'mautic.form.webhook.subscriber' => [
-                'class' => 'Mautic\FormBundle\EventListener\WebhookSubscriber',
+                'class'       => 'Mautic\FormBundle\EventListener\WebhookSubscriber',
+                'methodCalls' => [
+                    'setWebhookModel' => ['mautic.webhook.model.webhook'],
+                ],
             ],
             'mautic.form.dashboard.subscriber' => [
                 'class'     => 'Mautic\FormBundle\EventListener\DashboardSubscriber',
@@ -205,6 +208,10 @@
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldTextType',
                 'alias' => 'formfield_text',
             ],
+            'mautic.form.type.field_propertyhtml' => [
+                'class' => 'Mautic\FormBundle\Form\Type\FormFieldHTMLType',
+                'alias' => 'formfield_html',
+            ],
             'mautic.form.type.field_propertyplaceholder' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldPlaceholderType',
                 'alias' => 'formfield_placeholder',
diff --git a/app/bundles/FormBundle/Entity/SubmissionRepository.php b/app/bundles/FormBundle/Entity/SubmissionRepository.php
index 1a97cd51091..2cfed2a4809 100644
--- a/app/bundles/FormBundle/Entity/SubmissionRepository.php
+++ b/app/bundles/FormBundle/Entity/SubmissionRepository.php
@@ -50,7 +50,7 @@ public function getEntities($args = [])
 
         //DBAL
         if (!isset($args['viewOnlyFields'])) {
-            $args['viewOnlyFields'] = ['button', 'freetext', 'pagebreak', 'captcha'];
+            $args['viewOnlyFields'] = ['button', 'freetext',  'freehtml', 'pagebreak', 'captcha'];
         }
         $viewOnlyFields = array_map(function ($value) {
             return '"'.$value.'"';
diff --git a/app/bundles/FormBundle/EventListener/ReportSubscriber.php b/app/bundles/FormBundle/EventListener/ReportSubscriber.php
index bafba687735..3f040cacc72 100644
--- a/app/bundles/FormBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/ReportSubscriber.php
@@ -51,8 +51,13 @@ public function onReportBuilder(ReportBuilderEvent $event)
                     'type'  => 'string',
                 ],
             ];
-            $columns = array_merge($columns, $event->getStandardColumns($prefix, [], 'mautic_form_action'), $event->getCategoryColumns());
-            $data    = [
+            $columns = array_merge(
+                $columns,
+                $event->getStandardColumns($prefix, [], 'mautic_form_action'),
+                $event->getCategoryColumns(),
+                $event->getCampaignByChannelColumns()
+            );
+            $data = [
                 'display_name' => 'mautic.form.forms',
                 'columns'      => $columns,
             ];
@@ -109,6 +114,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
             case 'forms':
                 $qb->from(MAUTIC_TABLE_PREFIX.'forms', 'f');
                 $event->addCategoryLeftJoin($qb, 'f');
+                $event->addCampaignByChannelJoin($qb, 'f', 'form');
                 break;
             case 'form.submissions':
                 $event->applyDateFilters($qb, 'date_submitted', 'fs');
@@ -119,6 +125,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                 $event->addCategoryLeftJoin($qb, 'f');
                 $event->addLeadLeftJoin($qb, 'fs');
                 $event->addIpAddressLeftJoin($qb, 'fs');
+                $event->addCampaignByChannelJoin($qb, 'f', 'form');
                 break;
         }
 
diff --git a/app/bundles/FormBundle/EventListener/WebhookSubscriber.php b/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
index 332d9b03bc0..e38486ed8ca 100644
--- a/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
@@ -12,8 +12,10 @@
 namespace Mautic\FormBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\FormBundle\Event\SubmissionEvent;
 use Mautic\FormBundle\FormEvents;
 use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\EventListener\WebhookModelTrait;
 use Mautic\WebhookBundle\WebhookEvents;
 
 /**
@@ -21,6 +23,8 @@
  */
 class WebhookSubscriber extends CommonSubscriber
 {
+    use WebhookModelTrait;
+
     /**
      * @return array
      */
@@ -28,6 +32,7 @@ public static function getSubscribedEvents()
     {
         return [
             WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+            FormEvents::FORM_ON_SUBMIT      => ['onFormSubmit', 0],
         ];
     }
 
@@ -47,4 +52,24 @@ public function onWebhookBuild(WebhookBuilderEvent $event)
         // add it to the list
         $event->addEvent(FormEvents::FORM_ON_SUBMIT, $formSubmit);
     }
+
+    /**
+     * @param SubmissionEvent $event
+     */
+    public function onFormSubmit(SubmissionEvent $event)
+    {
+        $this->webhookModel->queueWebhooksByType(
+            FormEvents::FORM_ON_SUBMIT,
+            [
+                'submission' => $event->getSubmission(),
+            ],
+            [
+                'submissionDetails',
+                'ipAddress',
+                'leadList',
+                'pageList',
+                'formList',
+            ]
+        );
+    }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FieldType.php b/app/bundles/FormBundle/Form/Type/FieldType.php
index 4c1a00b95bf..94dcbfc2128 100644
--- a/app/bundles/FormBundle/Form/Type/FieldType.php
+++ b/app/bundles/FormBundle/Form/Type/FieldType.php
@@ -95,6 +95,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $inputAttributesText = 'mautic.form.field.form.freetext_attributes';
                     $labelAttributesText = 'mautic.form.field.form.header_attributes';
 
+                    // Allow html
+                    $cleanMasks['properties'] = 'html';
+                    break;
+                case 'freehtml':
+                    $addHelpMessage      = $addDefaultValue      = $addIsRequired      = $addLeadFieldList      = $addSaveResult      = $addBehaviorFields      = false;
+                    $labelText           = 'mautic.form.field.form.header';
+                    $showLabelText       = 'mautic.form.field.form.showheader';
+                    $inputAttributesText = 'mautic.form.field.form.freehtml_attributes';
+                    $labelAttributesText = 'mautic.form.field.form.header_attributes';
                     // Allow html
                     $cleanMasks['properties'] = 'html';
                     break;
@@ -449,6 +458,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         ]
                     );
                     break;
+                case 'freehtml':
+                    $builder->add(
+                        'properties',
+                        'formfield_html',
+                        [
+                            'required' => false,
+                            'label'    => false,
+                            'editor'   => true,
+                            'data'     => $propertiesData,
+                        ]
+                    );
+                    break;
                 case 'date':
                 case 'email':
                 case 'number':
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldHTMLType.php b/app/bundles/FormBundle/Form/Type/FormFieldHTMLType.php
new file mode 100644
index 00000000000..c005ccf59e4
--- /dev/null
+++ b/app/bundles/FormBundle/Form/Type/FormFieldHTMLType.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\FormBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Class FormFieldHTMLType.
+ */
+class FormFieldHTMLType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('text', 'textarea', [
+            'label'      => 'mautic.form.field.type.freehtml',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control', 'style' => 'min-height:150px'],
+            'required'   => true,
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'editor' => false,
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'formfield_html';
+    }
+}
diff --git a/app/bundles/FormBundle/Helper/FormFieldHelper.php b/app/bundles/FormBundle/Helper/FormFieldHelper.php
index 8a2e60dc1a2..683eb6d1bb1 100644
--- a/app/bundles/FormBundle/Helper/FormFieldHelper.php
+++ b/app/bundles/FormBundle/Helper/FormFieldHelper.php
@@ -49,6 +49,7 @@ class FormFieldHelper extends AbstractFormFieldHelper
         'checkboxgrp' => [],
         'country'     => [],
         'date'        => [],
+        'datetime'    => [],
         'email'       => [
             'filter'      => 'email',
             'constraints' => [
@@ -56,6 +57,7 @@ class FormFieldHelper extends AbstractFormFieldHelper
             ],
         ],
         'freetext' => [],
+        'freehtml' => [],
         'hidden'   => [],
         'number'   => [
             'filter' => 'float',
diff --git a/app/bundles/FormBundle/Model/FormModel.php b/app/bundles/FormBundle/Model/FormModel.php
index 78b561d3cc8..388da65e3c0 100644
--- a/app/bundles/FormBundle/Model/FormModel.php
+++ b/app/bundles/FormBundle/Model/FormModel.php
@@ -417,6 +417,26 @@ public function getContent(Form $form, $withScript = true, $useCache = true)
         return $cachedHtml;
     }
 
+    /**
+     * Get results for a form and lead.
+     *
+     * @param Form $form
+     * @param int  $leadId
+     * @param int  $limit
+     *
+     * @return array
+     */
+    public function getLeadSubmissions(Form $form, $leadId, $limit = 200)
+    {
+        return $this->getRepository()->getFormResults(
+            $form,
+            [
+                'leadId' => $leadId,
+                'limit'  => $limit,
+            ]
+        );
+    }
+
     /**
      * Generate the form's html.
      *
@@ -438,13 +458,7 @@ public function generateHtml(Form $entity, $persist = true)
         }
 
         if ($entity->usesProgressiveProfiling()) {
-            $submissions = $this->getRepository()->getFormResults(
-                $entity,
-                [
-                    'leadId' => $lead->getId(),
-                    'limit'  => 200,
-                ]
-            );
+            $submissions = $this->getLeadSubmissions($entity, $lead->getId());
         }
 
         if ($entity->getRenderStyle()) {
@@ -654,7 +668,7 @@ public function getCustomComponents()
             $customComponents['validators'] = $event->getValidators();
 
             // Generate a list of fields that are not persisted to the database by default
-            $notPersist = ['button', 'captcha', 'freetext', 'pagebreak'];
+            $notPersist = ['button', 'captcha', 'freetext', 'freehtml', 'pagebreak'];
             foreach ($customComponents['fields'] as $type => $field) {
                 if (isset($field['builderOptions']) && isset($field['builderOptions']['addSaveResult']) && false === $field['builderOptions']['addSaveResult']) {
                     $notPersist[] = $type;
diff --git a/app/bundles/FormBundle/Model/SubmissionModel.php b/app/bundles/FormBundle/Model/SubmissionModel.php
index 21ae3394fdc..88d8cccd982 100644
--- a/app/bundles/FormBundle/Model/SubmissionModel.php
+++ b/app/bundles/FormBundle/Model/SubmissionModel.php
@@ -324,11 +324,6 @@ public function saveSubmission($post, $server, Form $form, Request $request = nu
         // @deprecated - BC support; to be removed in 3.0 - be sure to remove the validator option from addSubmitAction as well
         $this->validateActionCallbacks($submissionEvent, $validationErrors, $alias);
 
-        //return errors if there any - this should be moved to right after foreach($fields) once validateActionCallbacks support is dropped
-        if (!empty($validationErrors)) {
-            return ['errors' => $validationErrors];
-        }
-
         // Create/update lead
         if (!empty($leadFieldMatches)) {
             $lead = $this->createLeadFromSubmit($form, $leadFieldMatches, $leadFields);
@@ -346,6 +341,22 @@ public function saveSubmission($post, $server, Form $form, Request $request = nu
         }
         $submission->setLead($lead);
 
+        // Remove validation errors if the field is not visible
+        if ($form->usesProgressiveProfiling()) {
+            $leadSubmissions = $this->formModel->getLeadSubmissions($form, $lead->getId());
+
+            foreach ($fields as $field) {
+                if (isset($validationErrors[$field->getAlias()]) && !$field->showForContact($leadSubmissions, $lead, $form)) {
+                    unset($validationErrors[$field->getAlias()]);
+                }
+            }
+        }
+
+        //return errors if there any
+        if (!empty($validationErrors)) {
+            return ['errors' => $validationErrors];
+        }
+
         // Save the submission
         $this->saveEntity($submission);
 
@@ -791,8 +802,6 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
         $getData = function ($currentFields, $uniqueOnly = false) use ($leadFields, $uniqueLeadFields) {
             $uniqueFieldsWithData = $data = [];
             foreach ($leadFields as $alias => $properties) {
-                $data[$alias] = '';
-
                 if (isset($currentFields[$alias])) {
                     $value        = $currentFields[$alias];
                     $data[$alias] = $value;
diff --git a/app/bundles/FormBundle/Translations/en_US/messages.ini b/app/bundles/FormBundle/Translations/en_US/messages.ini
index dd876aef062..0fba3d62341 100644
--- a/app/bundles/FormBundle/Translations/en_US/messages.ini
+++ b/app/bundles/FormBundle/Translations/en_US/messages.ini
@@ -52,6 +52,7 @@ mautic.form.field.form.container_attr="Field container attributes"
 mautic.form.field.form.value="Value"
 mautic.form.field.form.emptyvalue="Empty Value"
 mautic.form.field.form.freetext_attributes="Description text attributes"
+mautic.form.field.form.freehtml_attributes="HTML text attributes"
 mautic.form.field.form.header="Header"
 mautic.form.field.form.header_attributes="Header attributes"
 mautic.form.field.form.helpmessage="Help message"
@@ -93,6 +94,7 @@ mautic.form.field.type.button="Button"
 mautic.form.field.type.captcha="Captcha"
 mautic.form.field.type.checkboxgrp="Checkbox group"
 mautic.form.field.type.freetext="Description area"
+mautic.form.field.type.freehtml="HTML area"
 mautic.form.field.type.hidden="Hidden"
 mautic.form.field.type.password="Password"
 mautic.form.field.type.pagebreak="Page break"
diff --git a/app/bundles/FormBundle/Views/Builder/index.html.php b/app/bundles/FormBundle/Views/Builder/index.html.php
index 054de6b001a..b6e5d63e0ec 100644
--- a/app/bundles/FormBundle/Views/Builder/index.html.php
+++ b/app/bundles/FormBundle/Views/Builder/index.html.php
@@ -61,27 +61,28 @@
                     <div class="tab-pane fade bdr-w-0" id="fields-container">
                         <?php echo $view->render('MauticFormBundle:Builder:style.html.php'); ?>
                         <div id="mauticforms_fields">
-                            <div class="available-fields mb-md">
-                                <p><?php echo $view['translator']->trans('mautic.form.form.addfield'); ?></p>
-                                <div class="dropdown">
-                                    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
-                                        <?php echo $view['translator']->trans('mautic.form.field.add'); ?>
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu" role="menu">
-                                        <?php foreach ($fields as $fieldType => $field): ?>
-                                            <li id="field_<?php echo $fieldType; ?>">
-                                                <a class="list-group-item" data-toggle="ajaxmodal" data-target="#formComponentModal" href="<?php echo $view['router']->path(
-                                                    'mautic_formfield_action',
-                                                    ['objectAction' => 'new', 'type' => $fieldType, 'tmpl' => 'field', 'formId' => $formId]
-                                                ); ?>">
-                                                    <div>
-                                                        <?php echo $field; ?>
-                                                    </div>
-                                                </a>
-                                            </li>
-                                        <?php endforeach; ?>
-                                    </ul>
+                            <div class="row">
+                                <div class="available-fields mb-md col-sm-8">
+                                            <p><?php echo $view['translator']->trans('mautic.form.form.addfield'); ?></p>
+                                            <select class="chosen form-control" id="available_fields">
+                                                <option value=""></option>
+                                                <?php foreach ($fields as $fieldType => $field): ?>
+
+                                                    <option class="list-group-item" data-toggle="ajaxmodal"
+                                                            data-target="#formComponentModal"
+                                                            data-href="<?php echo $view['router']->path(
+                                                                'mautic_formfield_action',
+                                                                [
+                                                                    'objectAction' => 'new',
+                                                                    'type'         => $fieldType,
+                                                                    'tmpl'         => 'field',
+                                                                    'formId'       => $formId,
+                                                                ]
+                                                            ); ?>">     <?php echo $field; ?></option>
+
+                                                <?php endforeach; ?>
+
+                                            </select>
                                 </div>
                             </div>
                             <div class="drop-here">
diff --git a/app/bundles/FormBundle/Views/Builder/script.html.php b/app/bundles/FormBundle/Views/Builder/script.html.php
index 099ff5828b6..218c8c0e699 100644
--- a/app/bundles/FormBundle/Views/Builder/script.html.php
+++ b/app/bundles/FormBundle/Views/Builder/script.html.php
@@ -8,6 +8,9 @@
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
+$scriptSrc = $view['assets']->getUrl('media/js/'.($app->getEnvironment() == 'dev' ? 'mautic-form-src.js' : 'mautic-form.js'), null, null, true);
+$scriptSrc = str_replace('/index_dev.php', '', $scriptSrc);
 ?>
 
 <script type="text/javascript">
@@ -18,12 +21,12 @@
         var head            = document.getElementsByTagName('head')[0];
         var script          = document.createElement('script');
         script.type         = 'text/javascript';
-        script.src          = '<?php echo $view['assets']->getUrl('media/js/'.($app->getEnvironment() == 'dev' ? 'mautic-form-src.js' : 'mautic-form.js'), null, null, true); ?>';
+        script.src          = '<?php echo $scriptSrc; ?>';
         script.onload       = function() {
             MauticSDK.onLoad();
         };
         head.appendChild(script);
-        var MauticDomain = '<?php echo $view['assets']->getBaseUrl(); ?>';
+        var MauticDomain = '<?php echo str_replace('/index_dev.php', '', $view['assets']->getBaseUrl()); ?>';
         var MauticLang   = {
             'submittingMessage': "<?php echo $view['translator']->trans('mautic.form.submission.pleasewait'); ?>"
         }
diff --git a/app/bundles/FormBundle/Views/Field/datetime.html.php b/app/bundles/FormBundle/Views/Field/datetime.html.php
new file mode 100644
index 00000000000..a30d0daa07f
--- /dev/null
+++ b/app/bundles/FormBundle/Views/Field/datetime.html.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+echo $view->render(
+    'MauticFormBundle:Field:text.html.php',
+    [
+        'field'    => $field,
+        'inForm'   => (isset($inForm)) ? $inForm : false,
+        'type'     => 'datetime-local',
+        'id'       => $id,
+        'formId'   => (isset($formId)) ? $formId : 0,
+        'formName' => (isset($formName)) ? $formName : '',
+    ]
+);
diff --git a/app/bundles/FormBundle/Views/Field/freehtml.html.php b/app/bundles/FormBundle/Views/Field/freehtml.html.php
new file mode 100644
index 00000000000..284c16aa465
--- /dev/null
+++ b/app/bundles/FormBundle/Views/Field/freehtml.html.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$defaultInputClass = $containerType = 'freehtml';
+include __DIR__.'/field_helper.php';
+
+$label = (!$field['showLabel']) ? '' :
+    <<<HTML
+    
+                <h3 $labelAttr>
+                    {$field['label']}
+                </h3>
+HTML;
+
+$html = <<<HTML
+
+            <div $containerAttr>{$label}
+                <div $inputAttr>
+                    {$properties['text']}
+                </div>
+            </div>
+
+HTML;
+
+echo $html;
diff --git a/app/bundles/InstallBundle/Controller/InstallController.php b/app/bundles/InstallBundle/Controller/InstallController.php
index f263255d0a5..1db5dd00ddf 100644
--- a/app/bundles/InstallBundle/Controller/InstallController.php
+++ b/app/bundles/InstallBundle/Controller/InstallController.php
@@ -100,6 +100,10 @@ public function stepAction($index = 0)
 
                         break;
                     case self::DOCTRINE_STEP:
+                        // password field does not retain configured defaults
+                        if (empty($formData->password) && !empty($params['db_password'])) {
+                            $formData->password = $params['db_password'];
+                        }
                         $dbParams = (array) $formData;
                         $this->validateDatabaseParams($form, $dbParams);
                         if (!$form->getErrors(true)->count()) {
diff --git a/app/bundles/LeadBundle/Assets/css/lead.css b/app/bundles/LeadBundle/Assets/css/lead.css
index 3bb5c4936ed..76444b89288 100644
--- a/app/bundles/LeadBundle/Assets/css/lead.css
+++ b/app/bundles/LeadBundle/Assets/css/lead.css
@@ -233,4 +233,14 @@ ul.tag-cloud li {
 }
 .panel-companies .primary {
     color: #fdb933;
+}
+.building::before {
+    content: "\f1ad";
+    font-family: "FontAwesome";
+    padding-right: 3px;
+}
+.user::before {
+    content: "\f007";
+    font-family: "FontAwesome";
+    padding-right: 3px;
 }
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Assets/js/lead.js b/app/bundles/LeadBundle/Assets/js/lead.js
index 0838dba7127..c120e1bf3ad 100644
--- a/app/bundles/LeadBundle/Assets/js/lead.js
+++ b/app/bundles/LeadBundle/Assets/js/lead.js
@@ -242,13 +242,20 @@ Mautic.leadlistOnLoad = function(container) {
 };
 
 Mautic.convertLeadFilterInput = function(el) {
+    var prefix = 'leadlist';
+
+    var parent = mQuery(el).parents('.dynamic-content-filter');
+    if (parent) {
+        prefix = parent.attr('id');
+    }
+
     var operator = mQuery(el).val();
 
     // Extract the filter number
-    var regExp    = /leadlist_filters_(\d+)_operator/;
+    var regExp    = /_filters_(\d+)_operator/;
     var matches   = regExp.exec(mQuery(el).attr('id'));
     var filterNum = matches[1];
-    var filterId  = '#leadlist_filters_' + filterNum + '_filter';
+    var filterId  = '#' + prefix + '_filters_' + filterNum + '_filter';
 
     // Reset has-error
     if (mQuery(filterId).parent().hasClass('has-error')) {
@@ -257,7 +264,7 @@ Mautic.convertLeadFilterInput = function(el) {
     }
 
     var disabled = (operator == 'empty' || operator == '!empty');
-    mQuery(filterId).prop('disabled', disabled);
+    mQuery(filterId+', #' + prefix + '_filters_' + filterNum + '_display').prop('disabled', disabled);
 
     if (disabled) {
         mQuery(filterId).val('');
@@ -314,6 +321,19 @@ Mautic.convertLeadFilterInput = function(el) {
     }
 };
 
+Mautic.updateLookupListFilter = function(field, datum) {
+    if (datum && datum.id) {
+        var filterField = '#'+field.replace('_display', '_filter');
+        mQuery(filterField).val(datum.id);
+    }
+};
+
+Mautic.activateSegmentFilterTypeahead = function(displayId, filterId, fieldOptions) {
+    mQuery('#' + displayId).attr('data-lookup-callback', 'updateLookupListFilter');
+
+    Mautic.activateFieldTypeahead(displayId, filterId, [], 'lead:fieldList')
+};
+
 Mautic.addLeadListFilter = function (elId) {
     var filterId = '#available_' + elId;
     var label    = mQuery(filterId).text();
@@ -326,7 +346,7 @@ Mautic.addLeadListFilter = function (elId) {
     var prototype = mQuery('.available-filters').data('prototype');
     var fieldType = mQuery(filterId).data('field-type');
     var fieldObject = mQuery(filterId).data('field-object');
-    var isSpecial = (mQuery.inArray(fieldType, ['leadlist', 'lead_email_received', 'tags', 'multiselect', 'boolean', 'select', 'country', 'timezone', 'region', 'stage', 'locale', 'globalcategory']) != -1);
+    var isSpecial = (mQuery.inArray(fieldType, ['leadlist', 'lead_email_received', 'lead_email_sent', 'tags', 'multiselect', 'boolean', 'select', 'country', 'timezone', 'region', 'stage', 'locale', 'globalcategory']) != -1);
 
     prototype = prototype.replace(/__name__/g, filterNum);
     prototype = prototype.replace(/__label__/g, label);
diff --git a/app/bundles/LeadBundle/Config/config.php b/app/bundles/LeadBundle/Config/config.php
index bf317254240..def83d40db8 100644
--- a/app/bundles/LeadBundle/Config/config.php
+++ b/app/bundles/LeadBundle/Config/config.php
@@ -333,7 +333,10 @@
                 ],
             ],
             'mautic.webhook.subscriber' => [
-                'class' => 'Mautic\LeadBundle\EventListener\WebhookSubscriber',
+                'class'       => 'Mautic\LeadBundle\EventListener\WebhookSubscriber',
+                'methodCalls' => [
+                    'setWebhookModel' => ['mautic.webhook.model.webhook'],
+                ],
             ],
             'mautic.lead.dashboard.subscriber' => [
                 'class'     => 'Mautic\LeadBundle\EventListener\DashboardSubscriber',
@@ -366,8 +369,17 @@
             ],
             'mautic.form.type.leadlist' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\ListType',
-                'arguments' => ['translator', 'mautic.lead.model.list', 'mautic.email.model.email', 'mautic.security', 'mautic.lead.model.lead', 'mautic.stage.model.stage', 'mautic.category.model.category'],
-                'alias'     => 'leadlist',
+                'arguments' => [
+                    'translator',
+                    'mautic.lead.model.list',
+                    'mautic.email.model.email',
+                    'mautic.security',
+                    'mautic.lead.model.lead',
+                    'mautic.stage.model.stage',
+                    'mautic.category.model.category',
+                    'mautic.helper.user',
+                ],
+                'alias' => 'leadlist',
             ],
             'mautic.form.type.leadlist_choices' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\LeadListType',
diff --git a/app/bundles/LeadBundle/Controller/AjaxController.php b/app/bundles/LeadBundle/Controller/AjaxController.php
index 532e3fb8a49..222da41a332 100644
--- a/app/bundles/LeadBundle/Controller/AjaxController.php
+++ b/app/bundles/LeadBundle/Controller/AjaxController.php
@@ -120,7 +120,7 @@ protected function fieldListAction(Request $request)
                             'id'    => $r['id'],
                         ];
                     }
-                } elseif ($leadField == 'hit_url') {
+                } elseif (in_array($leadField, ['hit_url', 'referer', 'url_title', 'source'])) {
                     $dataArray[] = [
                         'value' => '',
                     ];
diff --git a/app/bundles/LeadBundle/Controller/Api/FieldApiController.php b/app/bundles/LeadBundle/Controller/Api/FieldApiController.php
index 0f5747be94c..62b2dd1c285 100644
--- a/app/bundles/LeadBundle/Controller/Api/FieldApiController.php
+++ b/app/bundles/LeadBundle/Controller/Api/FieldApiController.php
@@ -56,6 +56,10 @@ public function initialize(FilterControllerEvent $event)
     protected function prepareParametersForBinding($parameters, $entity, $action)
     {
         $parameters['object'] = $this->fieldObject;
+        // Workaround for mispelled isUniqueIdentifer.
+        if (isset($parameters['isUniqueIdentifier'])) {
+            $parameters['isUniqueIdentifer'] = $parameters['isUniqueIdentifier'];
+        }
 
         return $parameters;
     }
diff --git a/app/bundles/LeadBundle/Controller/Api/LeadApiController.php b/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
index 02e98281123..73a3d416625 100644
--- a/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
+++ b/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
@@ -48,9 +48,39 @@ public function initialize(FilterControllerEvent $event)
      */
     public function newEntityAction()
     {
-        // Check for an email to see if the lead already exists
-        $parameters = $this->request->request->all();
+        $existingLeads = $this->getExistingLeads();
+        if (!empty($existingLeads)) {
+            return parent::editEntityAction($existingLeads[0]->getId());
+        }
+
+        return parent::newEntityAction();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function editEntityAction($id)
+    {
+        $existingLeads = $this->getExistingLeads();
+        if (isset($existingLeads[0]) && $existingLeads[0] instanceof Lead) {
+            $entity = $this->model->getEntity($id);
+            if ($entity instanceof Lead && $existingLeads[0]->getId() != $entity->getId()) {
+                $this->model->mergeLeads($existingLeads[0], $entity, false);
+            }
+        }
 
+        return parent::editEntityAction($id);
+    }
+
+    /**
+     * Get existing duplicated contacts based on unique fields and the request data.
+     *
+     * @return array
+     */
+    protected function getExistingLeads()
+    {
+        // Check for an email to see if the lead already exists
+        $parameters          = $this->request->request->all();
         $uniqueLeadFields    = $this->getModel('lead.field')->getUniqueIdentiferFields();
         $uniqueLeadFieldData = [];
 
@@ -61,18 +91,12 @@ public function newEntityAction()
         }
 
         if (count($uniqueLeadFieldData)) {
-            if (count($uniqueLeadFieldData)) {
-                $existingLeads = $this->get('doctrine.orm.entity_manager')->getRepository('MauticLeadBundle:Lead')->getLeadsByUniqueFields($uniqueLeadFieldData);
-
-                if (!empty($existingLeads)) {
-                    // Lead found so edit rather than create a new one
-
-                    return $this->editEntityAction($existingLeads[0]->getId());
-                }
-            }
+            return $this->get('doctrine.orm.entity_manager')->getRepository(
+                'MauticLeadBundle:Lead'
+            )->getLeadsByUniqueFields($uniqueLeadFieldData, null, 1);
         }
 
-        return parent::newEntityAction();
+        return [];
     }
 
     /**
diff --git a/app/bundles/LeadBundle/Controller/EntityContactsTrait.php b/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
index 091f1e8ed0c..123ca3e9675 100644
--- a/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
+++ b/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
@@ -52,10 +52,9 @@ protected function generateContactsGrid(
         }
 
         // Set the route if not standardized
-        if (method_exists($this, 'getRouteBase')) {
+        $route = "mautic_{$sessionVar}_contacts";
+        if (method_exists($this, 'getRouteBase') && $this->getRouteBase()) {
             $route = 'mautic_'.$this->getRouteBase().'_contacts';
-        } else {
-            $route = "mautic_{$sessionVar}_contacts";
         }
 
         // Apply filters
diff --git a/app/bundles/LeadBundle/Controller/LeadController.php b/app/bundles/LeadBundle/Controller/LeadController.php
index d361e8ee2b5..33860462aec 100644
--- a/app/bundles/LeadBundle/Controller/LeadController.php
+++ b/app/bundles/LeadBundle/Controller/LeadController.php
@@ -13,6 +13,7 @@
 
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\EmojiHelper;
+use Mautic\CoreBundle\Model\IteratorExportDataModel;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -197,8 +198,8 @@ public function indexAction($page = 1)
         );
     }
 
-    /*
-     * Quick form controller route and view
+    /**
+     * @return JsonResponse|Response
      */
     public function quickAddAction()
     {
@@ -2308,8 +2309,8 @@ public function batchExportAction()
             return $contact->getProfileFields();
         };
 
-        $toExport = $this->getDataForExport($model, $args, $resultsCallback);
+        $iterator = new IteratorExportDataModel($model, $args, $resultsCallback);
 
-        return $this->exportResultsAs($toExport, $dataType, 'contacts');
+        return $this->exportResultsAs($iterator, $dataType, 'contacts');
     }
 }
diff --git a/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php b/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
index 78285e02fd9..e2b56d9a817 100644
--- a/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
+++ b/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
@@ -233,6 +233,11 @@ protected function getScheduledCampaignEvents(Lead $lead)
         /** @var \Mautic\CampaignBundle\Entity\LeadEventLogRepository $leadEventLogRepository */
         $leadEventLogRepository = $this->getDoctrine()->getManager()->getRepository('MauticCampaignBundle:LeadEventLog');
 
-        return $leadEventLogRepository->getUpcomingEvents(['lead' => $lead, 'eventType' => 'action']);
+        return $leadEventLogRepository->getUpcomingEvents(
+            [
+                'lead'      => $lead,
+                'eventType' => ['action', 'condition'],
+            ]
+        );
     }
 }
diff --git a/app/bundles/LeadBundle/Controller/ListController.php b/app/bundles/LeadBundle/Controller/ListController.php
index 4b55a8d4533..a105e0dcc07 100644
--- a/app/bundles/LeadBundle/Controller/ListController.php
+++ b/app/bundles/LeadBundle/Controller/ListController.php
@@ -163,6 +163,7 @@ public function newAction()
         //set the return URL for post actions
         $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $page]);
         $action    = $this->generateUrl('mautic_segment_action', ['objectAction' => 'new']);
+
         //get the user form factory
         $form = $model->createForm($list, $this->get('form.factory'),  $action);
 
diff --git a/app/bundles/LeadBundle/Entity/DoNotContactRepository.php b/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
index e6c037a987c..6bee3109bd1 100644
--- a/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
+++ b/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
@@ -75,6 +75,12 @@ public function getCount($channel = null, $ids = null, $reason = null, $listId =
             if (true === $listId) {
                 $q->addSelect('cs.leadlist_id')
                     ->groupBy('cs.leadlist_id');
+            } elseif (is_array($listId)) {
+                $q->andWhere(
+                    $q->expr()->in('cs.leadlist_id', array_map('intval', $listId))
+                )
+                    ->addSelect('cs.leadlist_id')
+                    ->groupBy('cs.leadlist_id');
             } else {
                 $q->andWhere('cs.leadlist_id = :list_id')
                     ->setParameter('list_id', $listId);
@@ -87,7 +93,7 @@ public function getCount($channel = null, $ids = null, $reason = null, $listId =
 
         $results = $q->execute()->fetchAll();
 
-        if (true === $listId) {
+        if (true === $listId || is_array($listId)) {
             // Return list group of counts
             $byList = [];
             foreach ($results as $result) {
diff --git a/app/bundles/LeadBundle/Entity/Lead.php b/app/bundles/LeadBundle/Entity/Lead.php
index cfc30dcc148..f0817d93788 100644
--- a/app/bundles/LeadBundle/Entity/Lead.php
+++ b/app/bundles/LeadBundle/Entity/Lead.php
@@ -947,25 +947,37 @@ public function addCompanyChangeLog(CompanyChangeLog $companyChangeLog)
     }
 
     /**
-     * @param string $identifier
+     * @param      $identifier
+     * @param bool $enabled
+     * @param bool $mobile
      *
      * @return $this
      */
-    public function addPushIDEntry($identifier)
+    public function addPushIDEntry($identifier, $enabled = true, $mobile = false)
     {
+        $entity = new PushID();
+
         /** @var PushID $id */
         foreach ($this->pushIds as $id) {
             if ($id->getPushID() === $identifier) {
-                return $this;
+                if ($id->isEnabled() === $enabled) {
+                    return $this;
+                } else {
+                    $entity = $id;
+                    $this->removePushID($id);
+                }
             }
         }
 
-        $entity = new PushID();
         $entity->setPushID($identifier);
         $entity->setLead($this);
+        $entity->setEnabled($enabled);
+        $entity->setMobile($mobile);
 
         $this->addPushID($entity);
 
+        $this->isChanged('pushIds', $this->pushIds);
+
         return $this;
     }
 
diff --git a/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php b/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
index 760c50e9443..c79a50f59e5 100644
--- a/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
@@ -98,4 +98,30 @@ public function getDevice($lead, $deviceName = null, $deviceBrand = null, $devic
 
         return (!empty($device)) ? $device[0] : [];
     }
+
+    /**
+     * @param string $fingerprint
+     *
+     * @return LeadDevice
+     */
+    public function getDeviceByFingerprint($fingerprint)
+    {
+        if (!$fingerprint) {
+            return null;
+        }
+
+        $sq = $this->_em->getConnection()->createQueryBuilder();
+        $sq->select('es.id as id, es.lead_id as lead_id')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_devices', 'es');
+
+        $sq->where(
+            $sq->expr()->eq('es.device_fingerprint', ':fingerprint')
+        )
+            ->setParameter('fingerprint', $fingerprint);
+
+        //get the first match
+        $device = $sq->execute()->fetch();
+
+        return $device ? $device : null;
+    }
 }
diff --git a/app/bundles/LeadBundle/Entity/LeadListRepository.php b/app/bundles/LeadBundle/Entity/LeadListRepository.php
index 6d1e427b3e5..262345e2cc3 100644
--- a/app/bundles/LeadBundle/Entity/LeadListRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadListRepository.php
@@ -317,8 +317,9 @@ public function getLeadsByList($lists, $args = [])
 
                 if ($includesContactFields) {
                     $expr = $this->getListFilterExpr($objectFilters['lead'], $parameters, $q, false, null, 'lead');
-                } else {
-                    $expr = $q->expr()->andX();
+                }
+                if (empty($expr) || !$expr->count()) {
+                    $nonMembersOnly = true;
                 }
                 if ($includesCompanyFields) {
                     $this->listFiltersInnerJoinCompany = false;
@@ -375,7 +376,7 @@ public function getLeadsByList($lists, $args = [])
                     }
                 }
 
-                if ($newOnly) {
+                if ($newOnly && !empty($expr) && $expr->count()) {
                     if ($includesCompanyFields) {
                         $this->applyCompanyFieldFilters($q, $exprCompany);
                     }
@@ -401,6 +402,7 @@ public function getLeadsByList($lists, $args = [])
                         'll',
                         $listOnExpr
                     );
+
                     $expr->add($q->expr()->isNull('ll.lead_id'));
 
                     if ($batchExpr->count()) {
@@ -433,8 +435,7 @@ public function getLeadsByList($lists, $args = [])
                     $sq = $this->getEntityManager()->getConnection()->createQueryBuilder();
                     $sq->select('l.id')
                         ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
-
-                    if ($includesContactFields) {
+                    if ($includesContactFields && !empty($expr) && $expr->count()) {
                         $sq->andWhere($expr);
                     }
 
@@ -449,8 +450,9 @@ public function getLeadsByList($lists, $args = [])
                     if ($batchExpr->count()) {
                         $mainExpr->add($batchExpr);
                     }
-
-                    $q->andWhere($mainExpr);
+                    if (!empty($mainExpr) && $mainExpr->count() > 0) {
+                        $q->andWhere($mainExpr);
+                    }
                 }
 
                 // Set limits if applied
@@ -509,8 +511,9 @@ public function getLeadsByList($lists, $args = [])
                     $q->setFirstResult($start)
                         ->setMaxResults($limit);
                 }
-
-                $q->where($expr);
+                if (!empty($expr) && $expr->count() > 0) {
+                    $q->where($expr);
+                }
 
                 $results = $q->execute()->fetchAll();
 
@@ -672,7 +675,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
             if ($details['type'] == 'datetime' || $details['type'] == 'date') {
                 $relativeDateStrings = $this->getRelativeDateStrings();
                 // Check if the column type is a date/time stamp
-                $isTimestamp = ($columnType instanceof UTCDateTimeType || $details['type'] == 'datetime');
+                $isTimestamp = ($details['type'] == 'datetime' || $columnType instanceof UTCDateTimeType);
                 $getDate     = function (&$string) use ($isTimestamp, $relativeDateStrings, &$details, &$func, $not) {
                     $key             = array_search($string, $relativeDateStrings);
                     $dtHelper        = new DateTimeHelper('midnight today', null, 'local');
@@ -859,8 +862,15 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
             switch ($details['field']) {
                 case 'hit_url':
-                    $operand = (($func == 'eq') || ($func == 'like')) ? 'EXISTS' : 'NOT EXISTS';
-
+                case 'referer':
+                case 'source':
+                case 'url_title':
+                    $operand = in_array($func, ['eq', 'like', 'regexp', 'notRegexp']) ? 'EXISTS' : 'NOT EXISTS';
+
+                    $column = $details['field'];
+                    if ($column == 'hit_url') {
+                        $column = 'url';
+                    }
                     $subqb = $this->_em->getConnection()
                         ->createQueryBuilder()
                         ->select('id')
@@ -869,20 +879,19 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                         case 'eq':
                         case 'neq':
                             $parameters[$parameter] = $details['filter'];
-
                             $subqb->where(
                                 $q->expr()->andX(
-                                    $q->expr()->eq($alias.'.url', $exprParameter),
+                                    $q->expr()->eq($alias.'.'.$column, $exprParameter),
                                     $q->expr()->eq($alias.'.lead_id', 'l.id')
                                 )
                             );
                             break;
                         case 'like':
                         case '!like':
-                            $details['filter'] = '%'.$details['filter'].'%';
-                            $subqb->where(
+                            $parameters[$parameter] = '%'.$details['filter'].'%';
+                        $subqb->where(
                                 $q->expr()->andX(
-                                    $q->expr()->like($alias.'.url', $exprParameter),
+                                    $q->expr()->like($alias.'.'.$column, $exprParameter),
                                     $q->expr()->eq($alias.'.lead_id', 'l.id')
                                 )
                             );
@@ -894,7 +903,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                             $subqb->where(
                                 $q->expr()->andX(
                                     $q->expr()->eq($alias.'.lead_id', 'l.id'),
-                                    $alias.'.url'.$not.' REGEXP '.$exprParameter
+                                    $alias.'.'.$column.$not.' REGEXP '.$exprParameter
                                 )
                             );
                             break;
@@ -906,6 +915,207 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                     }
                     $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
                     break;
+                case 'hit_url_date':
+                case 'lead_email_read_date':
+                    $operand = (in_array($func, ['eq', 'gt', 'lt', 'gte', 'lte', 'between'])) ? 'EXISTS' : 'NOT EXISTS';
+                    $table   = 'page_hits';
+                    $column  = 'date_hit';
+                    if ($details['field'] == 'lead_email_read_date') {
+                        $column = 'date_read';
+                        $table  = 'email_stats';
+                    }
+                    $subqb = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select('id')
+                        ->from(MAUTIC_TABLE_PREFIX.$table, $alias);
+                    switch ($func) {
+                        case 'eq':
+                        case 'neq':
+                            $parameters[$parameter] = $details['filter'];
+                            $subqb->where($q->expr()
+                                ->andX($q->expr()
+                                    ->eq($alias.'.'.$column, $exprParameter), $q->expr()
+                                    ->eq($alias.'.lead_id', 'l.id')));
+                            break;
+                        case 'between':
+                        case 'notBetween':
+                            // Filter should be saved with double || to separate options
+                            $parameter2              = $this->generateRandomParameterName();
+                            $parameters[$parameter]  = $details['filter'][0];
+                            $parameters[$parameter2] = $details['filter'][1];
+                            $exprParameter2          = ":$parameter2";
+                            $ignoreAutoFilter        = true;
+                            $field                   = $column;
+                            if ($func == 'between') {
+                                $subqb->where($q->expr()
+                                    ->andX(
+                                        $q->expr()->gte($alias.'.'.$field, $exprParameter),
+                                        $q->expr()->lt($alias.'.'.$field, $exprParameter2),
+                                        $q->expr()->eq($alias.'.lead_id', 'l.id')
+                                    ));
+                            } else {
+                                $subqb->where($q->expr()
+                                    ->andX(
+                                        $q->expr()->lt($alias.'.'.$field, $exprParameter),
+                                        $q->expr()->gte($alias.'.'.$field, $exprParameter2),
+                                        $q->expr()->eq($alias.'.lead_id', 'l.id')
+                                    ));
+                            }
+                            break;
+                        default:
+                            $parameters[$parameter] = $details['filter'];
+                            $subqb->where($q->expr()
+                                ->andX($q->expr()
+                                    ->$func($alias.'.'.$column, $exprParameter), $q->expr()
+                                    ->eq($alias.'.lead_id', 'l.id')));
+                            break;
+                    }
+                    // Specific lead
+                    if (!empty($leadId)) {
+                        $subqb->andWhere($subqb->expr()
+                            ->eq($alias.'.lead_id', $leadId));
+                    }
+                    $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
+                    break;
+                case 'page_id':
+                case 'email_id':
+                case 'redirect_id':
+                case 'notification':
+                    $operand = ($func == 'eq') ? 'EXISTS' : 'NOT EXISTS';
+                    $column  = $details['field'];
+                    $table   = 'page_hits';
+                    $select  = 'id';
+
+                    if ($details['field'] == 'notification') {
+                        $table  = 'push_ids';
+                        $column = 'id';
+                    }
+
+                    $subqb = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select($select)
+                        ->from(MAUTIC_TABLE_PREFIX.$table, $alias);
+
+                    if ($details['filter'] == 1) {
+                        $subqb->where($q->expr()
+                            ->andX($q->expr()
+                                ->isNotNull($alias.'.'.$column),  $q->expr()
+                                ->eq($alias.'.lead_id', 'l.id')));
+                    } else {
+                        $subqb->where($q->expr()
+                            ->andX($q->expr()
+                                ->isNull($alias.'.'.$column),  $q->expr()
+                                ->eq($alias.'.lead_id', 'l.id')));
+                    }
+                    // Specific lead
+                    if (!empty($leadId)) {
+                        $subqb->andWhere($subqb->expr()
+                            ->eq($alias.'.lead_id', $leadId));
+                    }
+                    $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
+                    break;
+                case 'sessions':
+                    $operand = 'EXISTS';
+                    $column  = $details['field'];
+                    $table   = 'page_hits';
+                    $select  = 'COUNT(id)';
+
+                    $subqb = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select($select)
+                        ->from(MAUTIC_TABLE_PREFIX.$table, $alias);
+
+                    $alias2 = $this->generateRandomParameterName();
+                    $subqb2 = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select($alias2.'.id')
+                        ->from(MAUTIC_TABLE_PREFIX.$table, $alias2);
+
+                    $subqb2->where($q->expr()
+                        ->andX(
+                            $q->expr()->eq($alias2.'.lead_id', 'l.id'),
+                            $q->expr()->gt($alias2.'.date_hit', '('.$alias.'.date_hit - INTERVAL 30 MINUTE)'),
+                            $q->expr()->lt($alias2.'.date_hit', $alias.'.date_hit')
+                        ));
+
+                    $parameters[$parameter] = $details['filter'];
+                    $subqb->where($q->expr()
+                        ->andX($q->expr()
+                            ->eq($alias.'.lead_id', 'l.id'), $q->expr()
+                            ->isNull($alias.'.email_id'), $q->expr()
+                            ->isNull($alias.'.redirect_id'),
+                            sprintf('%s (%s)', 'NOT EXISTS', $subqb2->getSQL())));
+
+                    $opr = '';
+                    switch ($func) {
+                        case 'eq':
+                            $opr = '=';
+                            break;
+                        case 'gt':
+                            $opr = '>';
+                            break;
+                        case 'gte':
+                            $opr = '>=';
+                            break;
+                        case 'lt':
+                            $opr = '<';
+                            break;
+                        case 'lte':
+                            $opr = '<=';
+                            break;
+                    }
+                    if ($opr) {
+                        $parameters[$parameter] = $details['filter'];
+                        $subqb->having($select.$opr.$details['filter']);
+                    }
+                    $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
+                    break;
+                case 'hit_url_count':
+                case 'lead_email_read_count':
+                    $operand = 'EXISTS';
+                    $column  = $details['field'];
+                    $table   = 'page_hits';
+                    $select  = 'COUNT(id)';
+                    if ($details['field'] == 'lead_email_read_count') {
+                        $table  = 'email_stats';
+                        $select = 'SUM(open_count)';
+                    }
+                    $subqb = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select($select)
+                        ->from(MAUTIC_TABLE_PREFIX.$table, $alias);
+
+                    $parameters[$parameter] = $details['filter'];
+                    $subqb->where($q->expr()
+                        ->andX($q->expr()
+                            ->eq($alias.'.lead_id', 'l.id')));
+
+                $opr = '';
+                switch ($func) {
+                    case 'eq':
+                        $opr = '=';
+                        break;
+                    case 'gt':
+                        $opr = '>';
+                        break;
+                    case 'gte':
+                        $opr = '>=';
+                        break;
+                    case 'lt':
+                        $opr = '<';
+                        break;
+                    case 'lte':
+                        $opr = '<=';
+                        break;
+                }
+
+                if ($opr) {
+                    $parameters[$parameter] = $details['filter'];
+                    $subqb->having($select.$opr.$details['filter']);
+                }
+
+                $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
+                break;
 
                 case 'dnc_bounced':
                 case 'dnc_unsubscribed':
@@ -958,6 +1168,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                 case 'tags':
                 case 'globalcategory':
                 case 'lead_email_received':
+                case 'lead_email_sent':
 
                     // Special handling of lead lists and tags
                     $func = in_array($func, ['eq', 'in']) ? 'EXISTS' : 'NOT EXISTS';
@@ -1008,6 +1219,10 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                             );
                             $parameters[$trueParameter] = true;
                             break;
+                        case 'lead_email_sent':
+                            $table  = 'email_stats';
+                            $column = 'email_id';
+                            break;
                     }
 
                     $subExpr->add(
@@ -1045,6 +1260,32 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
                     $groupExpr->add(sprintf('%s (%s)', $operand, $subQb->getSQL()));
 
+                    break;
+                case 'integration_campaigns':
+                    $operand = in_array($func, ['eq', 'neq']) ? 'EXISTS' : 'NOT EXISTS';
+                    //get integration campaign members here
+
+                    $subQb = $this->_em->getConnection()
+                        ->createQueryBuilder()
+                        ->select('null')
+                        ->from(MAUTIC_TABLE_PREFIX.'integration_entity', $alias);
+                    switch ($func) {
+                        case 'eq':
+                        case 'neq':
+                            $parameters[$parameter] = $details['filter'];
+                            $subQb->where(
+                                $q->expr()->andX(
+                                    $q->expr()->eq($alias.'.internal_entity_id', 'l.id'),
+                                    $q->expr()->eq($alias.'.integration_entity_id', ":$parameter"),
+                                    $q->expr()->eq($alias.'.internal_entity', "'lead'"),
+                                    $q->expr()->eq($alias.'.integration_entity', "'CampaignMember'")
+                                )
+                            );
+                            break;
+                    }
+
+                    $groupExpr->add(sprintf('%s (%s)', $operand, $subQb->getSQL()));
+
                     break;
                 default:
                     if (!$column) {
@@ -1113,7 +1354,6 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                             $groupExpr->add(
                                 $this->generateFilterExpression($q, $field, $func, $details['filter'], null)
                             );
-
                             $ignoreAutoFilter = true;
                             break;
 
@@ -1176,17 +1416,18 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
         if ($groupExpr->count()) {
             $groups[] = $groupExpr;
         }
-
         if (count($groups) === 1) {
             // Only one andX expression
             $expr = $groups[0];
-        } else {
+        } elseif (count($groups) > 1) {
             // Sets of expressions grouped by OR
             $orX = $q->expr()->orX();
             $orX->addMultiple($groups);
 
             // Wrap in a andX for other functions to append
             $expr = $q->expr()->andX($orX);
+        } else {
+            $expr = $groupExpr;
         }
 
         return $expr;
diff --git a/app/bundles/LeadBundle/Entity/LeadRepository.php b/app/bundles/LeadBundle/Entity/LeadRepository.php
index e11c643701d..df6c5f1b8ce 100644
--- a/app/bundles/LeadBundle/Entity/LeadRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadRepository.php
@@ -88,8 +88,8 @@ public function getLeadsByFieldValue($field, $value, $ignoreId = null, $indexByC
         $col = 'l.'.$field;
 
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder()
-                  ->select('l.id')
-                  ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
+            ->select('l.id')
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
         if ($field == 'email') {
             // Prevent emails from being case sensitive
@@ -108,7 +108,7 @@ function ($v) use ($q) {
             );
         } else {
             $q->where("$col = :search")
-              ->setParameter('search', $value);
+                ->setParameter('search', $value);
         }
 
         if ($ignoreId) {
@@ -139,12 +139,13 @@ function ($v) use ($q) {
     /**
      * Get a list of lead entities.
      *
-     * @param      $uniqueFieldsWithData
-     * @param null $leadId
+     * @param     $uniqueFieldsWithData
+     * @param int $leadId
+     * @param int $limit
      *
      * @return array
      */
-    public function getLeadsByUniqueFields($uniqueFieldsWithData, $leadId = null)
+    public function getLeadsByUniqueFields($uniqueFieldsWithData, $leadId = null, $limit = null)
     {
         // get the list of IDs
         $idList = $this->getLeadIdsByUniqueFields($uniqueFieldsWithData, $leadId);
@@ -174,6 +175,10 @@ public function getLeadsByUniqueFields($uniqueFieldsWithData, $leadId = null)
             ->setParameter('ids', $ids)
             ->orderBy('l.dateAdded', 'DESC');
 
+        if ($limit) {
+            $q->setMaxResults($limit);
+        }
+
         $results = $q->getQuery()->getResult();
 
         /** @var Lead $lead */
@@ -302,8 +307,8 @@ public function getEntity($id = 0)
                 $contactId = (int) $id['id'];
             } else {
                 $q->select('l, u, i')
-                ->leftJoin('l.ipAddresses', 'i')
-                ->leftJoin('l.owner', 'u');
+                    ->leftJoin('l.ipAddresses', 'i')
+                    ->leftJoin('l.owner', 'u');
                 $contactId = $id;
             }
             $q->andWhere($this->getTableAlias().'.id = '.(int) $contactId);
@@ -350,7 +355,7 @@ public function getEntityWithPrimaryCompany($entity)
                 $primary = null;
 
                 foreach ($companies as $company) {
-                    if ($company['is_primary'] == 1) {
+                    if (isset($company['is_primary']) && $company['is_primary'] == 1) {
                         $primary = $company;
                     }
                 }
@@ -386,14 +391,15 @@ function ($r) {
             }
         );
 
-        if (!empty($args['withPrimaryCompany']) || !empty($args['withChannelRules'])) {
+        $contactCount = isset($contacts['results']) ? count($contacts['results']) : count($contacts);
+        if ($contactCount && (!empty($args['withPrimaryCompany']) || !empty($args['withChannelRules']))) {
+            $withTotalCount = (array_key_exists('withTotalCount', $args) && $args['withTotalCount']);
+            /** @var Lead[] $tmpContacts */
+            $tmpContacts = ($withTotalCount) ? $contacts['results'] : $contacts;
+
             $withCompanies   = !empty($args['withPrimaryCompany']);
             $withPreferences = !empty($args['withChannelRules']);
-
-            $withTotalCount = array_key_exists('withTotalCount', $args);
-            /** @var Lead[] $tmpContacts */
-            $tmpContacts = ($withTotalCount && $args['withTotalCount']) ? $contacts['results'] : $contacts;
-            $contactIds  = array_keys($tmpContacts);
+            $contactIds      = array_keys($tmpContacts);
 
             if ($withCompanies) {
                 $companies = $this->getEntityManager()->getRepository('MauticLeadBundle:Company')->getCompaniesForContacts($contactIds);
@@ -445,7 +451,7 @@ function ($r) {
                 }
             }
 
-            if ($withTotalCount && $args['withTotalCount']) {
+            if ($withTotalCount) {
                 $contacts['results'] = $tmpContacts;
             } else {
                 $contacts = $tmpContacts;
@@ -689,13 +695,14 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                         ],
                     ],
                     $innerJoinTables,
-                    $this->generateFilterExpression($q, 'list.alias', $likeExpr, $unique, ($filter->not) ? true : null,
+                    $this->generateFilterExpression($q, 'list.alias', $eqExpr, $unique, ($filter->not) ? true : null,
                         // orX for filter->not either manuall removed or is null
                         $q->expr()->$xExpr(
                             $q->expr()->$eqExpr('list_lead.manually_removed', 0)
                         )
                     )
                 );
+                $filter->strict  = true;
                 $returnParameter = true;
 
                 break;
diff --git a/app/bundles/LeadBundle/Event/ChannelEvent.php b/app/bundles/LeadBundle/Event/ChannelEvent.php
index ddfd8e54a6c..b7738993f6a 100644
--- a/app/bundles/LeadBundle/Event/ChannelEvent.php
+++ b/app/bundles/LeadBundle/Event/ChannelEvent.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\LeadBundle\Event;
 
-@trigger_error('\Mautic\LeadBundle\Event\ChannelEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\ChannelEvent instead', E_DEPRECATED);
+@trigger_error('\Mautic\LeadBundle\Event\ChannelEvent was deprecated in 2.4 and to be removed in 3.0 Use \Mautic\ChannelBundle\Event\ChannelEvent instead', E_USER_DEPRECATED);
 
 /**
  * Class ChannelEvent.
diff --git a/app/bundles/LeadBundle/Event/LeadTimelineEvent.php b/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
index c58d1da1152..bd77806016f 100644
--- a/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
@@ -296,7 +296,7 @@ public function getEventLimit()
         return [
             'leadId' => $this->lead->getId(),
             'limit'  => $this->limit,
-            'start'  => (1 === $this->page) ? 0 : ($this->page - 1) * $this->limit,
+            'start'  => (1 >= $this->page) ? 0 : ($this->page - 1) * $this->limit,
         ];
     }
 
diff --git a/app/bundles/LeadBundle/Event/ListPreProcessListEvent.php b/app/bundles/LeadBundle/Event/ListPreProcessListEvent.php
new file mode 100644
index 00000000000..410283e27a6
--- /dev/null
+++ b/app/bundles/LeadBundle/Event/ListPreProcessListEvent.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\LeadBundle\Event;
+
+use Mautic\CoreBundle\Event\CommonEvent;
+use Mautic\LeadBundle\Entity\LeadList;
+
+/**
+ * Class ListPreProcessListEvent.
+ */
+class ListPreProcessListEvent extends CommonEvent
+{
+    /**
+     * @param LeadList $list
+     * @param bool     $isNew
+     */
+    public function __construct($list, $isNew = false)
+    {
+        $this->list  = $list;
+        $this->isNew = $isNew;
+    }
+
+    /**
+     * Returns the List entity.
+     *
+     * @return List
+     */
+    public function getList()
+    {
+        return $this->list;
+    }
+
+    /**
+     * Sets the List entity.
+     *
+     * @param List $list
+     */
+    public function setList(LeadList $list)
+    {
+        $this->list = $list;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @param $result
+     *
+     * @return $this
+     */
+    public function setResult($result)
+    {
+        $this->result = $result;
+
+        return $this;
+    }
+}
diff --git a/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php b/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
index da47591e9a5..3aabbf04b71 100644
--- a/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
@@ -69,6 +69,7 @@ public static function getSubscribedEvents()
                 ['onCampaignTriggerActionUpdateTags', 3],
                 ['onCampaignTriggerActionAddToCompany', 4],
                 ['onCampaignTriggerActionChangeCompanyScore', 4],
+                ['onCampaignTriggerActionDeleteContact', 6],
             ],
             LeadEvents::ON_CAMPAIGN_TRIGGER_CONDITION => ['onCampaignTriggerCondition', 0],
         ];
@@ -131,6 +132,20 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
         ];
         $event->addAction('lead.scorecontactscompanies', $action);
 
+        $trigger = [
+            'label'                  => 'mautic.lead.lead.events.delete',
+            'description'            => 'mautic.lead.lead.events.delete_descr',
+            'eventName'              => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
+            'connectionRestrictions' => [
+                'target' => [
+                    'decision'  => ['none'],
+                    'action'    => ['none'],
+                    'condition' => ['none'],
+                ],
+            ],
+        ];
+        $event->addAction('lead.deletecontact', $trigger);
+
         $trigger = [
             'label'       => 'mautic.lead.lead.events.field_value',
             'description' => 'mautic.lead.lead.events.field_value_descr',
@@ -278,6 +293,20 @@ public function onCampaignTriggerActionChangeCompanyScore(CampaignExecutionEvent
         }
     }
 
+    /**
+     * @param CampaignExecutionEvent $event
+     */
+    public function onCampaignTriggerActionDeleteContact(CampaignExecutionEvent $event)
+    {
+        if (!$event->checkContext('lead.deletecontact')) {
+            return;
+        }
+
+        $this->leadModel->deleteEntity($event->getLead());
+
+        return $event->setResult(true);
+    }
+
     /**
      * @param CampaignExecutionEvent $event
      */
diff --git a/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php b/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
index ba6ba12fa50..ac9085df110 100644
--- a/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
@@ -167,8 +167,9 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 // Build table rows with links
                 if ($lists) {
                     foreach ($lists as &$list) {
-                        $listUrl = $this->router->generate('mautic_segment_action', ['objectAction' => 'edit', 'objectId' => $list['id']]);
-                        $row     = [
+                        $listUrl    = $this->router->generate('mautic_segment_action', ['objectAction' => 'edit', 'objectId' => $list['id']]);
+                        $contactUrl = $this->router->generate('mautic_contact_index', ['search' => 'segment:'.$list['alias']]);
+                        $row        = [
                             [
                                 'value' => $list['name'],
                                 'type'  => 'link',
@@ -176,6 +177,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                             ],
                             [
                                 'value' => $list['leads'],
+                                'type'  => 'link',
+                                'link'  => $contactUrl,
                             ],
                         ];
                         $items[] = $row;
diff --git a/app/bundles/LeadBundle/EventListener/ReportSubscriber.php b/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
index b4e468a2a1a..71577bf0073 100644
--- a/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
@@ -306,7 +306,6 @@ public function onReportGenerate(ReportGeneratorEvent $event)
 
         switch ($context) {
             case 'leads':
-                $event->applyDateFilters($qb, 'date_added', 'l');
                 $qb->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
                 if ($event->hasColumn(['u.first_name', 'u.last_name']) || $event->hasFilter(['u.first_name', 'u.last_name'])) {
@@ -320,6 +319,9 @@ public function onReportGenerate(ReportGeneratorEvent $event)
 
                 if ($event->hasFilter('s.leadlist_id')) {
                     $qb->join('l', MAUTIC_TABLE_PREFIX.'lead_lists_leads', 's', 's.lead_id = l.id AND s.manually_removed = 0');
+                    $event->applyDateFilters($qb, 'date_added', 's');
+                } else {
+                    $event->applyDateFilters($qb, 'date_added', 'l');
                 }
                 break;
 
diff --git a/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php b/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
index 8e7f3ba5adf..71024dd3756 100644
--- a/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
@@ -12,8 +12,11 @@
 namespace Mautic\LeadBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\LeadBundle\Event\LeadEvent;
+use Mautic\LeadBundle\Event\PointsChangeEvent;
 use Mautic\LeadBundle\LeadEvents;
 use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\EventListener\WebhookModelTrait;
 use Mautic\WebhookBundle\WebhookEvents;
 
 /**
@@ -21,6 +24,8 @@
  */
 class WebhookSubscriber extends CommonSubscriber
 {
+    use WebhookModelTrait;
+
     /**
      * @return array
      */
@@ -28,6 +33,9 @@ public static function getSubscribedEvents()
     {
         return [
             WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+            LeadEvents::LEAD_POST_SAVE      => ['onLeadNewUpdate', 0],
+            LeadEvents::LEAD_POINTS_CHANGE  => ['onLeadPointChange', 0],
+            LeadEvents::LEAD_POST_DELETE    => ['onLeadDelete', 0],
         ];
     }
 
@@ -74,4 +82,70 @@ public function onWebhookBuild(WebhookBuilderEvent $event)
         // add the deleted checkbox
         $event->addEvent(LeadEvents::LEAD_POST_DELETE, $leadDeleted);
     }
+
+    /**
+     * @param LeadEvent $event
+     */
+    public function onLeadNewUpdate(LeadEvent $event)
+    {
+        $this->webhookModel->queueWebhooksByType(
+            $event->isNew() ? LeadEvents::LEAD_POST_SAVE.'_new' : LeadEvents::LEAD_POST_SAVE.'_update',
+            [
+                'lead'    => $event->getLead(),
+                'contact' => $event->getLead(),
+            ],
+            [
+                'leadDetails',
+                'userList',
+                'publishDetails',
+                'ipAddress',
+            ]
+        );
+    }
+
+    /**
+     * @param PointsChangeEvent $event
+     */
+    public function onLeadPointChange(PointsChangeEvent $event)
+    {
+        $this->webhookModel->queueWebhooksByType(
+            LeadEvents::LEAD_POINTS_CHANGE,
+            [
+                'lead'    => $event->getLead(),
+                'contact' => $event->getLead(),
+                'points'  => [
+                    'old_points' => $event->getOldPoints(),
+                    'new_points' => $event->getNewPoints(),
+                ],
+            ],
+            [
+                'leadDetails',
+                'userList',
+                'publishDetails',
+                'ipAddress',
+            ]
+        );
+    }
+
+    /**
+     * @param LeadEvent $event
+     */
+    public function onLeadDelete(LeadEvent $event)
+    {
+        $lead = $event->getLead();
+        $this->webhookModel->queueWebhooksByType(
+            LeadEvents::LEAD_POST_DELETE,
+            [
+                'id'      => $lead->deletedId,
+                'lead'    => $lead,
+                'contact' => $lead,
+            ],
+            [
+                'leadDetails',
+                'userList',
+                'publishDetails',
+                'ipAddress',
+            ]
+        );
+    }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php b/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
index 22991baf1d5..33af790c8fb 100644
--- a/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
+++ b/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
@@ -181,11 +181,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'lead_lists',
                 'leadlist_choices',
                 [
-                    'label'      => 'mautic.lead.form.list',
-                    'label_attr' => ['class' => 'control-label'],
-                    'multiple'   => true,
-                    'expanded'   => $options['public_view'],
-                    'required'   => false,
+                    'global_only' => true,
+                    'label'       => 'mautic.lead.form.list',
+                    'label_attr'  => ['class' => 'control-label'],
+                    'multiple'    => true,
+                    'expanded'    => $options['public_view'],
+                    'required'    => false,
                 ]
             );
         }
diff --git a/app/bundles/LeadBundle/Form/Type/FieldType.php b/app/bundles/LeadBundle/Form/Type/FieldType.php
index 6892993b8e2..8c043e21cbb 100644
--- a/app/bundles/LeadBundle/Form/Type/FieldType.php
+++ b/app/bundles/LeadBundle/Form/Type/FieldType.php
@@ -272,13 +272,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 case 'boolean':
                     if (is_array($data)) {
                         $value    = isset($data['defaultValue']) ? $data['defaultValue'] : false;
-                        $yesLabel = !empty($data['properties']['yes']) ? $data['properties']['yes'] : 'matuic.core.form.yes';
-                        $noLabel  = !empty($data['properties']['no']) ? $data['properties']['no'] : 'matuic.core.form.no';
+                        $yesLabel = !empty($data['properties']['yes']) ? $data['properties']['yes'] : 'mautic.core.form.yes';
+                        $noLabel  = !empty($data['properties']['no']) ? $data['properties']['no'] : 'mautic.core.form.no';
                     } else {
                         $value    = $data->getDefaultValue();
                         $props    = $data->getProperties();
-                        $yesLabel = !empty($props['yes']) ? $props['yes'] : 'matuic.core.form.yes';
-                        $noLabel  = !empty($props['no']) ? $props['no'] : 'matuic.core.form.no';
+                        $yesLabel = !empty($props['yes']) ? $props['yes'] : 'mautic.core.form.yes';
+                        $noLabel  = !empty($props['no']) ? $props['no'] : 'mautic.core.form.no';
                     }
 
                     if ($value !== '' && $value !== null) {
diff --git a/app/bundles/LeadBundle/Form/Type/FilterTrait.php b/app/bundles/LeadBundle/Form/Type/FilterTrait.php
new file mode 100644
index 00000000000..57d03408b75
--- /dev/null
+++ b/app/bundles/LeadBundle/Form/Type/FilterTrait.php
@@ -0,0 +1,309 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic, Inc.
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\LeadBundle\Form\Type;
+
+use Mautic\LeadBundle\Helper\FormFieldHelper;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+trait FilterTrait
+{
+    /**
+     * @param                     $eventName
+     * @param FormEvent           $event
+     * @param TranslatorInterface $translator
+     */
+    public function buildFiltersForm($eventName, FormEvent $event, TranslatorInterface $translator, $currentListId = null)
+    {
+        $data      = $event->getData();
+        $form      = $event->getForm();
+        $options   = $form->getConfig()->getOptions();
+        $fieldType = $data['type'];
+        $fieldName = $data['field'];
+
+        $type = 'text';
+        $attr = [
+            'class' => 'form-control',
+        ];
+        $displayType = 'hidden';
+        $displayAttr = [];
+
+        $field = [];
+
+        if (isset($options['fields']['lead'][$fieldName])) {
+            $field = $options['fields']['lead'][$fieldName];
+        } elseif (isset($options['fields']['company'][$fieldName])) {
+            $field = $options['fields']['company'][$fieldName];
+        }
+
+        $customOptions = [];
+        switch ($fieldType) {
+            case 'leadlist':
+                if (!isset($data['filter'])) {
+                    $data['filter'] = [];
+                } elseif (!is_array($data['filter'])) {
+                    $data['filter'] = [$data['filter']];
+                }
+
+                // Don't show the current list ID in the choices
+                if (!empty($currentListId)) {
+                    unset($options['lists'][$currentListId]);
+                }
+
+                $customOptions['choices']                   = $options['lists'];
+                $customOptions['multiple']                  = true;
+                $customOptions['choice_translation_domain'] = false;
+                $type                                       = 'choice';
+                break;
+            case 'lead_email_received':
+                if (!isset($data['filter'])) {
+                    $data['filter'] = [];
+                } elseif (!is_array($data['filter'])) {
+                    $data['filter'] = [$data['filter']];
+                }
+
+                $customOptions['choices']                   = $options['emails'];
+                $customOptions['multiple']                  = true;
+                $customOptions['choice_translation_domain'] = false;
+                $type                                       = 'choice';
+                break;
+            case 'tags':
+                if (!isset($data['filter'])) {
+                    $data['filter'] = [];
+                } elseif (!is_array($data['filter'])) {
+                    $data['filter'] = [$data['filter']];
+                }
+                $customOptions['choices']                   = $options['tags'];
+                $customOptions['multiple']                  = true;
+                $customOptions['choice_translation_domain'] = false;
+                $attr                                       = array_merge(
+                    $attr,
+                    [
+                        'data-placeholder'     => $translator->trans('mautic.lead.tags.select_or_create'),
+                        'data-no-results-text' => $translator->trans('mautic.lead.tags.enter_to_create'),
+                        'data-allow-add'       => 'true',
+                        'onchange'             => 'Mautic.createLeadTag(this)',
+                    ]
+                );
+                $type = 'choice';
+                break;
+            case 'stage':
+                $customOptions['choices']                   = $options['stage'];
+                $customOptions['choice_translation_domain'] = false;
+                $type                                       = 'choice';
+                break;
+            case 'globalcategory':
+                if (!isset($data['filter'])) {
+                    $data['filter'] = [];
+                } elseif (!is_array($data['filter'])) {
+                    $data['filter'] = [$data['filter']];
+                }
+                $customOptions['choices']  = $options['globalcategory'];
+                $customOptions['multiple'] = true;
+                $type                      = 'choice';
+                break;
+            case 'timezone':
+            case 'country':
+            case 'region':
+            case 'locale':
+                switch ($fieldType) {
+                    case 'timezone':
+                        $choiceKey = 'timezones';
+                        break;
+                    case 'country':
+                        $choiceKey = 'countries';
+                        break;
+                    case 'region':
+                        $choiceKey = 'regions';
+                        break;
+                    case 'locale':
+                        $choiceKey = 'locales';
+                        break;
+                }
+
+                $type                                       = 'choice';
+                $customOptions['choices']                   = $options[$choiceKey];
+                $customOptions['choice_translation_domain'] = false;
+                $customOptions['multiple']                  = (in_array($data['operator'], ['in', '!in']));
+
+                if ($customOptions['multiple']) {
+                    array_unshift($customOptions['choices'], ['' => '']);
+
+                    if (!isset($data['filter'])) {
+                        $data['filter'] = [];
+                    }
+                }
+
+                break;
+            case 'time':
+            case 'date':
+            case 'datetime':
+                $attr['data-toggle'] = $fieldType;
+                break;
+            case 'lookup_id':
+                $type        = 'hidden';
+                $displayType = 'text';
+                $displayAttr = array_merge(
+                    $displayAttr,
+                    [
+                        'class'                => 'form-control',
+                        'data-toggle'          => 'field-lookup',
+                        'data-target'          => $data['field'],
+                        'data-action'          => 'lead:fieldList',
+                        'data-lookup-callback' => 'updateLookupListFilter',
+                        'placeholder'          => $translator->trans(
+                            'mautic.lead.list.form.filtervalue'
+                        ),
+                    ]
+                );
+
+                if (isset($field['properties']['list'])) {
+                    $displayAttr['data-options'] = $field['properties']['list'];
+                }
+
+                break;
+            case 'select':
+            case 'multiselect':
+            case 'boolean':
+                $type = 'choice';
+                $attr = array_merge(
+                    $attr,
+                    [
+                        'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                    ]
+                );
+
+                if (in_array($data['operator'], ['in', '!in'])) {
+                    $customOptions['multiple'] = true;
+                    if (!isset($data['filter'])) {
+                        $data['filter'] = [];
+                    } elseif (!is_array($data['filter'])) {
+                        $data['filter'] = [$data['filter']];
+                    }
+                }
+
+                $choices = [];
+                if (!empty($field['properties']['list'])) {
+                    $list    = $field['properties']['list'];
+                    $choices = FormFieldHelper::parseList($list, true, ('boolean' === $fieldType));
+                }
+
+                if ('select' == $fieldType) {
+                    // array_unshift cannot be used because numeric values get lost as keys
+                    $choices     = array_reverse($choices, true);
+                    $choices[''] = '';
+                    $choices     = array_reverse($choices, true);
+                }
+
+                $customOptions['choices']                   = $choices;
+                $customOptions['choice_translation_domain'] = false;
+                break;
+            case 'lookup':
+            default:
+                if ('number' !== $fieldType) {
+                    $attr = array_merge(
+                        $attr,
+                        [
+                            'data-toggle' => 'field-lookup',
+                            'data-target' => $data['field'],
+                            'data-action' => 'lead:fieldList',
+                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                        ]
+                    );
+
+                    if (isset($field['properties']['list'])) {
+                        $attr['data-options'] = $field['properties']['list'];
+                    }
+                }
+
+                break;
+        }
+
+        if (in_array($data['operator'], ['empty', '!empty'])) {
+            $attr['disabled'] = 'disabled';
+        } elseif ($data['operator']) {
+            $customOptions['constraints'] = [
+                new NotBlank(
+                    [
+                        'message' => 'mautic.core.value.required',
+                    ]
+                ),
+            ];
+        }
+
+        // @todo implement in UI
+        if (in_array($data['operator'], ['between', '!between'])) {
+            $form->add(
+                'filter',
+                'collection',
+                [
+                    'type'    => $type,
+                    'options' => [
+                        'label' => false,
+                        'attr'  => $attr,
+                    ],
+                    'label' => false,
+                ]
+            );
+        } else {
+            if (isset($customOptions['constraints']) && is_array($customOptions['constraints'])) {
+                foreach ($customOptions['constraints'] as $i => $constraint) {
+                    if (get_class($constraint) === 'NotBlank') {
+                        array_splice($customOptions['constraints'], $i, 1);
+                    }
+                }
+            }
+            $form->add(
+                'filter',
+                $type,
+                array_merge(
+                    [
+                        'label'          => false,
+                        'attr'           => $attr,
+                        'data'           => isset($data['filter']) ? $data['filter'] : '',
+                        'error_bubbling' => false,
+                    ], $customOptions
+                )
+            );
+        }
+
+        $form->add(
+            'display',
+            $displayType,
+            [
+                'label'          => false,
+                'attr'           => $displayAttr,
+                'data'           => (isset($data['display'])) ? $data['display'] : '',
+                'error_bubbling' => false,
+            ]
+        );
+
+        $form->add(
+            'operator',
+            'choice',
+            [
+                'label'   => false,
+                'choices' => isset($field['operators']) ? $field['operators'] : [],
+                'attr'    => [
+                    'class'    => 'form-control not-chosen',
+                    'onchange' => 'Mautic.convertLeadFilterInput(this)',
+                ],
+            ]
+        );
+
+        if ($eventName == FormEvents::PRE_SUBMIT) {
+            $event->setData($data);
+        }
+    }
+}
diff --git a/app/bundles/LeadBundle/Form/Type/FilterType.php b/app/bundles/LeadBundle/Form/Type/FilterType.php
index 27008c9e5c7..f1faff2656b 100644
--- a/app/bundles/LeadBundle/Form/Type/FilterType.php
+++ b/app/bundles/LeadBundle/Form/Type/FilterType.php
@@ -12,7 +12,6 @@
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -20,13 +19,14 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Class FilterType.
  */
 class FilterType extends AbstractType
 {
+    use FilterTrait;
+
     private $translator;
     private $currentListId;
 
@@ -61,277 +61,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $translator    = $this->translator;
-        $currentListId = $this->currentListId;
-
-        $formModifier = function (FormEvent $event, $eventName) use ($translator, $currentListId) {
-            $data      = $event->getData();
-            $form      = $event->getForm();
-            $options   = $form->getConfig()->getOptions();
-            $fieldType = $data['type'];
-            $fieldName = $data['field'];
-
-            $type = 'text';
-            $attr = [
-                'class' => 'form-control',
-            ];
-            $displayType = 'hidden';
-            $displayAttr = [];
-
-            $field = [];
-
-            if (isset($options['fields']['lead'][$fieldName])) {
-                $field = $options['fields']['lead'][$fieldName];
-            } elseif (isset($options['fields']['company'][$fieldName])) {
-                $field = $options['fields']['company'][$fieldName];
-            }
-
-            $customOptions = [];
-            switch ($fieldType) {
-                case 'leadlist':
-                    if (!isset($data['filter'])) {
-                        $data['filter'] = [];
-                    } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = [$data['filter']];
-                    }
-
-                    // Don't show the current list ID in the choices
-                    if (!empty($currentListId)) {
-                        unset($options['lists'][$currentListId]);
-                    }
-
-                    $customOptions['choices']  = $options['lists'];
-                    $customOptions['multiple'] = true;
-                    $type                      = 'choice';
-                    break;
-                case 'lead_email_received':
-                    if (!isset($data['filter'])) {
-                        $data['filter'] = [];
-                    } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = [$data['filter']];
-                    }
-
-                    $customOptions['choices']  = $options['emails'];
-                    $customOptions['multiple'] = true;
-                    $type                      = 'choice';
-                    break;
-                case 'tags':
-                    if (!isset($data['filter'])) {
-                        $data['filter'] = [];
-                    } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = [$data['filter']];
-                    }
-                    $customOptions['choices']  = $options['tags'];
-                    $customOptions['multiple'] = true;
-                    $attr                      = array_merge(
-                        $attr,
-                        [
-                            'data-placeholder'     => $translator->trans('mautic.lead.tags.select_or_create'),
-                            'data-no-results-text' => $translator->trans('mautic.lead.tags.enter_to_create'),
-                            'data-allow-add'       => 'true',
-                            'onchange'             => 'Mautic.createLeadTag(this)',
-                        ]
-                    );
-                    $type = 'choice';
-                    break;
-                case 'stage':
-                    $customOptions['choices'] = $options['stage'];
-                    $type                     = 'choice';
-                    break;
-                case 'globalcategory':
-                    if (!isset($data['filter'])) {
-                        $data['filter'] = [];
-                    } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = [$data['filter']];
-                    }
-                    $customOptions['choices']  = $options['globalcategory'];
-                    $customOptions['multiple'] = true;
-                    $type                      = 'choice';
-                    break;
-                case 'timezone':
-                case 'country':
-                case 'region':
-                case 'locale':
-                    switch ($fieldType) {
-                        case 'timezone':
-                            $choiceKey = 'timezones';
-                            break;
-                        case 'country':
-                            $choiceKey = 'countries';
-                            break;
-                        case 'region':
-                            $choiceKey = 'regions';
-                            break;
-                        case 'locale':
-                            $choiceKey = 'locales';
-                            break;
-                    }
-
-                    $type                     = 'choice';
-                    $customOptions['choices'] = $options[$choiceKey];
-
-                    $customOptions['multiple'] = (in_array($data['operator'], ['in', '!in']));
-
-                    if ($customOptions['multiple']) {
-                        array_unshift($customOptions['choices'], ['' => '']);
-
-                        if (!isset($data['filter'])) {
-                            $data['filter'] = [];
-                        }
-                    }
-
-                    break;
-                case 'time':
-                case 'date':
-                case 'datetime':
-                    $attr['data-toggle'] = $fieldType;
-                    break;
-                case 'lookup_id':
-                    $type        = 'hidden';
-                    $displayType = 'text';
-                    $displayAttr = array_merge(
-                        $displayAttr,
-                        [
-                            'class'       => 'form-control',
-                            'data-toggle' => 'field-lookup',
-                            'data-target' => $data['field'],
-                            'data-action' => 'lead:fieldList',
-                            'placeholder' => $translator->trans(
-                                'mautic.lead.list.form.filtervalue'
-                            ),
-                        ]
-                    );
-
-                    if (isset($field['properties']['list'])) {
-                        $displayAttr['data-options'] = $field['properties']['list'];
-                    }
-
-                    break;
-                case 'select':
-                case 'multiselect':
-                case 'boolean':
-                    $type = 'choice';
-                    $attr = array_merge(
-                        $attr,
-                        [
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
-                        ]
-                    );
-
-                    if (in_array($data['operator'], ['in', '!in'])) {
-                        $customOptions['multiple'] = true;
-                        if (!isset($data['filter'])) {
-                            $data['filter'] = [];
-                        } elseif (!is_array($data['filter'])) {
-                            $data['filter'] = [$data['filter']];
-                        }
-                    }
-
-                    $choices = [];
-                    if (!empty($field['properties']['list'])) {
-                        $list    = $field['properties']['list'];
-                        $choices = FormFieldHelper::parseList($list, true, ('boolean' === $fieldType));
-                    }
-
-                    if ('select' == $fieldType) {
-                        // array_unshift cannot be used because numeric values get lost as keys
-                        $choices     = array_reverse($choices, true);
-                        $choices[''] = '';
-                        $choices     = array_reverse($choices, true);
-                    }
-
-                    $customOptions['choices'] = $choices;
-                    break;
-                case 'lookup':
-                default:
-                    if ('number' !== $fieldType) {
-                        $attr = array_merge(
-                            $attr,
-                            [
-                                'data-toggle' => 'field-lookup',
-                                'data-target' => $data['field'],
-                                'data-action' => 'lead:fieldList',
-                                'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
-                            ]
-                        );
-
-                        if (isset($field['properties']['list'])) {
-                            $attr['data-options'] = $field['properties']['list'];
-                        }
-                    }
-
-                    break;
-            }
-
-            if (in_array($data['operator'], ['empty', '!empty'])) {
-                $attr['disabled'] = 'disabled';
-            } else {
-                $customOptions['constraints'] = [
-                    new NotBlank(
-                        [
-                            'message' => 'mautic.core.value.required',
-                        ]
-                    ),
-                ];
-            }
-
-            // @todo implement in UI
-            if (in_array($data['operator'], ['between', '!between'])) {
-                $form->add(
-                    'filter',
-                    'collection',
-                    [
-                        'type'    => $type,
-                        'options' => [
-                            'label' => false,
-                            'attr'  => $attr,
-                        ],
-                        'label' => false,
-                    ]
-                );
-            } else {
-                $form->add(
-                    'filter',
-                    $type,
-                    array_merge(
-                        [
-                            'label'          => false,
-                            'attr'           => $attr,
-                            'data'           => isset($data['filter']) ? $data['filter'] : '',
-                            'error_bubbling' => false,
-                        ],
-                        $customOptions
-                    )
-                );
-            }
-
-            $form->add(
-                'display',
-                $displayType,
-                [
-                    'label'          => false,
-                    'attr'           => $displayAttr,
-                    'data'           => $data['display'],
-                    'error_bubbling' => false,
-                ]
-            );
-
-            $form->add(
-                'operator',
-                'choice',
-                [
-                    'label'   => false,
-                    'choices' => isset($field['operators']) ? $field['operators'] : [],
-                    'attr'    => [
-                        'class'    => 'form-control not-chosen',
-                        'onchange' => 'Mautic.convertLeadFilterInput(this)',
-                    ],
-                ]
-            );
-
-            if ($eventName == FormEvents::PRE_SUBMIT) {
-                $event->setData($data);
-            }
+        $formModifier = function (FormEvent $event, $eventName) {
+            $this->buildFiltersForm($eventName, $event, $this->translator, $this->currentListId);
         };
 
         $builder->addEventListener(
@@ -349,9 +80,7 @@ function (FormEvent $event) use ($formModifier) {
         );
 
         $builder->add('field', 'hidden');
-
         $builder->add('object', 'hidden');
-
         $builder->add('type', 'hidden');
     }
 
diff --git a/app/bundles/LeadBundle/Form/Type/ListType.php b/app/bundles/LeadBundle/Form/Type/ListType.php
index 774578e70ea..6fbb428a083 100644
--- a/app/bundles/LeadBundle/Form/Type/ListType.php
+++ b/app/bundles/LeadBundle/Form/Type/ListType.php
@@ -12,9 +12,9 @@
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CategoryBundle\Model\CategoryModel;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
+use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
 use Mautic\EmailBundle\Model\EmailModel;
 use Mautic\LeadBundle\Form\DataTransformer\FieldFilterTransformer;
@@ -47,9 +47,18 @@ class ListType extends AbstractType
     private $categoriesChoices = [];
 
     /**
-     * @param MauticFactory $factory
+     * ListType constructor.
+     *
+     * @param TranslatorInterface $translator
+     * @param ListModel           $listModel
+     * @param EmailModel          $emailModel
+     * @param CorePermissions     $security
+     * @param LeadModel           $leadModel
+     * @param StageModel          $stageModel
+     * @param CategoryModel       $categoryModel
+     * @param UserHelper          $userHelper
      */
-    public function __construct(TranslatorInterface $translator, ListModel $listModel, EmailModel $emailModel, CorePermissions $security, LeadModel $leadModel, StageModel $stageModel, CategoryModel $categoryModel)
+    public function __construct(TranslatorInterface $translator, ListModel $listModel, EmailModel $emailModel, CorePermissions $security, LeadModel $leadModel, StageModel $stageModel, CategoryModel $categoryModel, UserHelper $userHelper)
     {
         $this->translator = $translator;
 
@@ -67,8 +76,14 @@ public function __construct(TranslatorInterface $translator, ListModel $listMode
             $this->listChoices[$list['id']] = $list['name'];
         }
 
-        $viewOther = $security->isGranted('email:emails:viewother');
-        $emails    = $emailModel->getRepository()->getEmailList('', 0, 0, $viewOther, true);
+        $viewOther   = $security->isGranted('email:emails:viewother');
+        $currentUser = $userHelper->getUser();
+        $emailRepo   = $emailModel->getRepository();
+
+        $emailRepo->setCurrentUser($currentUser);
+
+        $emails = $emailRepo->getEmailList('', 0, 0, $viewOther, true);
+
         foreach ($emails as $email) {
             $this->emailChoices[$email['language']][$email['id']] = $email['name'];
         }
diff --git a/app/bundles/LeadBundle/LeadEvents.php b/app/bundles/LeadBundle/LeadEvents.php
index 3a77b405609..59dad07bbb6 100644
--- a/app/bundles/LeadBundle/LeadEvents.php
+++ b/app/bundles/LeadBundle/LeadEvents.php
@@ -424,6 +424,16 @@ final class LeadEvents
      */
     const LIST_FILTERS_ON_FILTERING = 'mautic.list_filters_on_filtering';
 
+    /**
+     * The mautic.list_filters_on_filtering event is dispatched when the lists are updated.
+     *
+     * The event listener receives a
+     * Mautic\LeadBundle\Event\LeadListFilteringEvent instance.
+     *
+     * @var string
+     */
+    const LIST_PRE_PROCESS_LIST = 'mautic.list_pre_process_list';
+
     /**
      * The mautic.remove_do_no_contact event is dispatched when a new submission is fired.
      *
diff --git a/app/bundles/LeadBundle/Model/LeadModel.php b/app/bundles/LeadBundle/Model/LeadModel.php
index 828df1aac71..e0452d5d6cd 100644
--- a/app/bundles/LeadBundle/Model/LeadModel.php
+++ b/app/bundles/LeadBundle/Model/LeadModel.php
@@ -851,7 +851,7 @@ public function getLeadFromRequest(array $queryFields = [])
      *
      * @return array|Lead|null
      */
-    public function getContactFromRequest($queryFields = [])
+    public function getContactFromRequest($queryFields = [], $trackByFingerprint = false)
     {
         $lead = null;
 
@@ -920,6 +920,15 @@ public function getContactFromRequest($queryFields = [])
             }
         }
 
+        // Search for lead by fingerprint
+        if (empty($lead) && !empty($queryFields['fingerprint']) && $trackByFingerprint) {
+            $deviceRepo = $this->getDeviceRepository();
+            $device     = $deviceRepo->getDeviceByFingerprint($queryFields['fingerprint']);
+            if ($device) {
+                $lead = $this->getEntity($device['lead_id']);
+            }
+        }
+
         if (empty($lead)) {
             // No lead found so generate one
             $lead = $this->getCurrentLead();
@@ -1828,7 +1837,9 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
                             }
                             break;
                         case 'multiselect':
-                            if (!is_array($fieldData[$leadField['alias']])) {
+                            if (strpos($fieldData[$leadField['alias']], '|') !== false) {
+                                $fieldData[$leadField['alias']] = explode('|', $fieldData[$leadField['alias']]);
+                            } else {
                                 $fieldData[$leadField['alias']] = [$fieldData[$leadField['alias']]];
                             }
                             break;
diff --git a/app/bundles/LeadBundle/Model/ListModel.php b/app/bundles/LeadBundle/Model/ListModel.php
index 0b2796e50aa..1e34f4476c7 100644
--- a/app/bundles/LeadBundle/Model/ListModel.php
+++ b/app/bundles/LeadBundle/Model/ListModel.php
@@ -25,6 +25,7 @@
 use Mautic\LeadBundle\Event\LeadListEvent;
 use Mautic\LeadBundle\Event\LeadListFiltersChoicesEvent;
 use Mautic\LeadBundle\Event\ListChangeEvent;
+use Mautic\LeadBundle\Event\ListPreProcessListEvent;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Mautic\LeadBundle\LeadEvents;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -270,7 +271,7 @@ public function getChoiceFields()
                 'label'      => $this->translator->trans('mautic.lead.list.filter.owner'),
                 'properties' => [
                     'type'     => 'lookup_id',
-                    'callback' => 'activateLeadFieldTypeahead',
+                    'callback' => 'activateSegmentFilterTypeahead',
                 ],
                 'operators' => $this->getOperatorsForFieldType('text'),
                 'object'    => 'lead',
@@ -304,6 +305,54 @@ public function getChoiceFields()
                 ),
                 'object' => 'lead',
             ],
+            'lead_email_sent' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.lead_email_sent'),
+                'properties' => [
+                    'type' => 'lead_email_received',
+                ],
+                'operators' => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            'in',
+                            '!in',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'lead_email_read_date' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.lead_email_read_date'),
+                'properties' => ['type' => 'datetime'],
+                'operators'  => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            '!=',
+                            'gt',
+                            'lt',
+                            'gte',
+                            'lte',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'lead_email_read_count' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.lead_email_read_count'),
+                'properties' => ['type' => 'number'],
+                'operators'  => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            'gt',
+                            'gte',
+                            'lt',
+                            'lte',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
             'tags' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.tags'),
                 'properties' => [
@@ -369,13 +418,170 @@ public function getChoiceFields()
                     [
                         'include' => [
                             '=',
+                            '!=',
+                            'like',
+                            '!like',
+                            'regexp',
+                            '!regexp',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'hit_url_date' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.visited_url_date'),
+                'properties' => ['type' => 'datetime'],
+                'operators'  => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            '!=',
+                            'gt',
+                            'lt',
+                            'gte',
+                            'lte',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'hit_url_count' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.visited_url_count'),
+                'properties' => ['type' => 'number'],
+                'operators'  => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            'gt',
+                            'gte',
+                            'lt',
+                            'lte',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'sessions' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.session'),
+                'properties' => ['type' => 'number'],
+                'operators'  => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            'gt',
+                            'gte',
+                            'lt',
+                            'lte',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'referer' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.referer'),
+                'properties' => [
+                    'type' => 'text',
+                ],
+                'operators' => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            '!=',
                             'like',
+                            '!like',
                             'regexp',
+                            '!regexp',
                         ],
                     ]
                 ),
                 'object' => 'lead',
             ],
+            'url_title' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.url_title'),
+                'properties' => [
+                    'type' => 'text',
+                ],
+                'operators' => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            '!=',
+                            'like',
+                            '!like',
+                            'regexp',
+                            '!regexp',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'source' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.source'),
+                'properties' => [
+                    'type' => 'text',
+                ],
+                'operators' => $this->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                            '!=',
+                            'like',
+                            '!like',
+                            'regexp',
+                            '!regexp',
+                        ],
+                    ]
+                ),
+                'object' => 'lead',
+            ],
+            'notification' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.notification'),
+                'properties' => [
+                    'type' => 'boolean',
+                    'list' => [
+                        0 => $this->translator->trans('mautic.core.form.no'),
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => $this->getOperatorsForFieldType('bool'),
+                'object'    => 'lead',
+            ],
+            'page_id' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.page_id'),
+                'properties' => [
+                    'type' => 'boolean',
+                    'list' => [
+                        0 => $this->translator->trans('mautic.core.form.no'),
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => $this->getOperatorsForFieldType('bool'),
+                'object'    => 'lead',
+            ],
+            'email_id' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.email_id'),
+                'properties' => [
+                    'type' => 'boolean',
+                    'list' => [
+                        0 => $this->translator->trans('mautic.core.form.no'),
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => $this->getOperatorsForFieldType('bool'),
+                'object'    => 'lead',
+            ],
+            'redirect_id' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.redirect_id'),
+                'properties' => [
+                    'type' => 'boolean',
+                    'list' => [
+                        0 => $this->translator->trans('mautic.core.form.no'),
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => $this->getOperatorsForFieldType('bool'),
+                'object'    => 'lead',
+            ],
             'stage' => [
                 'label'      => $this->translator->trans('mautic.lead.lead.field.stage'),
                 'properties' => [
@@ -507,6 +713,11 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
 
         $localDateTime = $dtHelper->getLocalDateTime();
 
+        $this->dispatcher->dispatch(
+            LeadEvents::LIST_PRE_PROCESS_LIST,
+            new ListPreProcessListEvent($list, false)
+        );
+
         // Get a count of leads to add
         $newLeadsCount = $this->getLeadsByList(
             $list,
@@ -1022,7 +1233,7 @@ protected function batchSleep()
     public function getTopLists($limit = 10, $dateFrom = null, $dateTo = null, $filters = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
-        $q->select('COUNT(t.date_added) AS leads, ll.id, ll.name')
+        $q->select('COUNT(t.date_added) AS leads, ll.id, ll.name, ll.alias')
             ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 't')
             ->join('t', MAUTIC_TABLE_PREFIX.'lead_lists', 'll', 'll.id = t.leadlist_id')
             ->orderBy('leads', 'DESC')
diff --git a/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php b/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
index e3b0b5c838c..f33674b6ddd 100644
--- a/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
+++ b/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
@@ -12,6 +12,7 @@
 namespace Mautic\LeadBundle\Templating\Helper;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Helper\UrlHelper;
 use Mautic\LeadBundle\Entity\Lead;
 use Symfony\Component\Templating\Helper\Helper;
 
@@ -90,12 +91,9 @@ public function getAvatarPath($absolute = false)
      */
     public function getDefaultAvatar($absolute = false)
     {
-        return $this->factory->getHelper('template.assets')->getUrl(
-            $this->factory->getSystemPath('assets').'/images/avatar.png',
-            null,
-            null,
-            $absolute
-        );
+        $img = $this->factory->getSystemPath('assets').'/images/avatar.png';
+
+        return UrlHelper::rel2abs($this->factory->getHelper('template.assets')->getUrl($img));
     }
 
     /**
diff --git a/app/bundles/LeadBundle/Translations/en_US/messages.ini b/app/bundles/LeadBundle/Translations/en_US/messages.ini
index 2ff39597deb..a90ab5e1293 100755
--- a/app/bundles/LeadBundle/Translations/en_US/messages.ini
+++ b/app/bundles/LeadBundle/Translations/en_US/messages.ini
@@ -5,6 +5,7 @@ mautic.campaign.lead.field_value="Contact field value"
 mautic.campaign.lead.updatelead="Update contact"
 mautic.contact.error.notfound="Contact not found."
 mautic.campaign.lead.scorecontactscompanies="Score company"
+mautic.campaign.lead.deletecontact="Delete contact"
 mautic.core.date.added_first="First Touch Date Added"
 mautic.core.date.added_last="Last Touch Date Added"
 mautic.lead.add.note="Add note"
@@ -181,6 +182,8 @@ mautic.lead.lead.events.pointchange_descr="Trigger event upon a contact's point
 mautic.lead.lead.events.removefromlists="Remove contact from selected segment(s)"
 mautic.lead.lead.events.updatelead="Update contact"
 mautic.lead.lead.events.updatelead_descr="Update the current contact's fields with the defined values from this action"
+mautic.lead.lead.events.delete="Delete contact"
+mautic.lead.lead.events.delete_descr="<span class='text-danger'>Permanently deletes the contact as well as all associated statistical data. <strong>Warning: this is irreversible!</strong></span>"
 mautic.lead.lead.events.field_value="Contact field value"
 mautic.lead.lead.events.field_value_descr="Condition based on a contact field value."
 mautic.lead.lead.field.custom_avatar="Custom"
@@ -270,6 +273,20 @@ mautic.lead.list.filter.last_active="Date Last Active"
 mautic.lead.list.filter.date_modified="Modified date"
 mautic.lead.list.filter.lists="Segment Membership"
 mautic.lead.list.filter.lead_email_received="Email Read"
+mautic.lead.list.filter.lead_email_sent="Email Sent"
+mautic.lead.list.filter.lead_email_read_date="Email Read Date"
+mautic.lead.list.filter.lead_email_read_count="Email Read Count"
+mautic.lead.list.filter.visited_url="Visited URL"
+mautic.lead.list.filter.visited_url_count="Visited URL Count"
+mautic.lead.list.filter.url_title="Page title"
+mautic.lead.list.filter.source="Source"
+mautic.lead.list.filter.session="Sessions"
+mautic.lead.list.filter.redirect_id="URL as redirect"
+mautic.lead.list.filter.email_id="URL from email"
+mautic.lead.list.filter.page_id="URL from landing page"
+mautic.lead.list.filter.referer="Visited URL Referer"
+mautic.lead.list.filter.visited_url_date="Visited URL Date"
+mautic.lead.list.filter.notification="Notifications"
 mautic.lead.list.filter.owner="Owner"
 mautic.lead.list.filter.tags="Tags"
 mautic.lead.list.filter.visited_url="Visited URL"
diff --git a/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
index b7f559392e2..31bd88dcb31 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
@@ -21,7 +21,3 @@
         <?php echo $view['form']->row($form['value']); ?>
     </div>
 </div>
-
-<script>
-    Mautic.updateLeadFieldValues('#<?php echo $form['field']->vars['id']; ?>');
-</script>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
index c98c3162493..adb21bfec13 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
@@ -33,12 +33,10 @@
         </div>
 
         <?php $hasErrors = count($form['filter']->vars['errors']) || count($form['display']->vars['errors']); ?>
-        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors) {
-    echo ' has-error';
-} ?>">
+        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors): echo ' has-error'; endif; ?>">
             <?php echo $view['form']->widget($form['filter']); ?>
-            <?php echo $view['form']->errors($form['filter']); ?>
             <?php echo $view['form']->widget($form['display']); ?>
+            <?php echo $view['form']->errors($form['filter']); ?>
             <?php echo $view['form']->errors($form['display']); ?>
         </div>
 
diff --git a/app/bundles/LeadBundle/Views/List/form.html.php b/app/bundles/LeadBundle/Views/List/form.html.php
index c7ef10668dc..2d8736ab1f7 100644
--- a/app/bundles/LeadBundle/Views/List/form.html.php
+++ b/app/bundles/LeadBundle/Views/List/form.html.php
@@ -88,7 +88,7 @@
                                     <?php
                                     foreach ($fields as $object => $field):
                                         $header = $object;
-                                        $icon   = ($object == 'company') ? 'fa-building' : 'fa-user';
+                                        $icon   = ($object == 'company') ? 'building' : 'user';
                                     ?>
                                     <optgroup label="<?php echo $view['translator']->trans('mautic.lead.'.$header); ?>">
                                         <?php foreach ($field as $value => $params):
@@ -98,7 +98,16 @@
                                             $callback  = (!empty($params['properties']['callback'])) ? $params['properties']['callback'] : '';
                                             $operators = (!empty($params['operators'])) ? $view->escape(json_encode($params['operators'])) : '{}';
                                             ?>
-                                            <option value="<?php echo $value; ?>" id="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon; ?>"><?php echo $view['translator']->trans($params['label']); ?></option>
+                                            <option value="<?php echo $value; ?>"
+                                                    id="available_<?php echo $value; ?>"
+                                                    data-field-object="<?php echo $object; ?>"
+                                                    data-field-type="<?php echo $params['properties']['type']; ?>"
+                                                    data-field-list="<?php echo $view->escape($list); ?>"
+                                                    data-field-callback="<?php echo $callback; ?>"
+                                                    data-field-operators="<?php echo $operators; ?>"
+                                                    class="segment-filter <?php echo $icon; ?>">
+                                                    <?php echo $view['translator']->trans($params['label']); ?>
+                                            </option>
                                         <?php endforeach; ?>
                                     </optgroup>
                                     <?php endforeach; ?>
diff --git a/app/bundles/LeadBundle/Views/List/list.html.php b/app/bundles/LeadBundle/Views/List/list.html.php
index bf4d982f9ec..cc5de8e4281 100644
--- a/app/bundles/LeadBundle/Views/List/list.html.php
+++ b/app/bundles/LeadBundle/Views/List/list.html.php
@@ -75,7 +75,8 @@
                             [
                                 'item'            => $item,
                                 'templateButtons' => [
-                                    'delete' => $security->hasEntityAccess(true, $permissions['lead:lists:deleteother'], $item->getCreatedBy()),
+                                    'edit'   => $view['security']->hasEntityAccess(true, $permissions['lead:lists:editother'], $item->getCreatedBy()),
+                                    'delete' => $view['security']->hasEntityAccess(true, $permissions['lead:lists:deleteother'], $item->getCreatedBy()),
                                 ],
                                 'routeBase' => 'segment',
                                 'langVar'   => 'lead.list',
@@ -104,7 +105,7 @@
                                 'MauticCoreBundle:Helper:publishstatus_icon.html.php',
                                 ['item' => $item, 'model' => 'lead.list']
                             ); ?>
-                            <?php if ($security->hasEntityAccess(true, $permissions['lead:lists:editother'], $item->getCreatedBy())) : ?>
+                            <?php if ($view['security']->hasEntityAccess(true, $permissions['lead:lists:editother'], $item->getCreatedBy())) : ?>
                                 <a href="<?php echo $view['router']->path(
                                     'mautic_segment_action',
                                     ['objectAction' => 'edit', 'objectId' => $item->getId()]
diff --git a/app/bundles/LeadBundle/Views/Timeline/plugin_list.html.php b/app/bundles/LeadBundle/Views/Timeline/plugin_list.html.php
index 8cc96ca3185..4ae98f05569 100644
--- a/app/bundles/LeadBundle/Views/Timeline/plugin_list.html.php
+++ b/app/bundles/LeadBundle/Views/Timeline/plugin_list.html.php
@@ -80,7 +80,7 @@
 
             $details = '';
             if (isset($event['contentTemplate']) && $view->exists($event['contentTemplate'])):
-                $details = trim($view->render($event['contentTemplate'], ['event' => $event]));
+                $details = trim($view->render($event['contentTemplate'], ['event' => $event, 'lead' => $lead]));
             endif;
 
             $rowStripe = ($counter % 2 === 0) ? ' timeline-row-highlighted' : '';
diff --git a/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php b/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
index a95fa02416c..61d1b8074a7 100644
--- a/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
+++ b/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
@@ -14,6 +14,9 @@
 use Joomla\Http\Http;
 use Joomla\Http\Response;
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\NotificationBundle\Entity\Notification;
+use Mautic\PageBundle\Model\TrackableModel;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 
 abstract class AbstractNotificationApi
 {
@@ -33,13 +36,29 @@ abstract class AbstractNotificationApi
     protected $http;
 
     /**
-     * @param MauticFactory $factory
-     * @param Http          $http
+     * @var TrackableModel
      */
-    public function __construct(MauticFactory $factory, Http $http)
+    protected $trackableModel;
+
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
+    /**
+     * AbstractNotificationApi constructor.
+     *
+     * @param MauticFactory     $factory
+     * @param Http              $http
+     * @param TrackableModel    $trackableModel
+     * @param IntegrationHelper $integrationHelper
+     */
+    public function __construct(MauticFactory $factory, Http $http, TrackableModel $trackableModel, IntegrationHelper $integrationHelper)
     {
-        $this->factory = $factory;
-        $this->http    = $http;
+        $this->factory           = $factory;
+        $this->http              = $http;
+        $this->trackableModel    = $trackableModel;
+        $this->integrationHelper = $integrationHelper;
     }
 
     /**
@@ -51,13 +70,12 @@ public function __construct(MauticFactory $factory, Http $http)
     abstract public function send($endpoint, $data);
 
     /**
-     * @param mixed        $id
-     * @param string|array $message
-     * @param string|array $title
+     * @param              $id
+     * @param Notification $notification
      *
-     * @return Response
+     * @return mixed
      */
-    abstract public function sendNotification($id, $message, $title = '');
+    abstract public function sendNotification($id, Notification $notification);
 
     /**
      * Convert a non-tracked url to a tracked url.
@@ -69,12 +87,9 @@ abstract public function sendNotification($id, $message, $title = '');
      */
     public function convertToTrackedUrl($url, array $clickthrough = [])
     {
-        /** @var \Mautic\PageBundle\Model\TrackableModel $trackableModel */
-        $trackableModel = $this->factory->getModel('page.trackable');
-
         /* @var \Mautic\PageBundle\Entity\Redirect $redirect */
-        $trackable = $trackableModel->getTrackableByUrl($url, 'notification', $clickthrough['notification']);
+        $trackable = $this->trackableModel->getTrackableByUrl($url, 'notification', $clickthrough['notification']);
 
-        return $trackableModel->generateTrackableUrl($trackable, $clickthrough);
+        return $this->trackableModel->generateTrackableUrl($trackable, $clickthrough);
     }
 }
diff --git a/app/bundles/NotificationBundle/Api/OneSignalApi.php b/app/bundles/NotificationBundle/Api/OneSignalApi.php
index d19e23cf160..59593c219d5 100644
--- a/app/bundles/NotificationBundle/Api/OneSignalApi.php
+++ b/app/bundles/NotificationBundle/Api/OneSignalApi.php
@@ -12,6 +12,7 @@
 namespace Mautic\NotificationBundle\Api;
 
 use Joomla\Http\Response;
+use Mautic\NotificationBundle\Entity\Notification;
 use Mautic\NotificationBundle\Exception\MissingApiKeyException;
 use Mautic\NotificationBundle\Exception\MissingAppIDException;
 
@@ -33,8 +34,9 @@ class OneSignalApi extends AbstractNotificationApi
      */
     public function send($endpoint, $data)
     {
-        $appId      = $this->factory->getParameter('notification_app_id');
-        $restApiKey = $this->factory->getParameter('notification_rest_api_key');
+        $apiKeys    = $this->integrationHelper->getIntegrationObject('OneSignal')->getKeys();
+        $appId      = $apiKeys['app_id'];
+        $restApiKey = $apiKeys['rest_api_key'];
 
         if (!$restApiKey) {
             throw new MissingApiKeyException();
@@ -59,22 +61,21 @@ public function send($endpoint, $data)
     }
 
     /**
-     * @param string|array $playerId Player ID as string, or an array of player ID's
-     * @param string|array $message  Message as string, or lang => message array
-     *                               ['en' => 'English Message', 'es' => 'Spanish Message']
-     * @param string|array $title    Title as string, or lang => title array
-     *                               ['en' => 'English Title', 'es' => 'Spanish Title']
-     * @param string       $url      The URL where the user should be sent when clicking the notification
+     * @param string|array $playerId     Player ID as string, or an array of player ID's
+     * @param Notification $notification
      *
      * @return Response
      *
      * @throws \Exception
      */
-    public function sendNotification($playerId, $message, $title = null, $url = null, $button = null)
+    public function sendNotification($playerId, Notification $notification)
     {
         $data = [];
 
-        $buttonId = $title;
+        $buttonId = $notification->getHeading();
+        $url      = $notification->getUrl();
+        $button   = $notification->getButton();
+        $message  = $notification->getMessage();
 
         if (!is_array($playerId)) {
             $playerId = [$playerId];
@@ -100,10 +101,78 @@ public function sendNotification($playerId, $message, $title = null, $url = null
             $data['url'] = $url;
         }
 
-        if ($button && $url) {
-            $data['web_buttons'][] = ['id' => $buttonId, 'text' => $button, 'url' => $url];
+        if ($notification->isMobile()) {
+            $this->addMobileData($data, $notification->getMobileSettings());
+
+            if ($button) {
+                $data['buttons'][] = ['id' => $buttonId, 'text' => $button];
+            }
+        } else {
+            if ($button && $url) {
+                $data['web_buttons'][] = ['id' => $buttonId, 'text' => $button, 'url' => $url];
+            }
         }
 
         return $this->send('/notifications', $data);
     }
+
+    /**
+     * @param array $data
+     * @param array $mobileConfig
+     */
+    protected function addMobileData(array &$data, array $mobileConfig)
+    {
+        foreach ($mobileConfig as $key => $value) {
+            switch ($key) {
+                case 'ios_subtitle':
+                    $data['subtitle'] = ['en' => $value];
+                    break;
+                case 'ios_sound':
+                    $data['ios_sound'] = $value ?: 'default';
+                    break;
+                case 'ios_badges':
+                    $data['ios_badgeType'] = $value;
+                    break;
+                case 'ios_badgeCount':
+                    $data['ios_badgeCount'] = (int) $value;
+                    break;
+                case 'ios_contentAvailable':
+                    $data['content_available'] = (bool) $value;
+                    break;
+                case 'ios_media':
+                    $data['ios_attachments'] = [uniqid('id_') => $value];
+                    break;
+                case 'ios_mutableContent':
+                    $data['mutable_content'] = (bool) $value;
+                    break;
+                case 'android_sound':
+                    $data['android_sound'] = $value;
+                    break;
+                case 'android_small_icon':
+                    $data['small_icon'] = $value;
+                    break;
+                case 'android_large_icon':
+                    $data['large_icon'] = $value;
+                    break;
+                case 'android_big_picture':
+                    $data['big_picture'] = $value;
+                    break;
+                case 'android_led_color':
+                    $data['android_led_color'] = 'FF'.strtoupper($value);
+                    break;
+                case 'android_accent_color':
+                    $data['android_accent_color'] = 'FF'.strtoupper($value);
+                    break;
+                case 'android_group_key':
+                    $data['android_group'] = $value;
+                    break;
+                case 'android_lockscreen_visibility':
+                    $data['android_visibility'] = (int) $value;
+                    break;
+                case 'additional_data':
+                    $data['data'] = $value['list'];
+                    break;
+            }
+        }
+    }
 }
diff --git a/app/bundles/NotificationBundle/Assets/img/OneSignal.png b/app/bundles/NotificationBundle/Assets/img/OneSignal.png
new file mode 100644
index 00000000000..39fd575abb5
Binary files /dev/null and b/app/bundles/NotificationBundle/Assets/img/OneSignal.png differ
diff --git a/app/bundles/NotificationBundle/Config/config.php b/app/bundles/NotificationBundle/Config/config.php
index ee54619c248..adce7b81093 100644
--- a/app/bundles/NotificationBundle/Config/config.php
+++ b/app/bundles/NotificationBundle/Config/config.php
@@ -15,24 +15,24 @@
             'mautic.notification.campaignbundle.subscriber' => [
                 'class'     => 'Mautic\NotificationBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
-                    'mautic.helper.core_parameters',
+                    'mautic.helper.integration',
                     'mautic.lead.model.lead',
                     'mautic.notification.model.notification',
                     'mautic.notification.api',
                 ],
             ],
-            'mautic.notification.configbundle.subscriber' => [
-                'class' => 'Mautic\NotificationBundle\EventListener\ConfigSubscriber',
-            ],
             'mautic.notification.pagebundle.subscriber' => [
                 'class'     => 'Mautic\NotificationBundle\EventListener\PageSubscriber',
                 'arguments' => [
                     'templating.helper.assets',
-                    'mautic.helper.core_parameters',
+                    'mautic.helper.integration',
                 ],
             ],
             'mautic.core.js.subscriber' => [
-                'class' => 'Mautic\NotificationBundle\EventListener\BuildJsSubscriber',
+                'class'     => 'Mautic\NotificationBundle\EventListener\BuildJsSubscriber',
+                'arguments' => [
+                    'mautic.helper.notification',
+                ],
             ],
             'mautic.notification.notificationbundle.subscriber' => [
                 'class'     => 'Mautic\NotificationBundle\EventListener\NotificationSubscriber',
@@ -43,8 +43,21 @@
                     'mautic.asset.helper.token',
                 ],
             ],
+//            Left out until 2.9
+//            'mautic.notification.subscriber.form' => [
+//                'class'     => \Mautic\NotificationBundle\EventListener\FormSubscriber::class,
+//                'arguments' => [
+//                    'mautic.helper.integration',
+//                    'mautic.lead.model.lead',
+//                    'mautic.notification.model.notification',
+//                    'mautic.notification.api',
+//                ],
+//            ],
             'mautic.notification.subscriber.channel' => [
-                'class' => \Mautic\NotificationBundle\EventListener\ChannelSubscriber::class,
+                'class'     => \Mautic\NotificationBundle\EventListener\ChannelSubscriber::class,
+                'arguments' => [
+                    'mautic.helper.integration',
+                ],
             ],
             'mautic.notification.stats.subscriber' => [
                 'class'     => \Mautic\NotificationBundle\EventListener\StatsSubscriber::class,
@@ -52,12 +65,28 @@
                     'doctrine.orm.entity_manager',
                 ],
             ],
+            'mautic.notification.mobile_notification.report.subscriber' => [
+                'class'     => \Mautic\NotificationBundle\EventListener\ReportSubscriber::class,
+                'arguments' => [
+                    'doctrine.dbal.default_connection',
+                ],
+            ],
         ],
         'forms' => [
             'mautic.form.type.notification' => [
-                'class'     => 'Mautic\NotificationBundle\Form\Type\NotificationType',
-                'arguments' => 'mautic.factory',
-                'alias'     => 'notification',
+                'class' => 'Mautic\NotificationBundle\Form\Type\NotificationType',
+                'alias' => 'notification',
+            ],
+            'mautic.form.type.mobile.notification' => [
+                'class' => \Mautic\NotificationBundle\Form\Type\MobileNotificationType::class,
+                'alias' => 'mobile_notification',
+            ],
+            'mautic.form.type.mobile.notification_details' => [
+                'class'     => \Mautic\NotificationBundle\Form\Type\MobileNotificationDetailsType::class,
+                'arguments' => [
+                    'mautic.helper.integration',
+                ],
+                'alias' => 'mobile_notification_details',
             ],
             'mautic.form.type.notificationconfig' => [
                 'class' => 'Mautic\NotificationBundle\Form\Type\ConfigType',
@@ -72,12 +101,28 @@
                 'class' => 'Mautic\NotificationBundle\Form\Type\NotificationListType',
                 'alias' => 'notification_list',
             ],
+            'mautic.form.type.mobilenotificationsend_list' => [
+                'class'     => \Mautic\NotificationBundle\Form\Type\MobileNotificationSendType::class,
+                'arguments' => 'router',
+                'alias'     => 'mobilenotificationsend_list',
+            ],
+            'mautic.form.type.mobilenotification_list' => [
+                'class' => \Mautic\NotificationBundle\Form\Type\MobileNotificationListType::class,
+                'alias' => 'mobilenotification_list',
+            ],
         ],
         'helpers' => [
             'mautic.helper.notification' => [
                 'class'     => 'Mautic\NotificationBundle\Helper\NotificationHelper',
-                'arguments' => 'mautic.factory',
                 'alias'     => 'notification_helper',
+                'arguments' => [
+                    'mautic.factory',
+                    'templating.helper.assets',
+                    'mautic.helper.core_parameters',
+                    'mautic.helper.integration',
+                    'router',
+                    'request_stack',
+                ],
             ],
         ],
         'other' => [
@@ -86,6 +131,8 @@
                 'arguments' => [
                     'mautic.factory',
                     'mautic.http.connector',
+                    'mautic.page.model.trackable',
+                    'mautic.helper.integration',
                 ],
                 'alias' => 'notification_api',
             ],
@@ -113,6 +160,18 @@
                 'path'       => '/notifications/view/{objectId}/contact/{page}',
                 'controller' => 'MauticNotificationBundle:Notification:contacts',
             ],
+            'mautic_mobile_notification_index' => [
+                'path'       => '/mobile_notifications/{page}',
+                'controller' => 'MauticNotificationBundle:MobileNotification:index',
+            ],
+            'mautic_mobile_notification_action' => [
+                'path'       => '/mobile_notifications/{objectAction}/{objectId}',
+                'controller' => 'MauticNotificationBundle:MobileNotification:execute',
+            ],
+            'mautic_mobile_notification_contacts' => [
+                'path'       => '/mobile_notifications/view/{objectId}/contact/{page}',
+                'controller' => 'MauticNotificationBundle:MobileNotification:contacts',
+            ],
         ],
         'public' => [
             'mautic_receive_notification' => [
@@ -141,6 +200,10 @@
                 'path'       => '/manifest.json',
                 'controller' => 'MauticNotificationBundle:Js:manifest',
             ],
+            'mautic_app_notification' => [
+                'path'       => '/notification/appcallback',
+                'controller' => 'MauticNotificationBundle:AppCallback:index',
+            ],
         ],
         'api' => [
             'mautic_api_notificationsstandard' => [
@@ -158,13 +221,31 @@
                     'route'  => 'mautic_notification_index',
                     'access' => ['notification:notifications:viewown', 'notification:notifications:viewother'],
                     'checks' => [
-                        'parameters' => [
-                            'notification_enabled' => true,
+                        'integration' => [
+                            'OneSignal' => [
+                                'enabled' => true,
+                            ],
                         ],
                     ],
                     'parent'   => 'mautic.core.channels',
                     'priority' => 80,
                 ],
+                'mautic.notification.mobile_notifications' => [
+                    'route'  => 'mautic_mobile_notification_index',
+                    'access' => ['notification:mobile_notifications:viewown', 'notification:mobile_notifications:viewother'],
+                    'checks' => [
+                        'integration' => [
+                            'OneSignal' => [
+                                'enabled'  => true,
+                                'features' => [
+                                    'mobile',
+                                ],
+                            ],
+                        ],
+                    ],
+                    'parent'   => 'mautic.core.channels',
+                    'priority' => 65,
+                ],
             ],
         ],
     ],
@@ -172,12 +253,14 @@
     //    'notification' => null
     //],
     'parameters' => [
-        'notification_enabled'              => false,
-        'notification_landing_page_enabled' => true,
-        'notification_app_id'               => null,
-        'notification_rest_api_key'         => null,
-        'notification_safari_web_id'        => null,
-        'gcm_sender_id'                     => '482941778795',
-        'welcomenotification_enabled'       => true,
+        'notification_enabled'               => false,
+        'notification_landing_page_enabled'  => true,
+        'notification_tracking_page_enabled' => false,
+        'notification_app_id'                => null,
+        'notification_rest_api_key'          => null,
+        'notification_safari_web_id'         => null,
+        'gcm_sender_id'                      => '482941778795',
+        'notification_subdomain_name'        => null,
+        'welcomenotification_enabled'        => true,
     ],
 ];
diff --git a/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php b/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
index 9c279ee4aa3..6c518d02da0 100644
--- a/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
+++ b/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
@@ -41,7 +41,6 @@ public function initialize(FilterControllerEvent $event)
     public function subscribeAction()
     {
         $osid = $this->request->get('osid');
-
         if ($osid) {
             /** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
             $leadModel = $this->getModel('lead');
@@ -52,7 +51,7 @@ public function subscribeAction()
 
             $leadModel->saveEntity($currentLead);
 
-            return new JsonResponse(['success' => true], 200, ['Access-Control-Allow-Origin' => '*']);
+            return new JsonResponse(['success' => true, 'osid' => $osid], 200, ['Access-Control-Allow-Origin' => '*']);
         }
 
         return new JsonResponse(['success' => 'false'], 200, ['Access-Control-Allow-Origin' => '*']);
diff --git a/app/bundles/NotificationBundle/Controller/AppCallbackController.php b/app/bundles/NotificationBundle/Controller/AppCallbackController.php
new file mode 100644
index 00000000000..db3549b1a6a
--- /dev/null
+++ b/app/bundles/NotificationBundle/Controller/AppCallbackController.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Controller;
+
+use Mautic\CoreBundle\Controller\CommonController;
+use Mautic\LeadBundle\Entity\Lead;
+use Mautic\NotificationBundle\Entity\Notification;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+class AppCallbackController extends CommonController
+{
+    public function indexAction(Request $request)
+    {
+        $requestBody = json_decode($request->getContent(), true);
+        $em          = $this->get('doctrine.orm.entity_manager');
+        $contactRepo = $em->getRepository(Lead::class);
+        $matchData   = [
+            'email' => $requestBody['email'],
+        ];
+
+        /** @var Lead $contact */
+        $contact = $contactRepo->findOneBy($matchData);
+
+        if ($contact === null) {
+            $contact = new Lead();
+            $contact->setEmail($requestBody['email']);
+            $contact->setLastActive(new \DateTime());
+        }
+
+        $pushIdCreated = false;
+
+        if (array_key_exists('push_id', $requestBody)) {
+            $pushIdCreated = true;
+            $contact->addPushIDEntry($requestBody['push_id'], $requestBody['enabled'], true);
+            $contactRepo->saveEntity($contact);
+        }
+
+        $statCreated = false;
+
+        if (array_key_exists('stat', $requestBody)) {
+            $stat             = $requestBody['stat'];
+            $notificationRepo = $em->getRepository(Notification::class);
+            $notification     = $notificationRepo->getEntity($stat['notification_id']);
+
+            if ($notification !== null) {
+                $statCreated = true;
+                $this->getModel('notification')->createStatEntry($notification, $contact, $stat['source'], $stat['source_id']);
+            }
+        }
+
+        return new JsonResponse([
+            'contact_id'       => $contact->getId(),
+            'stat_recorded'    => $statCreated,
+            'push_id_recorded' => $pushIdCreated ?: 'existing',
+        ]);
+    }
+}
diff --git a/app/bundles/NotificationBundle/Controller/MobileNotificationController.php b/app/bundles/NotificationBundle/Controller/MobileNotificationController.php
new file mode 100644
index 00000000000..b6433f2db48
--- /dev/null
+++ b/app/bundles/NotificationBundle/Controller/MobileNotificationController.php
@@ -0,0 +1,775 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Controller;
+
+use Mautic\CoreBundle\Controller\FormController;
+use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\LeadBundle\Controller\EntityContactsTrait;
+use Mautic\NotificationBundle\Entity\Notification;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class MobileNotificationController extends FormController
+{
+    use EntityContactsTrait;
+
+    /**
+     * @param int $page
+     *
+     * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function indexAction($page = 1)
+    {
+        /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
+        $model = $this->getModel('notification');
+
+        //set some permissions
+        $permissions = $this->get('mautic.security')->isGranted(
+            [
+                'notification:mobile_notifications:viewown',
+                'notification:mobile_notifications:viewother',
+                'notification:mobile_notifications:create',
+                'notification:mobile_notifications:editown',
+                'notification:mobile_notifications:editother',
+                'notification:mobile_notifications:deleteown',
+                'notification:mobile_notifications:deleteother',
+                'notification:mobile_notifications:publishown',
+                'notification:mobile_notifications:publishother',
+            ],
+            'RETURN_ARRAY'
+        );
+
+        if (!$permissions['notification:mobile_notifications:viewown'] && !$permissions['notification:mobile_notifications:viewother']) {
+            return $this->accessDenied();
+        }
+
+        $session = $this->get('session');
+
+        //set limits
+        $limit = $session->get('mautic.mobile_notification.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
+        $start = ($page === 1) ? 0 : (($page - 1) * $limit);
+        if ($start < 0) {
+            $start = 0;
+        }
+
+        $search = $this->request->get('search', $session->get('mautic.mobile_notification.filter', ''));
+        $session->set('mautic.mobile_notification.filter', $search);
+
+        $filter = [
+            'string' => $search,
+            'where'  => [
+                [
+                    'expr' => 'eq',
+                    'col'  => 'mobile',
+                    'val'  => 1,
+                ],
+            ],
+        ];
+
+        if (!$permissions['notification:mobile_notifications:viewother']) {
+            $filter['force'][] =
+                ['column' => 'e.createdBy', 'expr' => 'eq', 'value' => $this->user->getId()];
+        }
+
+        $orderBy    = $session->get('mautic.mobile_notification.orderby', 'e.name');
+        $orderByDir = $session->get('mautic.mobile_notification.orderbydir', 'DESC');
+
+        $notifications = $model->getEntities(
+            [
+                'start'      => $start,
+                'limit'      => $limit,
+                'filter'     => $filter,
+                'orderBy'    => $orderBy,
+                'orderByDir' => $orderByDir,
+            ]
+        );
+
+        $count = count($notifications);
+        if ($count && $count < ($start + 1)) {
+            //the number of entities are now less then the current page so redirect to the last page
+            if ($count === 1) {
+                $lastPage = 1;
+            } else {
+                $lastPage = (floor($count / $limit)) ?: 1;
+            }
+
+            $session->set('mautic.mobile_notification.page', $lastPage);
+            $returnUrl = $this->generateUrl('mautic_mobile_notification_index', ['page' => $lastPage]);
+
+            return $this->postActionRedirect(
+                [
+                    'returnUrl'       => $returnUrl,
+                    'viewParameters'  => ['page' => $lastPage],
+                    'contentTemplate' => 'MauticNotificationBundle:MobileNotification:index',
+                    'passthroughVars' => [
+                        'activeLink'    => '#mautic_mobile_notification_index',
+                        'mauticContent' => 'mobile_notification',
+                    ],
+                ]
+            );
+        }
+        $session->set('mautic.mobile_notification.page', $page);
+
+        return $this->delegateView(
+            [
+                'viewParameters' => [
+                    'searchValue' => $search,
+                    'items'       => $notifications,
+                    'totalItems'  => $count,
+                    'page'        => $page,
+                    'limit'       => $limit,
+                    'tmpl'        => $this->request->get('tmpl', 'index'),
+                    'permissions' => $permissions,
+                    'model'       => $model,
+                    'security'    => $this->get('mautic.security'),
+                ],
+                'contentTemplate' => 'MauticNotificationBundle:MobileNotification:list.html.php',
+                'passthroughVars' => [
+                    'activeLink'    => '#mautic_mobile_notification_index',
+                    'mauticContent' => 'mobile_notification',
+                    'route'         => $this->generateUrl('mautic_mobile_notification_index', ['page' => $page]),
+                ],
+            ]
+        );
+    }
+
+    /**
+     * Loads a specific form into the detailed panel.
+     *
+     * @param $objectId
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function viewAction($objectId)
+    {
+        /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
+        $model    = $this->getModel('notification');
+        $security = $this->get('mautic.security');
+
+        /** @var \Mautic\NotificationBundle\Entity\Notification $notification */
+        $notification = $model->getEntity($objectId);
+        //set the page we came from
+        $page = $this->get('session')->get('mautic.mobile_notification.page', 1);
+
+        if ($notification === null) {
+            //set the return URL
+            $returnUrl = $this->generateUrl('mautic_mobile_notification_index', ['page' => $page]);
+
+            return $this->postActionRedirect(
+                [
+                    'returnUrl'       => $returnUrl,
+                    'viewParameters'  => ['page' => $page],
+                    'contentTemplate' => 'MauticNotificationBundle:MobileNotification:index',
+                    'passthroughVars' => [
+                        'activeLink'    => '#mautic_mobile_notification_index',
+                        'mauticContent' => 'mobile_notification',
+                    ],
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.notification.error.notfound',
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ]
+            );
+        } elseif (!$this->get('mautic.security')->hasEntityAccess(
+            'notification:mobile_notifications:viewown',
+            'notification:mobile_notifications:viewother',
+            $notification->getCreatedBy()
+        )
+        ) {
+            return $this->accessDenied();
+        }
+
+        // Audit Log
+        $logs = $this->getModel('core.auditLog')->getLogForObject('notification', $notification->getId(), $notification->getDateAdded());
+
+        // Init the date range filter form
+        $dateRangeValues = $this->request->get('daterange', []);
+        $action          = $this->generateUrl('mautic_mobile_notification_action', ['objectAction' => 'view', 'objectId' => $objectId]);
+        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
+        $entityViews     = $model->getHitsLineChartData(
+            null,
+            new \DateTime($dateRangeForm->get('date_from')->getData()),
+            new \DateTime($dateRangeForm->get('date_to')->getData()),
+            null,
+            ['notification_id' => $notification->getId()]
+        );
+
+        // Get click through stats
+        $trackableLinks = $model->getNotificationClickStats($notification->getId());
+
+        return $this->delegateView([
+            'returnUrl'      => $this->generateUrl('mautic_mobile_notification_action', ['objectAction' => 'view', 'objectId' => $notification->getId()]),
+            'viewParameters' => [
+                'notification' => $notification,
+                'trackables'   => $trackableLinks,
+                'logs'         => $logs,
+                'permissions'  => $security->isGranted([
+                    'notification:mobile_notifications:viewown',
+                    'notification:mobile_notifications:viewother',
+                    'notification:mobile_notifications:create',
+                    'notification:mobile_notifications:editown',
+                    'notification:mobile_notifications:editother',
+                    'notification:mobile_notifications:deleteown',
+                    'notification:mobile_notifications:deleteother',
+                    'notification:mobile_notifications:publishown',
+                    'notification:mobile_notifications:publishother',
+                ], 'RETURN_ARRAY'),
+                'security'    => $security,
+                'entityViews' => $entityViews,
+                'contacts'    => $this->forward(
+                    'MauticNotificationBundle:MobileNotification:contacts',
+                    [
+                        'objectId'   => $notification->getId(),
+                        'page'       => $this->get('session')->get('mautic.mobile_notification.contact.page', 1),
+                        'ignoreAjax' => true,
+                    ]
+                )->getContent(),
+                'dateRangeForm' => $dateRangeForm->createView(),
+            ],
+            'contentTemplate' => 'MauticNotificationBundle:MobileNotification:details.html.php',
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ],
+        ]);
+    }
+
+    /**
+     * Generates new form and processes post data.
+     *
+     * @param Notification $entity
+     *
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction($entity = null)
+    {
+        /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
+        $model = $this->getModel('notification');
+
+        if (!$entity instanceof Notification) {
+            /** @var \Mautic\NotificationBundle\Entity\Notification $entity */
+            $entity = $model->getEntity();
+        }
+
+        $method  = $this->request->getMethod();
+        $session = $this->get('session');
+
+        if (!$this->get('mautic.security')->isGranted('notification:mobile_notifications:create')) {
+            return $this->accessDenied();
+        }
+
+        //set the page we came from
+        $page   = $session->get('mautic.mobile_notification.page', 1);
+        $action = $this->generateUrl('mautic_mobile_notification_action', ['objectAction' => 'new']);
+
+        $updateSelect = ($method == 'POST')
+            ? $this->request->request->get('notification[updateSelect]', false, true)
+            : $this->request->get('updateSelect', false);
+
+        if ($updateSelect) {
+            $entity->setNotificationType('template');
+        }
+
+        // create the form
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['update_select' => $updateSelect]);
+
+        ///Check for a submitted form and process it
+        if ($method == 'POST') {
+            $valid = false;
+            if (!$cancelled = $this->isFormCancelled($form)) {
+                if ($valid = $this->isFormValid($form)) {
+                    //form is valid so process the data
+                    $model->saveEntity($entity);
+
+                    $this->addFlash(
+                        'mautic.core.notice.created',
+                        [
+                            '%name%'      => $entity->getName(),
+                            '%menu_link%' => 'mautic_mobile_notification_index',
+                            '%url%'       => $this->generateUrl(
+                                'mautic_mobile_notification_action',
+                                [
+                                    'objectAction' => 'edit',
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ]
+                    );
+
+                    if ($form->get('buttons')->get('save')->isClicked()) {
+                        $viewParameters = [
+                            'objectAction' => 'view',
+                            'objectId'     => $entity->getId(),
+                        ];
+                        $returnUrl = $this->generateUrl('mautic_mobile_notification_action', $viewParameters);
+                        $template  = 'MauticNotificationBundle:MobileNotification:view';
+                    } else {
+                        //return edit view so that all the session stuff is loaded
+                        return $this->editAction($entity->getId(), true);
+                    }
+                }
+            } else {
+                $viewParameters = ['page' => $page];
+                $returnUrl      = $this->generateUrl('mautic_mobile_notification_index', $viewParameters);
+                $template       = 'MauticNotificationBundle:MobileNotification:index';
+                //clear any modified content
+                $session->remove('mautic.mobile_notification.'.$entity->getId().'.content');
+            }
+
+            $passthrough = [
+                'activeLink'    => 'mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ];
+
+            // Check to see if this is a popup
+            if (isset($form['updateSelect'])) {
+                $template    = false;
+                $passthrough = array_merge(
+                    $passthrough,
+                    [
+                        'updateSelect' => $form['updateSelect']->getData(),
+                        'id'           => $entity->getId(),
+                        'name'         => $entity->getName(),
+                        'group'        => $entity->getLanguage(),
+                    ]
+                );
+            }
+
+            if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
+                return $this->postActionRedirect(
+                    [
+                        'returnUrl'       => $returnUrl,
+                        'viewParameters'  => $viewParameters,
+                        'contentTemplate' => $template,
+                        'passthroughVars' => $passthrough,
+                    ]
+                );
+            }
+        }
+
+        $integration = $this->get('mautic.helper.integration')->getIntegrationObject('OneSignal');
+
+        return $this->delegateView(
+            [
+                'viewParameters' => [
+                    'form'         => $this->setFormTheme($form, 'MauticNotificationBundle:MobileNotification:form.html.php', 'MauticNotificationBundle:FormTheme\MobileNotification'),
+                    'notification' => $entity,
+                    'integration'  => $integration,
+                ],
+                'contentTemplate' => 'MauticNotificationBundle:MobileNotification:form.html.php',
+                'passthroughVars' => [
+                    'activeLink'    => '#mautic_mobile_notification_index',
+                    'mauticContent' => 'mobile_notification',
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
+                        'mautic_mobile_notification_action',
+                        [
+                            'objectAction' => 'new',
+                        ]
+                    ),
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @param      $objectId
+     * @param bool $ignorePost
+     * @param bool $forceTypeSelection
+     *
+     * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function editAction($objectId, $ignorePost = false, $forceTypeSelection = false)
+    {
+        /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
+        $model   = $this->getModel('notification');
+        $method  = $this->request->getMethod();
+        $entity  = $model->getEntity($objectId);
+        $session = $this->get('session');
+        $page    = $session->get('mautic.mobile_notification.page', 1);
+
+        //set the return URL
+        $returnUrl = $this->generateUrl('mautic_mobile_notification_index', ['page' => $page]);
+
+        $postActionVars = [
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
+            'contentTemplate' => 'MauticNotificationBundle:MobileNotification:index',
+            'passthroughVars' => [
+                'activeLink'    => 'mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ],
+        ];
+
+        //not found
+        if ($entity === null) {
+            return $this->postActionRedirect(
+                array_merge(
+                    $postActionVars,
+                    [
+                        'flashes' => [
+                            [
+                                'type'    => 'error',
+                                'msg'     => 'mautic.notification.error.notfound',
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
+                    ]
+                )
+            );
+        } elseif (!$this->get('mautic.security')->hasEntityAccess(
+            'notification:mobile_notifications:viewown',
+            'notification:mobile_notifications:viewother',
+            $entity->getCreatedBy()
+        )
+        ) {
+            return $this->accessDenied();
+        } elseif ($model->isLocked($entity)) {
+            //deny access if the entity is locked
+            return $this->isLocked($postActionVars, $entity, 'notification');
+        }
+
+        //Create the form
+        $action = $this->generateUrl('mautic_mobile_notification_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
+
+        $updateSelect = ($method == 'POST')
+            ? $this->request->request->get('notification[updateSelect]', false, true)
+            : $this->request->get('updateSelect', false);
+
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['update_select' => $updateSelect]);
+
+        ///Check for a submitted form and process it
+        if (!$ignorePost && $method == 'POST') {
+            $valid = false;
+            if (!$cancelled = $this->isFormCancelled($form)) {
+                if ($valid = $this->isFormValid($form)) {
+                    //form is valid so process the data
+                    $model->saveEntity($entity, $form->get('buttons')->get('save')->isClicked());
+
+                    $this->addFlash(
+                        'mautic.core.notice.updated',
+                        [
+                            '%name%'      => $entity->getName(),
+                            '%menu_link%' => 'mautic_mobile_notification_index',
+                            '%url%'       => $this->generateUrl(
+                                'mautic_mobile_notification_action',
+                                [
+                                    'objectAction' => 'edit',
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ],
+                        'warning'
+                    );
+                }
+            } else {
+                //clear any modified content
+                $session->remove('mautic.mobile_notification.'.$objectId.'.content');
+                //unlock the entity
+                $model->unlockEntity($entity);
+            }
+
+            $template    = 'MauticNotificationBundle:MobileNotification:view';
+            $passthrough = [
+                'activeLink'    => 'mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ];
+
+            // Check to see if this is a popup
+            if (isset($form['updateSelect'])) {
+                $template    = false;
+                $passthrough = array_merge(
+                    $passthrough,
+                    [
+                        'updateSelect' => $form['updateSelect']->getData(),
+                        'id'           => $entity->getId(),
+                        'name'         => $entity->getName(),
+                        'group'        => $entity->getLanguage(),
+                    ]
+                );
+            }
+
+            if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
+                $viewParameters = [
+                    'objectAction' => 'view',
+                    'objectId'     => $entity->getId(),
+                ];
+
+                return $this->postActionRedirect(
+                    array_merge(
+                        $postActionVars,
+                        [
+                            'returnUrl'       => $this->generateUrl('mautic_mobile_notification_action', $viewParameters),
+                            'viewParameters'  => $viewParameters,
+                            'contentTemplate' => $template,
+                            'passthroughVars' => $passthrough,
+                        ]
+                    )
+                );
+            }
+        } else {
+            //lock the entity
+            $model->lockEntity($entity);
+        }
+
+        $integration = $this->get('mautic.helper.integration')->getIntegrationObject('OneSignal');
+
+        return $this->delegateView(
+            [
+                'viewParameters' => [
+                    'form'               => $this->setFormTheme($form, 'MauticNotificationBundle:MobileNotification:form.html.php', 'MauticNotificationBundle:FormTheme\MobileNotification'),
+                    'notification'       => $entity,
+                    'forceTypeSelection' => $forceTypeSelection,
+                    'integration'        => $integration,
+                ],
+                'contentTemplate' => 'MauticNotificationBundle:MobileNotification:form.html.php',
+                'passthroughVars' => [
+                    'activeLink'    => '#mautic_mobile_notification_index',
+                    'mauticContent' => 'mobile_notification',
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
+                        'mautic_mobile_notification_action',
+                        [
+                            'objectAction' => 'edit',
+                            'objectId'     => $entity->getId(),
+                        ]
+                    ),
+                ],
+            ]
+        );
+    }
+
+    /**
+     * Clone an entity.
+     *
+     * @param $objectId
+     *
+     * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function cloneAction($objectId)
+    {
+        $model  = $this->getModel('notification');
+        $entity = $model->getEntity($objectId);
+
+        if ($entity != null) {
+            if (!$this->get('mautic.security')->isGranted('notification:mobile_notifications:create')
+                || !$this->get('mautic.security')->hasEntityAccess(
+                    'notification:mobile_notifications:viewown',
+                    'notification:mobile_notifications:viewother',
+                    $entity->getCreatedBy()
+                )
+            ) {
+                return $this->accessDenied();
+            }
+
+            $entity      = clone $entity;
+            $session     = $this->get('session');
+            $contentName = 'mautic.mobile_notification.'.$entity->getId().'.content';
+
+            $session->set($contentName, $entity->getContent());
+        }
+
+        return $this->newAction($entity);
+    }
+
+    /**
+     * Deletes the entity.
+     *
+     * @param   $objectId
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function deleteAction($objectId)
+    {
+        $page      = $this->get('session')->get('mautic.mobile_notification.page', 1);
+        $returnUrl = $this->generateUrl('mautic_mobile_notification_index', ['page' => $page]);
+        $flashes   = [];
+
+        $postActionVars = [
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
+            'contentTemplate' => 'MauticNotificationBundle:MobileNotification:index',
+            'passthroughVars' => [
+                'activeLink'    => 'mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ],
+        ];
+
+        if ($this->request->getMethod() == 'POST') {
+            $model  = $this->getModel('notification');
+            $entity = $model->getEntity($objectId);
+
+            if ($entity === null) {
+                $flashes[] = [
+                    'type'    => 'error',
+                    'msg'     => 'mautic.notification.error.notfound',
+                    'msgVars' => ['%id%' => $objectId],
+                ];
+            } elseif (!$this->get('mautic.security')->hasEntityAccess(
+                'notification:mobile_notifications:deleteown',
+                'notification:mobile_notifications:deleteother',
+                $entity->getCreatedBy()
+            )
+            ) {
+                return $this->accessDenied();
+            } elseif ($model->isLocked($entity)) {
+                return $this->isLocked($postActionVars, $entity, 'notification');
+            }
+
+            $model->deleteEntity($entity);
+
+            $flashes[] = [
+                'type'    => 'notice',
+                'msg'     => 'mautic.core.notice.deleted',
+                'msgVars' => [
+                    '%name%' => $entity->getName(),
+                    '%id%'   => $objectId,
+                ],
+            ];
+        } //else don't do anything
+
+        return $this->postActionRedirect(
+            array_merge(
+                $postActionVars,
+                [
+                    'flashes' => $flashes,
+                ]
+            )
+        );
+    }
+
+    /**
+     * Deletes a group of entities.
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function batchDeleteAction()
+    {
+        $page      = $this->get('session')->get('mautic.mobile_notification.page', 1);
+        $returnUrl = $this->generateUrl('mautic_mobile_notification_index', ['page' => $page]);
+        $flashes   = [];
+
+        $postActionVars = [
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
+            'contentTemplate' => 'MauticNotificationBundle:MobileNotification:index',
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_mobile_notification_index',
+                'mauticContent' => 'mobile_notification',
+            ],
+        ];
+
+        if ($this->request->getMethod() == 'POST') {
+            $model = $this->getModel('notification');
+            $ids   = json_decode($this->request->query->get('ids', '{}'));
+
+            $deleteIds = [];
+
+            // Loop over the IDs to perform access checks pre-delete
+            foreach ($ids as $objectId) {
+                $entity = $model->getEntity($objectId);
+
+                if ($entity === null) {
+                    $flashes[] = [
+                        'type'    => 'error',
+                        'msg'     => 'mautic.notification.error.notfound',
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
+                } elseif (!$this->get('mautic.security')->hasEntityAccess(
+                    'notification:mobile_notifications:viewown',
+                    'notification:mobile_notifications:viewother',
+                    $entity->getCreatedBy()
+                )
+                ) {
+                    $flashes[] = $this->accessDenied(true);
+                } elseif ($model->isLocked($entity)) {
+                    $flashes[] = $this->isLocked($postActionVars, $entity, 'notification', true);
+                } else {
+                    $deleteIds[] = $objectId;
+                }
+            }
+
+            // Delete everything we are able to
+            if (!empty($deleteIds)) {
+                $entities = $model->deleteEntities($deleteIds);
+
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.notification.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
+            }
+        } //else don't do anything
+
+        return $this->postActionRedirect(
+            array_merge(
+                $postActionVars,
+                [
+                    'flashes' => $flashes,
+                ]
+            )
+        );
+    }
+
+    /**
+     * @param $objectId
+     *
+     * @return JsonResponse|Response
+     */
+    public function previewAction($objectId)
+    {
+        /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
+        $model        = $this->getModel('notification');
+        $notification = $model->getEntity($objectId);
+
+        if ($notification != null
+            && $this->get('mautic.security')->hasEntityAccess(
+                'notification:mobile_notifications:editown',
+                'notification:mobile_notifications:editother'
+            )
+        ) {
+        }
+
+        return $this->delegateView(
+            [
+                'viewParameters' => [
+                    'notification' => $notification,
+                ],
+                'contentTemplate' => 'MauticNotificationBundle:MobileNotification:preview.html.php',
+            ]
+        );
+    }
+
+    /**
+     * @param     $objectId
+     * @param int $page
+     *
+     * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function contactsAction($objectId, $page = 1)
+    {
+        return $this->generateContactsGrid(
+            $objectId,
+            $page,
+            'notification:mobile_notifications:view',
+            'mobile_notification',
+            'push_notification_stats',
+            'mobile_notification',
+            'notification_id'
+        );
+    }
+}
diff --git a/app/bundles/NotificationBundle/Controller/NotificationController.php b/app/bundles/NotificationBundle/Controller/NotificationController.php
index ec8e2f817b1..1109d0b0af7 100644
--- a/app/bundles/NotificationBundle/Controller/NotificationController.php
+++ b/app/bundles/NotificationBundle/Controller/NotificationController.php
@@ -64,7 +64,16 @@ public function indexAction($page = 1)
         $search = $this->request->get('search', $session->get('mautic.notification.filter', ''));
         $session->set('mautic.notification.filter', $search);
 
-        $filter = ['string' => $search];
+        $filter = [
+            'string' => $search,
+            'where'  => [
+                [
+                    'expr' => 'eq',
+                    'col'  => 'mobile',
+                    'val'  => 0,
+                ],
+            ],
+        ];
 
         if (!$permissions['notification:notifications:viewother']) {
             $filter['force'][] =
diff --git a/app/bundles/NotificationBundle/Entity/Notification.php b/app/bundles/NotificationBundle/Entity/Notification.php
index ec28f26cdef..dc11388ad1e 100644
--- a/app/bundles/NotificationBundle/Entity/Notification.php
+++ b/app/bundles/NotificationBundle/Entity/Notification.php
@@ -108,6 +108,16 @@ class Notification extends FormEntity
      */
     private $notificationType = 'template';
 
+    /**
+     * @var bool
+     */
+    private $mobile = false;
+
+    /**
+     * @var array
+     */
+    private $mobileSettings;
+
     public function __clone()
     {
         $this->id        = null;
@@ -196,6 +206,10 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->cascadePersist()
             ->fetchExtraLazy()
             ->build();
+
+        $builder->createField('mobile', 'boolean')->build();
+
+        $builder->createField('mobileSettings', 'array')->build();
     }
 
     /**
@@ -591,4 +605,44 @@ public function setNotificationType($notificationType)
         $this->isChanged('notificationType', $notificationType);
         $this->notificationType = $notificationType;
     }
+
+    /**
+     * @return bool
+     */
+    public function isMobile()
+    {
+        return $this->mobile;
+    }
+
+    /**
+     * @param bool $mobile
+     *
+     * @return $this
+     */
+    public function setMobile($mobile)
+    {
+        $this->mobile = $mobile;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMobileSettings()
+    {
+        return $this->mobileSettings;
+    }
+
+    /**
+     * @param array $mobileSettings
+     *
+     * @return $this
+     */
+    public function setMobileSettings(array $mobileSettings)
+    {
+        $this->mobileSettings = $mobileSettings;
+
+        return $this;
+    }
 }
diff --git a/app/bundles/NotificationBundle/Entity/NotificationRepository.php b/app/bundles/NotificationBundle/Entity/NotificationRepository.php
index c7a70f5aeee..9a264d216b8 100644
--- a/app/bundles/NotificationBundle/Entity/NotificationRepository.php
+++ b/app/bundles/NotificationBundle/Entity/NotificationRepository.php
@@ -187,10 +187,10 @@ public function getNotificationList($search = '', $limit = 10, $start = 0, $view
             if (is_array($search)) {
                 $search = array_map('intval', $search);
                 $q->andWhere($q->expr()->in('e.id', ':search'))
-                  ->setParameter('search', $search);
+                    ->setParameter('search', $search);
             } else {
                 $q->andWhere($q->expr()->like('e.name', ':search'))
-                  ->setParameter('search', "%{$search}%");
+                    ->setParameter('search', "%{$search}%");
             }
         }
 
@@ -205,6 +205,56 @@ public function getNotificationList($search = '', $limit = 10, $start = 0, $view
             );
         }
 
+        $q->andWhere('e.mobile != 1');
+
+        $q->orderBy('e.name');
+
+        if (!empty($limit)) {
+            $q->setFirstResult($start)
+                ->setMaxResults($limit);
+        }
+
+        return $q->getQuery()->getArrayResult();
+    }
+
+    /**
+     * @param string $search
+     * @param int    $limit
+     * @param int    $start
+     * @param bool   $viewOther
+     * @param string $notificationType
+     *
+     * @return array
+     */
+    public function getMobileNotificationList($search = '', $limit = 10, $start = 0, $viewOther = false, $notificationType = null)
+    {
+        $q = $this->createQueryBuilder('e');
+        $q->select('partial e.{id, name, language}');
+
+        if (!empty($search)) {
+            if (is_array($search)) {
+                $search = array_map('intval', $search);
+                $q->andWhere($q->expr()->in('e.id', ':search'))
+                    ->setParameter('search', $search);
+            } else {
+                $q->andWhere($q->expr()->like('e.name', ':search'))
+                    ->setParameter('search', "%{$search}%");
+            }
+        }
+
+        if (!$viewOther) {
+            $q->andWhere($q->expr()->eq('e.createdBy', ':id'))
+                ->setParameter('id', $this->currentUser->getId());
+        }
+
+        if (!empty($notificationType)) {
+            $q->andWhere(
+                $q->expr()->eq('e.notificationType', $q->expr()->literal($notificationType))
+            );
+        }
+
+        $q->andWhere('e.mobile = 1');
+
         $q->orderBy('e.name');
 
         if (!empty($limit)) {
diff --git a/app/bundles/NotificationBundle/Entity/PushID.php b/app/bundles/NotificationBundle/Entity/PushID.php
index dd38fdf17a4..231a12b5305 100644
--- a/app/bundles/NotificationBundle/Entity/PushID.php
+++ b/app/bundles/NotificationBundle/Entity/PushID.php
@@ -32,6 +32,16 @@ class PushID
      */
     private $pushID;
 
+    /**
+     * @var bool
+     */
+    private $enabled;
+
+    /**
+     * @var bool
+     */
+    private $mobile;
+
     /**
      * @param ORM\ClassMetadata $metadata
      */
@@ -56,6 +66,9 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->addJoinColumn('lead_id', 'id', true, false, 'SET NULL')
             ->inversedBy('pushIds')
             ->build();
+
+        $builder->createField('enabled', 'boolean')->build();
+        $builder->createField('mobile', 'boolean')->build();
     }
 
     /**
@@ -117,4 +130,44 @@ public function setPushID($pushID)
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * @param $enabled
+     *
+     * @return $this
+     */
+    public function setEnabled($enabled)
+    {
+        $this->enabled = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isMobile()
+    {
+        return $this->mobile;
+    }
+
+    /**
+     * @param bool $mobile
+     *
+     * @return $this
+     */
+    public function setMobile($mobile)
+    {
+        $this->mobile = $mobile;
+
+        return $this;
+    }
 }
diff --git a/app/bundles/NotificationBundle/Entity/Stat.php b/app/bundles/NotificationBundle/Entity/Stat.php
index 59fc3306e95..151c50677da 100644
--- a/app/bundles/NotificationBundle/Entity/Stat.php
+++ b/app/bundles/NotificationBundle/Entity/Stat.php
@@ -52,6 +52,11 @@ class Stat
      */
     private $dateSent;
 
+    /**
+     * @var \DateTime
+     */
+    private $dateRead;
+
     /**
      * @var bool
      */
@@ -135,6 +140,10 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->columnName('date_sent')
             ->build();
 
+        $builder->createField('dateRead', 'datetime')
+            ->columnName('date_read')
+            ->build();
+
         $builder->createField('isClicked', 'boolean')
             ->columnName('is_clicked')
             ->build();
@@ -489,4 +498,24 @@ public function setClickDetails($clickDetails)
 
         return $this;
     }
+
+    /**
+     * @return \DateTime
+     */
+    public function getDateRead()
+    {
+        return $this->dateRead;
+    }
+
+    /**
+     * @param \DateTime $dateRead
+     *
+     * @return Stat
+     */
+    public function setDateRead($dateRead)
+    {
+        $this->dateRead = $dateRead;
+
+        return $this;
+    }
 }
diff --git a/app/bundles/NotificationBundle/Entity/StatRepository.php b/app/bundles/NotificationBundle/Entity/StatRepository.php
index 77471fd35c3..d2f8559800f 100644
--- a/app/bundles/NotificationBundle/Entity/StatRepository.php
+++ b/app/bundles/NotificationBundle/Entity/StatRepository.php
@@ -243,20 +243,20 @@ public function getMostNotifications($query, $limit = 10, $offset = 0)
     public function getSentCounts($notificationIds = [], \DateTime $fromDate = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->select('e.email_id, count(e.id) as sentcount')
-            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 'e')
+        $q->select('s.notification_id, count(n.id) as sentcount')
+            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 's')
             ->where(
-                $q->expr()->in('e.notification_id', $notificationIds)
+                $q->expr()->in('s.notification_id', $notificationIds)
             );
 
         if ($fromDate !== null) {
             //make sure the date is UTC
             $dt = new DateTimeHelper($fromDate);
             $q->andWhere(
-                $q->expr()->gte('e.date_read', $q->expr()->literal($dt->toUtcString()))
+                $q->expr()->gte('s.date_read', $q->expr()->literal($dt->toUtcString()))
             );
         }
-        $q->groupBy('e.notification_id');
+        $q->groupBy('s.notification_id');
 
         //get a total number of sent notifications first
         $results = $q->execute()->fetchAll();
diff --git a/app/bundles/NotificationBundle/Event/SendingNotificationEvent.php b/app/bundles/NotificationBundle/Event/SendingNotificationEvent.php
new file mode 100644
index 00000000000..3794dd294a2
--- /dev/null
+++ b/app/bundles/NotificationBundle/Event/SendingNotificationEvent.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Event;
+
+use Mautic\CoreBundle\Event\CommonEvent;
+use Mautic\LeadBundle\Entity\Lead;
+use Mautic\NotificationBundle\Entity\Notification;
+
+/**
+ * Class SendingNotificationEvent.
+ */
+class SendingNotificationEvent extends CommonEvent
+{
+    /**
+     * @var Lead
+     */
+    protected $lead;
+
+    /**
+     * @var Notification
+     */
+    protected $entity;
+
+    /**
+     * SendingNotificationEvent constructor.
+     *
+     * @param Notification $notification
+     * @param Lead         $lead
+     */
+    public function __construct(Notification $notification, Lead $lead)
+    {
+        $this->entity = $notification;
+        $this->lead   = $lead;
+    }
+
+    /**
+     * @return Notification
+     */
+    public function getNotification()
+    {
+        return $this->entity;
+    }
+
+    /**
+     * @param Notification $notification
+     *
+     * @return $this
+     */
+    public function setNotifiction(Notification $notification)
+    {
+        $this->entity = $notification;
+
+        return $this;
+    }
+
+    /**
+     * @return Lead
+     */
+    public function getLead()
+    {
+        return $this->lead;
+    }
+
+    /**
+     * @param Lead $lead
+     *
+     * @return $this
+     */
+    public function setLead(Lead $lead)
+    {
+        $this->lead = $lead;
+
+        return $this;
+    }
+}
diff --git a/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php b/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
index 4995da515d1..06e25f68901 100644
--- a/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
@@ -14,6 +14,7 @@
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\BuildJsEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\NotificationBundle\Helper\NotificationHelper;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -21,6 +22,21 @@
  */
 class BuildJsSubscriber extends CommonSubscriber
 {
+    /**
+     * @var NotificationHelper
+     */
+    protected $notificationHelper;
+
+    /**
+     * PageSubscriber constructor.
+     *
+     * @param NotificationHelper $notificationHelper
+     */
+    public function __construct(NotificationHelper $notificationHelper)
+    {
+        $this->notificationHelper = $notificationHelper;
+    }
+
     /**
      * @return array
      */
@@ -42,8 +58,14 @@ public function onBuildJs(BuildJsEvent $event)
         $height         = 450;
 
         $js = <<<JS
+        
+        {$this->notificationHelper->getHeaderScript()}
+       
 MauticJS.notification = {
     init: function () {
+        
+        {$this->notificationHelper->getScript()}
+         
         var subscribeButton = document.getElementById('mautic-notification-subscribe');
 
         if (subscribeButton) {
diff --git a/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php b/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
index 81cadef5656..7dbd63e5c27 100644
--- a/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
@@ -16,13 +16,15 @@
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\NotificationBundle\Api\AbstractNotificationApi;
 use Mautic\NotificationBundle\Event\NotificationSendEvent;
+use Mautic\NotificationBundle\Form\Type\MobileNotificationSendType;
+use Mautic\NotificationBundle\Form\Type\NotificationSendType;
 use Mautic\NotificationBundle\Model\NotificationModel;
 use Mautic\NotificationBundle\NotificationEvents;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 
 /**
  * Class CampaignSubscriber.
@@ -45,28 +47,28 @@ class CampaignSubscriber extends CommonSubscriber
     protected $notificationApi;
 
     /**
-     * @var CoreParametersHelper
+     * @var IntegrationHelper
      */
-    protected $coreParametersHelper;
+    protected $integrationHelper;
 
     /**
      * CampaignSubscriber constructor.
      *
-     * @param CoreParametersHelper    $coreParametersHelper
+     * @param IntegrationHelper       $integrationHelper
      * @param LeadModel               $leadModel
      * @param NotificationModel       $notificationModel
      * @param AbstractNotificationApi $notificationApi
      */
     public function __construct(
-        CoreParametersHelper $coreParametersHelper,
+        IntegrationHelper $integrationHelper,
         LeadModel $leadModel,
         NotificationModel $notificationModel,
         AbstractNotificationApi $notificationApi
     ) {
-        $this->coreParametersHelper = $coreParametersHelper;
-        $this->leadModel            = $leadModel;
-        $this->notificationModel    = $notificationModel;
-        $this->notificationApi      = $notificationApi;
+        $this->integrationHelper = $integrationHelper;
+        $this->leadModel         = $leadModel;
+        $this->notificationModel = $notificationModel;
+        $this->notificationApi   = $notificationApi;
     }
 
     /**
@@ -85,26 +87,52 @@ public static function getSubscribedEvents()
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
-        if ($this->coreParametersHelper->getParameter('notification_enabled')) {
+        $integration = $this->integrationHelper->getIntegrationObject('OneSignal');
+
+        if (!$integration || $integration->getIntegrationSettings()->getIsPublished() === false) {
+            return;
+        }
+
+        $features = $integration->getSupportedFeatures();
+        $settings = $integration->getIntegrationSettings();
+
+        if (in_array('mobile', $features)) {
             $event->addAction(
-                'notification.send_notification',
+                'notification.send_mobile_notification',
                 [
-                    'label'            => 'mautic.notification.campaign.send_notification',
-                    'description'      => 'mautic.notification.campaign.send_notification.tooltip',
+                    'label'            => 'mautic.notification.campaign.send_mobile_notification',
+                    'description'      => 'mautic.notification.campaign.send_mobile_notification.tooltip',
                     'eventName'        => NotificationEvents::ON_CAMPAIGN_TRIGGER_ACTION,
-                    'formType'         => 'notificationsend_list',
+                    'formType'         => MobileNotificationSendType::class,
                     'formTypeOptions'  => ['update_select' => 'campaignevent_properties_notification'],
                     'formTheme'        => 'MauticNotificationBundle:FormTheme\NotificationSendList',
                     'timelineTemplate' => 'MauticNotificationBundle:SubscribedEvents\Timeline:index.html.php',
-                    'channel'          => 'notification',
-                    'channelIdField'   => 'notification',
+                    'channel'          => 'mobile_notification',
+                    'channelIdField'   => 'mobile_notification',
                 ]
             );
         }
+
+        $event->addAction(
+            'notification.send_notification',
+            [
+                'label'            => 'mautic.notification.campaign.send_notification',
+                'description'      => 'mautic.notification.campaign.send_notification.tooltip',
+                'eventName'        => NotificationEvents::ON_CAMPAIGN_TRIGGER_ACTION,
+                'formType'         => NotificationSendType::class,
+                'formTypeOptions'  => ['update_select' => 'campaignevent_properties_notification'],
+                'formTheme'        => 'MauticNotificationBundle:FormTheme\NotificationSendList',
+                'timelineTemplate' => 'MauticNotificationBundle:SubscribedEvents\Timeline:index.html.php',
+                'channel'          => 'notification',
+                'channelIdField'   => 'notification',
+            ]
+        );
     }
 
     /**
      * @param CampaignExecutionEvent $event
+     *
+     * @return CampaignExecutionEvent
      */
     public function onCampaignTriggerAction(CampaignExecutionEvent $event)
     {
@@ -121,6 +149,16 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $playerID = [];
 
         foreach ($pushIDs as $pushID) {
+            // Skip non-mobile PushIDs if this is a mobile event
+            if ($event->checkContext('notification.send_mobile_notification') && $pushID->isMobile() == false) {
+                continue;
+            }
+
+            // Skip mobile PushIDs if this is a non-mobile event
+            if ($event->checkContext('notification.send_notification') && $pushID->isMobile() == true) {
+                continue;
+            }
+
             $playerID[] = $pushID->getPushID();
         }
 
@@ -163,12 +201,13 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
             new NotificationSendEvent($tokenEvent->getContent(), $notification->getHeading(), $lead)
         );
 
+        $notification->setUrl($url);
+        $notification->setMessage($sendEvent->getMessage());
+        $notification->setHeading($sendEvent->getHeading());
+
         $response = $this->notificationApi->sendNotification(
             $playerID,
-            $sendEvent->getMessage(),
-            $sendEvent->getHeading(),
-            $url,
-            $notification->getButton()
+            $notification
         );
 
         $event->setChannel('notification', $notification->getId());
diff --git a/app/bundles/NotificationBundle/EventListener/ChannelSubscriber.php b/app/bundles/NotificationBundle/EventListener/ChannelSubscriber.php
index 5973de97080..22d0d7e462f 100644
--- a/app/bundles/NotificationBundle/EventListener/ChannelSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/ChannelSubscriber.php
@@ -15,6 +15,7 @@
 use Mautic\ChannelBundle\Event\ChannelEvent;
 use Mautic\ChannelBundle\Model\MessageModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\ReportBundle\Model\ReportModel;
 
 /**
@@ -22,6 +23,21 @@
  */
 class ChannelSubscriber extends CommonSubscriber
 {
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
+    /**
+     * ChannelSubscriber constructor.
+     *
+     * @param IntegrationHelper $integrationHelper
+     */
+    public function __construct(IntegrationHelper $integrationHelper)
+    {
+        $this->integrationHelper = $integrationHelper;
+    }
+
     /**
      * @return array
      */
@@ -37,7 +53,9 @@ public static function getSubscribedEvents()
      */
     public function onAddChannel(ChannelEvent $event)
     {
-        if (!empty($this->params['notification_enabled'])) {
+        $integration = $this->integrationHelper->getIntegrationObject('OneSignal');
+
+        if ($integration && $integration->getIntegrationSettings()->getIsPublished()) {
             $event->addChannel(
                 'notification',
                 [
@@ -50,6 +68,10 @@ public function onAddChannel(ChannelEvent $event)
                         ],
                         'lookupFormType' => 'notification_list',
                         'repository'     => 'MauticNotificationBundle:Notification',
+                        'lookupOptions'  => [
+                            'mobile'  => false,
+                            'desktop' => true,
+                        ],
                     ],
                     ReportModel::CHANNEL_FEATURE => [
                         'table' => 'push_notifications',
@@ -57,5 +79,29 @@ public function onAddChannel(ChannelEvent $event)
                 ]
             );
         }
+
+        $supportedFeatures = $integration->getSupportedFeatures();
+
+        if (in_array('mobile', $supportedFeatures)) {
+            $event->addChannel(
+                'mobile_notification',
+                [
+                    MessageModel::CHANNEL_FEATURE => [
+                        'campaignAction'             => 'notification.send_mobile_notification',
+                        'campaignDecisionsSupported' => [
+                            'page.pagehit',
+                            'asset.download',
+                            'form.submit',
+                        ],
+                        'lookupFormType' => 'notification_list',
+                        'repository'     => 'MauticNotificationBundle:Notification',
+                        'lookupOptions'  => [
+                            'mobile'  => true,
+                            'desktop' => false,
+                        ],
+                    ],
+                ]
+            );
+        }
     }
 }
diff --git a/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php b/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php
deleted file mode 100644
index 37dfe4f944e..00000000000
--- a/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * @copyright   2016 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\NotificationBundle\EventListener;
-
-use Mautic\ConfigBundle\ConfigEvents;
-use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-
-/**
- * Class ConfigSubscriber.
- */
-class ConfigSubscriber extends CommonSubscriber
-{
-    /**
-     * @return array
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
-        ];
-    }
-
-    public function onConfigGenerate(ConfigBuilderEvent $event)
-    {
-        $event->addForm([
-            'bundle'     => 'NotificationBundle',
-            'formAlias'  => 'notificationconfig',
-            'formTheme'  => 'MauticNotificationBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticNotificationBundle'),
-        ]);
-    }
-}
diff --git a/app/bundles/NotificationBundle/EventListener/FormSubscriber.php b/app/bundles/NotificationBundle/EventListener/FormSubscriber.php
new file mode 100644
index 00000000000..757e1782f5a
--- /dev/null
+++ b/app/bundles/NotificationBundle/EventListener/FormSubscriber.php
@@ -0,0 +1,197 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\EventListener;
+
+use Mautic\CoreBundle\Event\TokenReplacementEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\FormBundle\Event\FormBuilderEvent;
+use Mautic\FormBundle\Event\SubmissionEvent;
+use Mautic\FormBundle\FormEvents;
+use Mautic\LeadBundle\Entity\DoNotContact;
+use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\NotificationBundle\Api\AbstractNotificationApi;
+use Mautic\NotificationBundle\Event\NotificationSendEvent;
+use Mautic\NotificationBundle\Model\NotificationModel;
+use Mautic\NotificationBundle\NotificationEvents;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
+
+/**
+ * Class FormSubscriber.
+ */
+class FormSubscriber extends CommonSubscriber
+{
+    /**
+     * @var LeadModel
+     */
+    protected $leadModel;
+
+    /**
+     * @var NotificationModel
+     */
+    protected $notificationModel;
+
+    /**
+     * @var AbstractNotificationApi
+     */
+    protected $notificationApi;
+
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
+    /**
+     * CampaignSubscriber constructor.
+     *
+     * @param IntegrationHelper       $integrationHelper
+     * @param LeadModel               $leadModel
+     * @param NotificationModel       $notificationModel
+     * @param AbstractNotificationApi $notificationApi
+     */
+    public function __construct(
+        IntegrationHelper $integrationHelper,
+        LeadModel $leadModel,
+        NotificationModel $notificationModel,
+        AbstractNotificationApi $notificationApi
+    ) {
+        $this->integrationHelper = $integrationHelper;
+        $this->leadModel         = $leadModel;
+        $this->notificationModel = $notificationModel;
+        $this->notificationApi   = $notificationApi;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            FormEvents::FORM_ON_BUILD                            => ['onFormBuild', 0],
+            NotificationEvents::NOTIFICATION_ON_FORM_ACTION_SEND => ['onFormActionSend', 0],
+        ];
+    }
+
+    /**
+     * @param FormBuilderEvent $event
+     */
+    public function onFormBuild(FormBuilderEvent $event)
+    {
+        $action = [
+            'group'       => 'mautic.notification.actions',
+            'description' => 'mautic.notification.actions.mobile_tooltip',
+            'label'       => 'mautic.notification.actions.send_mobile_notification',
+            'formType'    => 'notification_list',
+            'formTheme'   => 'MauticNotificationBundle:FormTheme\NotificationSendList',
+            'eventName'   => NotificationEvents::NOTIFICATION_ON_FORM_ACTION_SEND,
+        ];
+        $event->addSubmitAction('notification.send_mobile_notification', $action);
+    }
+
+    public function onFormActionSend(SubmissionEvent $event)
+    {
+        $lead         = $event->getLead();
+        $actionConfig = $event->getActionConfig();
+
+        if ($this->leadModel->isContactable($lead, 'notification') !== DoNotContact::IS_CONTACTABLE) {
+            return $event->setFailed('mautic.notification.campaign.failed.not_contactable');
+        }
+
+        // If lead has subscribed on multiple devices, get all of them.
+        /** @var \Mautic\NotificationBundle\Entity\PushID[] $pushIDs */
+        $pushIDs = $lead->getPushIDs();
+
+        $playerID = [];
+
+        foreach ($pushIDs as $pushID) {
+            // Skip non-mobile PushIDs if this is a mobile event
+            if ($event->checkContext('notification.send_mobile_notification') && $pushID->isMobile() == false) {
+                continue;
+            }
+
+            // Skip mobile PushIDs if this is a non-mobile event
+            if ($event->checkContext('notification.send_notification') && $pushID->isMobile() == true) {
+                continue;
+            }
+
+            $playerID[] = $pushID->getPushID();
+        }
+
+        if (empty($playerID)) {
+            return $event->setFailed('mautic.notification.campaign.failed.not_subscribed');
+        }
+
+        $notificationId = (int) $actionConfig['properties'][0];
+
+        /** @var \Mautic\NotificationBundle\Entity\Notification $notification */
+        $notification = $this->notificationModel->getEntity($notificationId);
+
+        if ($notification->getId() !== $notificationId) {
+            return $event->setFailed('mautic.notification.campaign.failed.missing_entity');
+        }
+
+        if ($url = $notification->getUrl()) {
+            $url = $this->notificationApi->convertToTrackedUrl(
+                $url,
+                [
+                    'notification' => $notification->getId(),
+                    'lead'         => $lead->getId(),
+                ]
+            );
+        }
+
+        /** @var TokenReplacementEvent $tokenEvent */
+        $tokenEvent = $this->dispatcher->dispatch(
+            NotificationEvents::TOKEN_REPLACEMENT,
+            new TokenReplacementEvent(
+                $notification->getMessage(),
+                $lead,
+                ['channel' => ['notification', $notification->getId()]]
+            )
+        );
+
+        /** @var NotificationSendEvent $sendEvent */
+        $sendEvent = $this->dispatcher->dispatch(
+            NotificationEvents::NOTIFICATION_ON_SEND,
+            new NotificationSendEvent($tokenEvent->getContent(), $notification->getHeading(), $lead)
+        );
+
+        $notification->setUrl($url);
+        $notification->setMessage($sendEvent->getMessage());
+        $notification->setHeading($sendEvent->getHeading());
+
+        $response = $this->notificationApi->sendNotification(
+            $playerID,
+            $notification
+        );
+
+        $event->setChannel('notification', $notification->getId());
+
+        // If for some reason the call failed, tell mautic to try again by return false
+        if ($response->code !== 200) {
+            return $event->setResult(false);
+        }
+
+        $this->notificationModel->createStatEntry($notification, $lead);
+        $this->notificationModel->getRepository()->upCount($notificationId);
+
+        $result = [
+            'status'  => 'mautic.notification.timeline.status.delivered',
+            'type'    => 'mautic.notification.notification',
+            'id'      => $notification->getId(),
+            'name'    => $notification->getName(),
+            'heading' => $sendEvent->getHeading(),
+            'content' => $sendEvent->getMessage(),
+        ];
+
+        $event->setResult($result);
+    }
+}
diff --git a/app/bundles/NotificationBundle/EventListener/PageSubscriber.php b/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
index 878ec95c6fc..2be8bd8a904 100644
--- a/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
@@ -12,11 +12,10 @@
 namespace Mautic\NotificationBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
 use Mautic\PageBundle\Event\PageDisplayEvent;
 use Mautic\PageBundle\PageEvents;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 
 /**
  * Class PageSubscriber.
@@ -24,25 +23,25 @@
 class PageSubscriber extends CommonSubscriber
 {
     /**
-     * @var CoreParametersHelper
+     * @var AssetsHelper
      */
-    protected $coreParametersHelper;
+    protected $assetsHelper;
 
     /**
-     * @var AssetsHelper
+     * @var IntegrationHelper
      */
-    protected $assetsHelper;
+    protected $integrationHelper;
 
     /**
      * PageSubscriber constructor.
      *
-     * @param AssetsHelper         $assetsHelper
-     * @param CoreParametersHelper $coreParametersHelper
+     * @param AssetsHelper      $assetsHelper
+     * @param IntegrationHelper $integrationHelper
      */
-    public function __construct(AssetsHelper $assetsHelper, CoreParametersHelper $coreParametersHelper)
+    public function __construct(AssetsHelper $assetsHelper, IntegrationHelper $integrationHelper)
     {
-        $this->assetsHelper         = $assetsHelper;
-        $this->coreParametersHelper = $coreParametersHelper;
+        $this->assetsHelper      = $assetsHelper;
+        $this->integrationHelper = $integrationHelper;
     }
 
     /**
@@ -60,72 +59,15 @@ public static function getSubscribedEvents()
      */
     public function onPageDisplay(PageDisplayEvent $event)
     {
-        if (!$this->coreParametersHelper->getParameter('notification_landing_page_enabled')) {
-            return;
-        }
-        $appId                      = $this->coreParametersHelper->getParameter('notification_app_id');
-        $safariWebId                = $this->coreParametersHelper->getParameter('notification_safari_web_id');
-        $welcomenotificationEnabled = $this->coreParametersHelper->getParameter('welcomenotification_enabled');
-
-        $this->assetsHelper->addScript($this->router->generate('mautic_js', [], UrlGeneratorInterface::ABSOLUTE_URL), 'onPageDisplay_headClose', true, 'mautic_js');
-        $this->assetsHelper->addScript('https://cdn.onesignal.com/sdks/OneSignalSDK.js', 'onPageDisplay_headClose');
-
-        $manifestUrl = $this->router->generate('mautic_onesignal_manifest');
-        $this->assetsHelper->addCustomDeclaration('<link rel="manifest" href="'.$manifestUrl.'" />', 'onPageDisplay_headClose');
-
-        $leadAssociationUrl = $this->router->generate('mautic_subscribe_notification', [], UrlGeneratorInterface::ABSOLUTE_URL);
-
-        $welcomenotificationText = '';
-        if (!$welcomenotificationEnabled) {
-            $welcomenotificationText = 'welcomeNotification: { "disable": true },';
-        }
-
-        $oneSignalInit = <<<JS
-
-    var OneSignal = OneSignal || [];
-    
-    OneSignal.push(["init", {
-        appId: "{$appId}",
-        safari_web_id: "{$safariWebId}",
-        autoRegister: true,
-        {$welcomenotificationText}
-        notifyButton: {
-            enable: false // Set to false to hide
-        }
-    }]);
-
-    var postUserIdToMautic = function(userId) {
-        var xhr = new XMLHttpRequest();
-
-        xhr.open('post', '{$leadAssociationUrl}', true);
-        xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-        xhr.send('osid=' + userId);
-    };
+        $integrationObject = $this->integrationHelper->getIntegrationObject('OneSignal');
+        $settings          = $integrationObject->getIntegrationSettings();
+        $features          = $settings->getFeatureSettings();
 
-    OneSignal.getUserId(function(userId) {
-        if (! userId) {
-            OneSignal.on('subscriptionChange', function(isSubscribed) {
-                if (isSubscribed) {
-                    OneSignal.getUserId(function(newUserId) {
-                        postUserIdToMautic(newUserId);
-                    });
-                }
-            });
-        } else {
-            postUserIdToMautic(userId);
+        $script = '';
+        if (!in_array('landing_page_enabled', $features)) {
+            $script = 'disable_notification = true;';
         }
-    });
-    
-    // Just to be sure we've grabbed the ID
-    window.onbeforeunload = function() {
-        OneSignal.getUserId(function(userId) {
-            if (userId) {
-                postUserIdToMautic(userId);
-            }        
-        });    
-    };
-JS;
 
-        $this->assetsHelper->addScriptDeclaration($oneSignalInit, 'onPageDisplay_headClose');
+        $this->assetsHelper->addScriptDeclaration($script, 'onPageDisplay_headClose');
     }
 }
diff --git a/app/bundles/NotificationBundle/EventListener/ReportSubscriber.php b/app/bundles/NotificationBundle/EventListener/ReportSubscriber.php
new file mode 100644
index 00000000000..8fe3bc0f8fe
--- /dev/null
+++ b/app/bundles/NotificationBundle/EventListener/ReportSubscriber.php
@@ -0,0 +1,328 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\EventListener;
+
+use Doctrine\DBAL\Connection;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\ReportBundle\Event\ReportBuilderEvent;
+use Mautic\ReportBundle\Event\ReportGeneratorEvent;
+use Mautic\ReportBundle\Event\ReportGraphEvent;
+use Mautic\ReportBundle\ReportEvents;
+
+/**
+ * Class ReportSubscriber.
+ */
+class ReportSubscriber extends CommonSubscriber
+{
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    /**
+     * ReportSubscriber constructor.
+     *
+     * @param Connection $db
+     */
+    public function __construct(Connection $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
+            ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
+            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
+        ];
+    }
+
+    /**
+     * Add available tables and columns to the report builder lookup.
+     *
+     * @param ReportBuilderEvent $event
+     */
+    public function onReportBuilder(ReportBuilderEvent $event)
+    {
+        if ($event->checkContext(['mobile_notifications', 'mobile_notifications.stats'])) {
+            $prefix               = 'pn.';
+            $channelUrlTrackables = 'cut.';
+            $columns              = [
+                $prefix.'heading' => [
+                    'label' => 'mautic.notification.mobile_notification.heading',
+                    'type'  => 'string',
+                ],
+                $prefix.'lang' => [
+                    'label' => 'mautic.core.language',
+                    'type'  => 'string',
+                ],
+                $prefix.'read_count' => [
+                    'label' => 'mautic.mobile_notification.report.read_count',
+                    'type'  => 'int',
+                ],
+                'read_ratio' => [
+                    'alias'   => 'read_ratio',
+                    'label'   => 'mautic.mobile_notification.report.read_ratio',
+                    'type'    => 'string',
+                    'formula' => 'CONCAT(ROUND(('.$prefix.'read_count/'.$prefix.'sent_count)*100),\'%\')',
+                ],
+                $prefix.'sent_count' => [
+                    'label' => 'mautic.mobile_notification.report.sent_count',
+                    'type'  => 'int',
+                ],
+                'hits' => [
+                    'alias'   => 'hits',
+                    'label'   => 'mautic.mobile_notification.report.hits_count',
+                    'type'    => 'string',
+                    'formula' => $channelUrlTrackables.'hits',
+                ],
+                'unique_hits' => [
+                    'alias'   => 'unique_hits',
+                    'label'   => 'mautic.mobile_notification.report.unique_hits_count',
+                    'type'    => 'string',
+                    'formula' => $channelUrlTrackables.'unique_hits',
+                ],
+                'hits_ratio' => [
+                    'alias'   => 'hits_ratio',
+                    'label'   => 'mautic.mobile_notification.report.hits_ratio',
+                    'type'    => 'string',
+                    'formula' => 'CONCAT(ROUND('.$channelUrlTrackables.'hits/('.$prefix.'sent_count * '.$channelUrlTrackables
+                        .'trackable_count)*100),\'%\')',
+                ],
+                'unique_ratio' => [
+                    'alias'   => 'unique_ratio',
+                    'label'   => 'mautic.mobile_notification.report.unique_ratio',
+                    'type'    => 'string',
+                    'formula' => 'CONCAT(ROUND('.$channelUrlTrackables.'unique_hits/('.$prefix.'sent_count * '.$channelUrlTrackables
+                        .'trackable_count)*100),\'%\')',
+                ],
+            ];
+            $columns = array_merge(
+                $columns,
+                $event->getStandardColumns($prefix, [], 'mautic_mobile_notification_action'),
+                $event->getCategoryColumns()
+            );
+            $data = [
+                'display_name' => 'mautic.notification.mobile_notifications',
+                'columns'      => $columns,
+            ];
+
+            $event->addTable('mobile_notifications', $data);
+
+            if ($event->checkContext('mobile_notifications.stats')) {
+                // Ratios are not applicable for individual stats
+                unset($columns['read_ratio'], $columns['unsubscribed_ratio'], $columns['hits_ratio'], $columns['unique_ratio']);
+
+                // Mobile Notification counts are not applicable for individual stats
+                unset($columns[$prefix.'read_count']);
+
+                $statPrefix  = 'pns.';
+                $statColumns = [
+                    $statPrefix.'date_sent' => [
+                        'label' => 'mautic.mobile_notifications.report.stat.date_sent',
+                        'type'  => 'datetime',
+                    ],
+                    $statPrefix.'date_read' => [
+                        'label' => 'mautic.mobile_notifications.report.stat.date_read',
+                        'type'  => 'datetime',
+                    ],
+                    $statPrefix.'source' => [
+                        'label' => 'mautic.report.field.source',
+                        'type'  => 'string',
+                    ],
+                    $statPrefix.'source_id' => [
+                        'label' => 'mautic.report.field.source_id',
+                        'type'  => 'int',
+                    ],
+                ];
+
+                $data = [
+                    'display_name' => 'mautic.mobile_notification.stats.report.table',
+                    'columns'      => array_merge($columns, $statColumns, $event->getLeadColumns(), $event->getIpColumn()),
+                ];
+                $context = 'mobile_notifications.stats';
+
+                // Register table
+                $event->addTable($context, $data, 'mobile_notifications');
+
+                // Register Graphs
+                $event->addGraph($context, 'line', 'mautic.mobile_notification.graph.line.stats');
+                $event->addGraph($context, 'table', 'mautic.mobile_notification.table.most.mobile_notifications.sent');
+                $event->addGraph($context, 'table', 'mautic.mobile_notification.table.most.mobile_notifications.read');
+                $event->addGraph($context, 'table', 'mautic.mobile_notification.table.most.mobile_notifications.read.percent');
+            }
+        }
+    }
+
+    /**
+     * Initialize the QueryBuilder object to generate reports from.
+     *
+     * @param ReportGeneratorEvent $event
+     */
+    public function onReportGenerate(ReportGeneratorEvent $event)
+    {
+        $context = $event->getContext();
+        $qb      = $event->getQueryBuilder();
+
+        // channel_url_trackables subquery
+        $qbcut        = $this->db->createQueryBuilder();
+        $clickColumns = ['hits', 'unique_hits', 'hits_ratio', 'unique_ratio'];
+
+        if ($event->checkContext(['mobile_notifications', 'mobile_notifications.stats'])) {
+            // Ensure this only stats mobile notifications
+            $qb->andWhere('pn.mobile = 1');
+        }
+
+        switch ($context) {
+            case 'mobile_notifications':
+                $qb->from(MAUTIC_TABLE_PREFIX.'push_notifications', 'pn');
+                $event->addCategoryLeftJoin($qb, 'pn');
+
+                if ($event->hasColumn($clickColumns) || $event->hasFilter($clickColumns)) {
+                    $qbcut->select(
+                        'COUNT(cut2.channel_id) AS trackable_count, SUM(cut2.hits) AS hits',
+                        'SUM(cut2.unique_hits) AS unique_hits',
+                        'cut2.channel_id'
+                    )
+                        ->from(MAUTIC_TABLE_PREFIX.'channel_url_trackables', 'cut2')
+                        ->where('cut2.channel = \'notification\'')
+                        ->groupBy('cut2.channel_id');
+                    $qb->leftJoin('pn', sprintf('(%s)', $qbcut->getSQL()), 'cut', 'pn.id = cut.channel_id');
+                }
+                break;
+            case 'mobile_notifications.stats':
+                $qb->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 'pns')
+                    ->leftJoin('pns', MAUTIC_TABLE_PREFIX.'push_notifications', 'pn', 'pn.id = pns.notification_id');
+
+                $event->addCategoryLeftJoin($qb, 'pn')
+                    ->addLeadLeftJoin($qb, 'pns')
+                    ->addIpAddressLeftJoin($qb, 'pns')
+                    ->applyDateFilters($qb, 'date_sent', 'pns');
+
+                if ($event->hasColumn($clickColumns) || $event->hasFilter($clickColumns)) {
+                    $qbcut->select('COUNT(ph.id) AS hits', 'COUNT(DISTINCT(ph.redirect_id)) AS unique_hits', 'cut2.channel_id', 'ph.lead_id')
+                        ->from(MAUTIC_TABLE_PREFIX.'channel_url_trackables', 'cut2')
+                        ->join(
+                            'cut2',
+                            MAUTIC_TABLE_PREFIX.'page_hits',
+                            'ph',
+                            'cut2.redirect_id = ph.redirect_id AND cut2.channel_id = ph.source_id'
+                        )
+                        ->where('cut2.channel = \'email\' AND ph.source = \'email\'')
+                        ->groupBy('cut2.channel_id, ph.lead_id');
+                    $qb->leftJoin('pn', sprintf('(%s)', $qbcut->getSQL()), 'cut', 'pn.id = cut.channel_id AND pns.lead_id = cut.lead_id');
+                }
+                break;
+        }
+
+        $event->setQueryBuilder($qb);
+    }
+
+    /**
+     * Initialize the QueryBuilder object to generate reports from.
+     *
+     * @param ReportGraphEvent $event
+     */
+    public function onReportGraphGenerate(ReportGraphEvent $event)
+    {
+        // Context check, we only want to fire for Mobile Notification reports
+        if (!$event->checkContext('mobile_notification.stats')) {
+            return;
+        }
+
+        $graphs   = $event->getRequestedGraphs();
+        $qb       = $event->getQueryBuilder();
+        $statRepo = $this->em->getRepository('MauticNotificationBundle:Stat');
+
+        foreach ($graphs as $g) {
+            $options      = $event->getOptions($g);
+            $queryBuilder = clone $qb;
+
+            $chartQuery = clone $options['chartQuery'];
+            $origQuery  = clone $queryBuilder;
+            $chartQuery->applyDateFilters($queryBuilder, 'date_sent', 'pns');
+
+            switch ($g) {
+                case 'mautic.mobile_notification.graph.line.stats':
+                    $chart     = new LineChart(null, $options['dateFrom'], $options['dateTo']);
+                    $sendQuery = clone $queryBuilder;
+                    $readQuery = clone $origQuery;
+
+                    $readQuery->andWhere($qb->expr()->isNotNull('date_read'));
+                    $chartQuery->applyDateFilters($readQuery, 'date_read', 'pns');
+                    $chartQuery->modifyTimeDataQuery($sendQuery, 'date_sent', 'pns');
+                    $chartQuery->modifyTimeDataQuery($readQuery, 'date_read', 'pns');
+
+                    $sends = $chartQuery->loadAndBuildTimeData($sendQuery);
+                    $reads = $chartQuery->loadAndBuildTimeData($readQuery);
+                    $chart->setDataset($options['translator']->trans('mautic.mobile_notification.sent.mobile_notifications'), $sends);
+                    $chart->setDataset($options['translator']->trans('mautic.mobile_notification.read.mobile_notifications'), $reads);
+                    $data         = $chart->render();
+                    $data['name'] = $g;
+
+                    $event->setGraph($g, $data);
+                    break;
+
+                case 'mautic.mobile_notification.table.most.mobile_notifications.sent':
+                    $queryBuilder->select('pn.id, pn.heading as title, count(pns.id) as sent')
+                        ->groupBy('pn.id, pn.heading')
+                        ->orderBy('sent', 'DESC');
+                    $limit                  = 10;
+                    $offset                 = 0;
+                    $items                  = $statRepo->getMostNotifications($queryBuilder, $limit, $offset);
+                    $graphData              = [];
+                    $graphData['data']      = $items;
+                    $graphData['name']      = $g;
+                    $graphData['iconClass'] = 'fa-paper-plane-o';
+                    $graphData['link']      = 'mautic_mobile_notification_action';
+                    $event->setGraph($g, $graphData);
+                    break;
+
+                case 'mautic.mobile_notification.table.most.mobile_notifications.read':
+                    $queryBuilder->select('pn.id, pn.heading as title, count(CASE WHEN pns.is_read THEN 1 ELSE null END) as "read"')
+                        ->groupBy('pn.id, pn.heading')
+                        ->orderBy('"read"', 'DESC');
+                    $limit                  = 10;
+                    $offset                 = 0;
+                    $items                  = $statRepo->getMostNotifications($queryBuilder, $limit, $offset);
+                    $graphData              = [];
+                    $graphData['data']      = $items;
+                    $graphData['name']      = $g;
+                    $graphData['iconClass'] = 'fa-eye';
+                    $graphData['link']      = 'mautic_mobile_notification_action';
+                    $event->setGraph($g, $graphData);
+                    break;
+
+                case 'mautic.mobile_notification.table.most.mobile_notifications.read.percent':
+                    $queryBuilder->select('pn.id, pn.heading as title, round(pn.read_count / pn.sent_count * 100) as ratio')
+                        ->groupBy('pn.id, pn.heading')
+                        ->orderBy('ratio', 'DESC');
+                    $limit                  = 10;
+                    $offset                 = 0;
+                    $items                  = $statRepo->getMostNotifications($queryBuilder, $limit, $offset);
+                    $graphData              = [];
+                    $graphData['data']      = $items;
+                    $graphData['name']      = $g;
+                    $graphData['iconClass'] = 'fa-tachometer';
+                    $graphData['link']      = 'mautic_mobile_notification_action';
+                    $event->setGraph($g, $graphData);
+                    break;
+            }
+            unset($queryBuilder);
+        }
+    }
+}
diff --git a/app/bundles/NotificationBundle/Form/Type/ConfigType.php b/app/bundles/NotificationBundle/Form/Type/ConfigType.php
index 0f1f9582f99..17372842901 100644
--- a/app/bundles/NotificationBundle/Form/Type/ConfigType.php
+++ b/app/bundles/NotificationBundle/Form/Type/ConfigType.php
@@ -44,7 +44,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'mautic.notification.config.form.notification.landingpage.enabled',
                 'data'  => (bool) $options['data']['notification_landing_page_enabled'],
                 'attr'  => [
-                    'tooltip' => 'mautic.notification.config.form.notification.landingpage.enabled.tooltip',
+                    'tooltip'      => 'mautic.notification.config.form.notification.landingpage.enabled.tooltip',
+                    'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
+                ],
+            ]
+        );
+
+        $builder->add(
+            'notification_tracking_page_enabled',
+            'yesno_button_group',
+            [
+                'label' => 'mautic.notification.config.form.notification.trackingpage.enabled',
+                'data'  => (bool) $options['data']['notification_tracking_page_enabled'],
+                'attr'  => [
+                    'tooltip'      => 'mautic.notification.config.form.notification.trackingpage.enabled.tooltip',
+                    'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
                 ],
             ]
         );
@@ -104,6 +118,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
+        $builder->add(
+            'notification_subdomain_name',
+            'text',
+            [
+                'label' => 'mautic.notification.config.form.notification.subdomain_name',
+                'data'  => $options['data']['notification_subdomain_name'],
+                'attr'  => [
+                    'tooltip'      => 'mautic.notification.config.form.notification.subdomain_name.tooltip',
+                    'class'        => 'form-control',
+                    'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
+                ],
+            ]
+        );
+
         $builder->add(
             'welcomenotification_enabled',
             'yesno_button_group',
@@ -111,7 +139,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'mautic.notification.config.form.notification.welcome.enabled',
                 'data'  => (bool) $options['data']['welcomenotification_enabled'],
                 'attr'  => [
-                    'tooltip'      => 'mautic.notification.config.form.notification.welcome.tooltip',
+                    'tooltip'      => 'mautic.notification.config.form.notification.welcome.enabled.tooltip',
                     'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
                 ],
             ]
diff --git a/app/bundles/NotificationBundle/Form/Type/MobileNotificationDetailsType.php b/app/bundles/NotificationBundle/Form/Type/MobileNotificationDetailsType.php
new file mode 100644
index 00000000000..19ce202ab4e
--- /dev/null
+++ b/app/bundles/NotificationBundle/Form/Type/MobileNotificationDetailsType.php
@@ -0,0 +1,281 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Form\Type;
+
+use Mautic\CoreBundle\Form\Type\ButtonGroupType;
+use Mautic\CoreBundle\Form\Type\SortableListType;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MobileNotificationDetailsType extends AbstractType
+{
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
+    /**
+     * MobileNotificationDetailsType constructor.
+     *
+     * @param IntegrationHelper $integrationHelper
+     */
+    public function __construct(IntegrationHelper $integrationHelper)
+    {
+        $this->integrationHelper = $integrationHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $integration = $this->integrationHelper->getIntegrationObject('OneSignal');
+        $settings    = $integration->getIntegrationSettings()->getFeatureSettings();
+
+        $builder->add(
+            'additional_data',
+            SortableListType::class,
+            [
+                'required'        => false,
+                'label'           => 'mautic.notification.tab.data',
+                'option_required' => false,
+                'with_labels'     => true,
+            ]
+        );
+
+        if (in_array('ios', $settings['platforms'])) {
+            $builder->add(
+                'ios_subtitle',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_subtitle',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.ios_subtitle.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+            $builder->add(
+                'ios_sound',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_sound',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.ios_sound.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'ios_badges',
+                ButtonGroupType::class,
+                [
+                    'choices' => [
+                        'SetTo'    => 'mautic.notification.form.mobile.ios_badges.set',
+                        'Increase' => 'mautic.notification.form.mobile.ios_badges.increment',
+                    ],
+                    'attr' => [
+                        'tooltip' => 'mautic.notification.form.mobile.ios_badges.tooltip',
+                    ],
+                    'label'       => 'mautic.notification.form.mobile.ios_badges',
+                    'empty_data'  => 'None',
+                    'required'    => false,
+                    'placeholder' => 'mautic.notification.form.mobile.ios_badges.placeholder',
+                    'expanded'    => true,
+                    'multiple'    => false,
+                ]
+            );
+
+            $builder->add(
+                'ios_badgeCount',
+                IntegerType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_badgecount',
+                    'attr'  => [
+                        'class'        => 'form-control',
+                        'tooltip'      => 'mautic.notification.form.mobile.ios_badgecount.tooltip',
+                        'data-show-on' => '{"mobile_notification_mobileSettings_ios_badges_placeholder":""}',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'ios_contentAvailable',
+                CheckboxType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_contentavailable',
+                    'attr'  => [
+                        'tooltip' => 'mautic.notification.form.mobile.ios_contentavailable.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'ios_media',
+                FileType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_media',
+                    'attr'  => [
+                        'tooltip' => 'mautic.notification.form.mobile.ios_media.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'ios_mutableContent',
+                CheckboxType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.ios_mutablecontent',
+                    'attr'  => [
+                        'tooltip' => 'mautic.notification.form.mobile.mutablecontent.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+        }
+
+        if (in_array('android', $settings['platforms'])) {
+            $builder->add(
+                'android_sound',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_sound',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.android_sound.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_small_icon',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_small_icon',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.android_small_icon.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_large_icon',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_large_icon',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.android_large_icon.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_big_picture',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_big_picture',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.android_big_picture.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_led_color',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_led_color',
+                    'attr'  => [
+                        'class'       => 'form-control',
+                        'tooltip'     => 'mautic.notification.form.mobile.android_led_color.tooltip',
+                        'data-toggle' => 'color',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_accent_color',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_accent_color',
+                    'attr'  => [
+                        'class'       => 'form-control',
+                        'tooltip'     => 'mautic.notification.form.mobile.android_accent_color.tooltip',
+                        'data-toggle' => 'color',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_group_key',
+                TextType::class,
+                [
+                    'label' => 'mautic.notification.form.mobile.android_group_key',
+                    'attr'  => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.notification.form.mobile.android_group_key.tooltip',
+                    ],
+                    'required' => false,
+                ]
+            );
+
+            $builder->add(
+                'android_lockscreen_visibility',
+                ButtonGroupType::class,
+                [
+                    'choices' => [
+                        '0'  => 'mautic.notification.form.mobile.android_lockscreen_visibility.private',
+                        '-1' => 'mautic.notification.form.mobile.android_lockscreen_visibility.secret',
+                    ],
+                    'attr' => [
+                        'tooltip' => 'mautic.notification.form.mobile.android_lockscreen_visibility.tooltip',
+                    ],
+                    'label'       => 'mautic.notification.form.mobile.android_lockscreen_visibility',
+                    'empty_data'  => '1',
+                    'required'    => false,
+                    'placeholder' => 'mautic.notification.form.mobile.android_lockscreen_visibility.placeholder',
+                    'expanded'    => true,
+                    'multiple'    => false,
+                ]
+            );
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'mobile_notification_details';
+    }
+}
diff --git a/app/bundles/NotificationBundle/Form/Type/MobileNotificationListType.php b/app/bundles/NotificationBundle/Form/Type/MobileNotificationListType.php
new file mode 100644
index 00000000000..ebeaf8d0220
--- /dev/null
+++ b/app/bundles/NotificationBundle/Form/Type/MobileNotificationListType.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Form\Type;
+
+use Mautic\CoreBundle\Form\Type\EntityLookupType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class MobileNotificationListType.
+ */
+class MobileNotificationListType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'modal_route'         => 'mautic_mobile_notification_action',
+                'modal_header'        => 'mautic.notification.mobile.header.new',
+                'model'               => 'notification',
+                'model_lookup_method' => 'getLookupResults',
+                'lookup_arguments'    => function (Options $options) {
+                    return [
+                        'type'    => 'mobile_notification',
+                        'filter'  => '$data',
+                        'limit'   => 0,
+                        'start'   => 0,
+                        'options' => [
+                            'notification_type' => $options['notification_type'],
+                        ],
+                    ];
+                },
+                'ajax_lookup_action' => function (Options $options) {
+                    $query = [
+                        'notification_type' => $options['notification_type'],
+                    ];
+
+                    return 'notification:getLookupChoiceList&'.http_build_query($query);
+                },
+                'expanded'          => false,
+                'multiple'          => true,
+                'required'          => false,
+                'notification_type' => 'template',
+            ]
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'mobilenotification_list';
+    }
+
+    /**
+     * @return string
+     */
+    public function getParent()
+    {
+        return EntityLookupType::class;
+    }
+}
diff --git a/app/bundles/NotificationBundle/Form/Type/MobileNotificationSendType.php b/app/bundles/NotificationBundle/Form/Type/MobileNotificationSendType.php
new file mode 100644
index 00000000000..09e152107ff
--- /dev/null
+++ b/app/bundles/NotificationBundle/Form/Type/MobileNotificationSendType.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+/**
+ * Class NotificationSendType.
+ */
+class MobileNotificationSendType extends AbstractType
+{
+    /**
+     * @var RouterInterface
+     */
+    protected $router;
+
+    /**
+     * @param RouterInterface $router
+     */
+    public function __construct(RouterInterface $router)
+    {
+        $this->router = $router;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('notification', 'mobilenotification_list', [
+            'label'      => 'mautic.notification.send.selectnotifications',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'    => 'form-control',
+                'tooltip'  => 'mautic.notification.choose.notifications',
+                'onchange' => 'Mautic.disabledNotificationAction()',
+            ],
+            'multiple'    => false,
+            'constraints' => [
+                new NotBlank(
+                    ['message' => 'mautic.notification.choosenotification.notblank']
+                ),
+            ],
+        ]);
+
+        if (!empty($options['update_select'])) {
+            $windowUrl = $this->router->generate('mautic_mobile_notification_action', [
+                'objectAction' => 'new',
+                'contentOnly'  => 1,
+                'updateSelect' => $options['update_select'],
+            ]);
+
+            $builder->add('newNotificationButton', 'button', [
+                'attr' => [
+                    'class'   => 'btn btn-primary btn-nospin',
+                    'onclick' => 'Mautic.loadNewWindow({
+                        "windowUrl": "'.$windowUrl.'"
+                    })',
+                    'icon' => 'fa fa-plus',
+                ],
+                'label' => 'mautic.notification.send.new.notification',
+            ]);
+
+            $notification = $options['data']['notification'];
+
+            // create button edit notification
+            $windowUrlEdit = $this->router->generate('mautic_mobile_notification_action', [
+                'objectAction' => 'edit',
+                'objectId'     => 'notificationId',
+                'contentOnly'  => 1,
+                'updateSelect' => $options['update_select'],
+            ]);
+
+            $builder->add('editNotificationButton', 'button', [
+                'attr' => [
+                    'class'    => 'btn btn-primary btn-nospin',
+                    'onclick'  => 'Mautic.loadNewWindow(Mautic.standardNotificationUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
+                    'disabled' => !isset($notification),
+                    'icon'     => 'fa fa-edit',
+                ],
+                'label' => 'mautic.notification.send.edit.notification',
+            ]);
+        }
+    }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setOptional(['update_select']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'mobilenotificationsend_list';
+    }
+}
diff --git a/app/bundles/NotificationBundle/Form/Type/MobileNotificationType.php b/app/bundles/NotificationBundle/Form/Type/MobileNotificationType.php
new file mode 100644
index 00000000000..c878ce0a776
--- /dev/null
+++ b/app/bundles/NotificationBundle/Form/Type/MobileNotificationType.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Form\Type;
+
+use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
+use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Class NotificationType.
+ */
+class MobileNotificationType extends AbstractType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addEventSubscriber(new CleanFormSubscriber(['content' => 'html', 'customHtml' => 'html']));
+        $builder->addEventSubscriber(new FormExitSubscriber('notification.notification', $options));
+
+        $builder->add(
+            'name',
+            'text',
+            [
+                'label'      => 'mautic.notification.form.internal.name',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
+        );
+
+        $builder->add(
+            'description',
+            'textarea',
+            [
+                'label'      => 'mautic.notification.form.internal.description',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
+            ]
+        );
+
+        $builder->add(
+            'heading',
+            'text',
+            [
+                'label'      => 'mautic.notification.form.mobile.heading',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
+        );
+
+        $builder->add(
+            'message',
+            'textarea',
+            [
+                'label'      => 'mautic.notification.form.message',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class' => 'form-control',
+                    'rows'  => 6,
+                ],
+            ]
+        );
+
+        $builder->add(
+            'url',
+            'url',
+            [
+                'label'      => 'mautic.notification.form.mobile.url',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'   => 'form-control',
+                    'tooltip' => 'mautic.notification.form.mobile.url.tooltip',
+                ],
+                'required' => false,
+            ]
+        );
+
+        $builder->add('isPublished', 'yesno_button_group');
+
+        $builder->add(
+            'publishUp',
+            'datetime',
+            [
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishup',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'       => 'form-control',
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
+        );
+
+        $builder->add(
+            'publishDown',
+            'datetime',
+            [
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishdown',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'       => 'form-control',
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
+        );
+
+        //add category
+        $builder->add(
+            'category',
+            'category',
+            [
+                'bundle' => 'notification',
+            ]
+        );
+
+        $builder->add(
+            'language',
+            'locale',
+            [
+                'label'      => 'mautic.core.language',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class' => 'form-control',
+                ],
+                'required' => false,
+            ]
+        );
+
+        $builder->add('buttons', 'form_buttons');
+
+        if (!empty($options['update_select'])) {
+            $builder->add(
+                'buttons',
+                'form_buttons',
+                [
+                    'apply_text' => false,
+                ]
+            );
+            $builder->add(
+                'updateSelect',
+                'hidden',
+                [
+                    'data'   => $options['update_select'],
+                    'mapped' => false,
+                ]
+            );
+        } else {
+            $builder->add(
+                'buttons',
+                'form_buttons'
+            );
+        }
+
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
+        }
+
+        $builder->add(
+            'mobile',
+            HiddenType::class,
+            [
+                'data' => 1,
+            ]
+        );
+
+        $builder->add(
+            'mobileSettings',
+            MobileNotificationDetailsType::class
+        );
+    }
+
+    /**
+     * @param OptionsResolverInterface $resolver
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'data_class' => 'Mautic\NotificationBundle\Entity\Notification',
+            ]
+        );
+
+        $resolver->setOptional(['update_select']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'mobile_notification';
+    }
+}
diff --git a/app/bundles/NotificationBundle/Form/Type/NotificationType.php b/app/bundles/NotificationBundle/Form/Type/NotificationType.php
index 90f01bcb0a4..560027ce934 100644
--- a/app/bundles/NotificationBundle/Form/Type/NotificationType.php
+++ b/app/bundles/NotificationBundle/Form/Type/NotificationType.php
@@ -11,7 +11,6 @@
 
 namespace Mautic\NotificationBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
@@ -23,20 +22,6 @@
  */
 class NotificationType extends AbstractType
 {
-    private $translator;
-    private $em;
-    private $request;
-
-    /**
-     * @param MauticFactory $factory
-     */
-    public function __construct(MauticFactory $factory)
-    {
-        $this->translator = $factory->getTranslator();
-        $this->em         = $factory->getEntityManager();
-        $this->request    = $factory->getRequest();
-    }
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
diff --git a/app/bundles/NotificationBundle/Helper/NotificationHelper.php b/app/bundles/NotificationBundle/Helper/NotificationHelper.php
index c94cf29ab82..3765a4555d2 100644
--- a/app/bundles/NotificationBundle/Helper/NotificationHelper.php
+++ b/app/bundles/NotificationBundle/Helper/NotificationHelper.php
@@ -12,8 +12,14 @@
 namespace Mautic\NotificationBundle\Helper;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Helper\CoreParametersHelper;
+use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
+use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class NotificationHelper
 {
@@ -23,11 +29,48 @@ class NotificationHelper
     protected $factory;
 
     /**
-     * @param MauticFactory $factory
+     * @var IntegrationHelper
      */
-    public function __construct(MauticFactory $factory)
+    protected $integrationHelper;
+
+    /**
+     * @var CoreParametersHelper
+     */
+    protected $coreParametersHelper;
+
+    /**
+     * @var AssetsHelper
+     */
+    protected $assetsHelper;
+
+    /**
+     * @var Router
+     */
+    protected $router;
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * NotificationHelper constructor.
+     *
+     * @param MauticFactory        $factory
+     * @param AssetsHelper         $assetsHelper
+     * @param CoreParametersHelper $coreParametersHelper
+     * @param IntegrationHelper    $integrationHelper
+     * @param Router               $router
+     * @param RequestStack         $requestStack
+     */
+    public function __construct(MauticFactory $factory, AssetsHelper $assetsHelper, CoreParametersHelper $coreParametersHelper, IntegrationHelper $integrationHelper, Router $router, RequestStack $requestStack)
     {
-        $this->factory = $factory;
+        $this->factory              = $factory;
+        $this->assetsHelper         = $assetsHelper;
+        $this->coreParametersHelper = $coreParametersHelper;
+        $this->integrationHelper    = $integrationHelper;
+        $this->router               = $router;
+        $this->request              = $requestStack;
     }
 
     /**
@@ -47,4 +90,151 @@ public function unsubscribe($notification)
 
         return $leadModel->addDncForLead($lead, 'notification', null, DoNotContact::UNSUBSCRIBED);
     }
+
+    public function getHeaderScript()
+    {
+        if ($this->hasScript()) {
+            return 'MauticJS.insertScript(\'https://cdn.onesignal.com/sdks/OneSignalSDK.js\');
+                    var OneSignal = OneSignal || [];';
+        }
+    }
+
+    public function getScript()
+    {
+        if ($this->hasScript()) {
+            $integration = $this->integrationHelper->getIntegrationObject('OneSignal');
+
+            if (!$integration || $integration->getIntegrationSettings()->getIsPublished() === false) {
+                return;
+            }
+
+            $settings        = $integration->getIntegrationSettings();
+            $keys            = $integration->getDecryptedApiKeys();
+            $supported       = $settings->getSupportedFeatures();
+            $featureSettings = $settings->getFeatureSettings();
+
+            $appId                      = $keys['app_id'];
+            $safariWebId                = $keys['safari_web_id'];
+            $welcomenotificationEnabled = in_array('welcome_notification_enabled', $supported);
+            $notificationSubdomainName  = $featureSettings['subdomain_name'];
+            $leadAssociationUrl         = $this->router->generate(
+                'mautic_subscribe_notification',
+                [],
+                UrlGeneratorInterface::ABSOLUTE_URL
+            );
+
+            $welcomenotificationText = '';
+
+            if (!$welcomenotificationEnabled) {
+                $welcomenotificationText = 'welcomeNotification: { "disable": true },';
+            }
+
+            $server        = $this->request->getCurrentRequest()->server;
+            $https         = (parse_url($server->get('HTTP_REFERER'), PHP_URL_SCHEME) == 'https') ? true : false;
+            $subdomainName = '';
+
+            if (!$https && $notificationSubdomainName) {
+                $subdomainName = 'subdomainName: "'.$notificationSubdomainName.'",
+                httpPermissionRequest: {
+                    enable: true,
+                    useCustomModal: true
+                },';
+            }
+
+            $oneSignalInit = <<<JS
+var scrpt = document.createElement('link');
+scrpt.rel ='manifest';
+scrpt.href ='/manifest.json';
+var head = document.getElementsByTagName('head')[0];
+head.appendChild(scrpt);
+
+OneSignal.push(["init", {
+    appId: "{$appId}",
+    safari_web_id: "{$safariWebId}",
+    autoRegister: true,
+    {$welcomenotificationText}
+    {$subdomainName}
+    notifyButton: {
+        enable: false // Set to false to hide
+    }
+}]);
+
+var postUserIdToMautic = function(userId) {
+    var data = [];
+    data['osid'] = userId;
+    MauticJS.makeCORSRequest('GET', '{$leadAssociationUrl}', data);
+};
+
+OneSignal.push(function() {
+    OneSignal.getUserId(function(userId) {
+        if (! userId) {
+            OneSignal.on('subscriptionChange', function(isSubscribed) {
+                if (isSubscribed) {
+                    OneSignal.getUserId(function(newUserId) {
+                        postUserIdToMautic(newUserId);
+                    });
+                }
+            });
+        } else {
+            postUserIdToMautic(userId);
+        }
+    });
+    // Just to be sure we've grabbed the ID
+    window.onbeforeunload = function() {
+        OneSignal.getUserId(function(userId) {
+            if (userId) {
+                postUserIdToMautic(userId);
+            }
+        });
+    };
+});
+JS;
+
+            if (!$https && $notificationSubdomainName) {
+                $oneSignalInit .= <<<'JS'
+OneSignal.push(function() {
+    OneSignal.on('notificationPermissionChange', function(permissionChange) {
+        if(currentPermission == 'granted'){
+        setTimeout(function(){
+            OneSignal.registerForPushNotifications({httpPermissionRequest: true});
+        }, 100);
+        }
+    });
+});
+JS;
+            }
+
+            return $oneSignalInit;
+        }
+    }
+
+    private function hasScript()
+    {
+        $landingPage = true;
+        $server      = $this->request->getCurrentRequest()->server;
+        $cookies     = $this->request->getCurrentRequest()->cookies;
+        // already exist
+        if ($cookies->get('mtc_osid')) {
+            return false;
+        }
+
+        if (strpos($server->get('HTTP_REFERER'), $this->coreParametersHelper->getParameter('site_url')) === false) {
+            $landingPage = false;
+        }
+
+        $integration = $this->integrationHelper->getIntegrationObject('OneSignal');
+
+        if (!$integration || $integration->getIntegrationSettings()->getIsPublished() === false) {
+            return false;
+        }
+
+        $supportedFeatures = $integration->getIntegrationSettings()->getSupportedFeatures();
+
+        // disable on Landing pages
+        if ($landingPage == true && !in_array('landing_page_enabled', $supportedFeatures)) {
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/app/bundles/NotificationBundle/Integration/OneSignalIntegration.php b/app/bundles/NotificationBundle/Integration/OneSignalIntegration.php
new file mode 100644
index 00000000000..d9876b58477
--- /dev/null
+++ b/app/bundles/NotificationBundle/Integration/OneSignalIntegration.php
@@ -0,0 +1,131 @@
+<?php
+
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\NotificationBundle\Integration;
+
+use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilder;
+
+/**
+ * Class OneSignalIntegration.
+ */
+class OneSignalIntegration extends AbstractIntegration
+{
+    /**
+     * @var bool
+     */
+    protected $coreIntegration = true;
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'OneSignal';
+    }
+
+    public function getIcon()
+    {
+        return 'app/bundles/NotificationBundle/Assets/img/OneSignal.png';
+    }
+
+    public function getSupportedFeatures()
+    {
+        return [
+            'mobile',
+            'landing_page_enabled',
+            'welcome_notification_enabled',
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getRequiredKeyFields()
+    {
+        return [
+            'app_id'        => 'mautic.notification.config.form.notification.app_id',
+            'safari_web_id' => 'mautic.notification.config.form.notification.safari_web_id',
+            'rest_api_key'  => 'mautic.notification.config.form.notification.rest_api_key',
+            'gcm_sender_id' => 'mautic.notification.config.form.notification.gcm_sender_id',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFormSettings()
+    {
+        return [
+            'requires_callback'      => false,
+            'requires_authorization' => false,
+        ];
+    }
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getAuthenticationType()
+    {
+        return 'none';
+    }
+
+    /**
+     * @param \Mautic\PluginBundle\Integration\Form|FormBuilder $builder
+     * @param array                                             $data
+     * @param string                                            $formArea
+     */
+    public function appendToForm(&$builder, $data, $formArea)
+    {
+        if ($formArea == 'features') {
+            /* @var FormBuilder $builder */
+            $builder->add(
+                'subdomain_name',
+                TextType::class,
+                [
+                    'label'    => 'mautic.notification.form.subdomain_name.label',
+                    'required' => false,
+                    'attr'     => [
+                        'class' => 'form-control',
+                    ],
+                ]
+            );
+
+            $builder->add(
+                'platforms',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'ios'     => 'mautic.integration.form.platforms.ios',
+                        'android' => 'mautic.integration.form.platforms.android',
+                    ],
+                    'attr' => [
+                        'tooltip'      => 'mautic.integration.form.platforms.tooltip',
+                        'data-show-on' => '{"integration_details_supportedFeatures_0":"checked"}',
+                    ],
+                    'expanded'    => true,
+                    'multiple'    => true,
+                    'label'       => 'mautic.integration.form.platforms',
+                    'empty_value' => false,
+                    'required'    => false,
+                ]
+            );
+        }
+    }
+}
diff --git a/app/bundles/NotificationBundle/Model/NotificationModel.php b/app/bundles/NotificationBundle/Model/NotificationModel.php
index 0be6d10464a..43d2baa3952 100644
--- a/app/bundles/NotificationBundle/Model/NotificationModel.php
+++ b/app/bundles/NotificationBundle/Model/NotificationModel.php
@@ -129,7 +129,9 @@ public function createForm($entity, $formFactory, $action = null, $options = [])
             $options['action'] = $action;
         }
 
-        return $formFactory->create('notification', $entity, $options);
+        $type = strpos($action, 'mobile_') !== false ? 'mobile_notification' : 'notification';
+
+        return $formFactory->create($type, $entity, $options);
     }
 
     /**
@@ -154,14 +156,16 @@ public function getEntity($id = null)
      * @param Notification $notification
      * @param Lead         $lead
      * @param string       $source
+     * @param int          $sourceId
      */
-    public function createStatEntry(Notification $notification, Lead $lead, $source = null)
+    public function createStatEntry(Notification $notification, Lead $lead, $source = null, $sourceId = null)
     {
         $stat = new Stat();
         $stat->setDateSent(new \DateTime());
         $stat->setLead($lead);
         $stat->setNotification($notification);
         $stat->setSource($source);
+        $stat->setSourceId($sourceId);
 
         $this->getStatRepository()->saveEntity($stat);
     }
@@ -333,6 +337,23 @@ public function getLookupResults($type, $filter = '', $limit = 10, $start = 0, $
                 //sort by language
                 ksort($results);
 
+                break;
+            case 'mobile_notification':
+                $entities = $this->getRepository()->getMobileNotificationList(
+                    $filter,
+                    $limit,
+                    $start,
+                    $this->security->isGranted($this->getPermissionBase().':viewother'),
+                    isset($options['notification_type']) ? $options['notification_type'] : null
+                );
+
+                foreach ($entities as $entity) {
+                    $results[$entity['language']][$entity['id']] = $entity['name'];
+                }
+
+                //sort by language
+                ksort($results);
+
                 break;
         }
 
diff --git a/app/bundles/NotificationBundle/NotificationEvents.php b/app/bundles/NotificationBundle/NotificationEvents.php
index 1c77ac304ce..61ff328d0b0 100644
--- a/app/bundles/NotificationBundle/NotificationEvents.php
+++ b/app/bundles/NotificationBundle/NotificationEvents.php
@@ -27,6 +27,17 @@ final class NotificationEvents
      */
     const TOKEN_REPLACEMENT = 'mautic.notification_token_replacement';
 
+    /**
+     * The mautic.notification_form_action_send event is thrown when a notification is sent
+     * as part of a form action.
+     *
+     * The event listener receives a
+     * Mautic\NotificationBundle\Event\SendingNotificationEvent instance.
+     *
+     * @var string
+     */
+    const NOTIFICATION_ON_FORM_ACTION_SEND = 'mautic.notification_form_action_send';
+
     /**
      * The mautic.notification_on_send event is thrown when a notification is sent.
      *
diff --git a/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php b/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
index 2adf750407b..c1d9e2d7293 100644
--- a/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
+++ b/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
@@ -27,6 +27,7 @@ public function __construct($params)
         parent::__construct($params);
         $this->addStandardPermissions('categories');
         $this->addExtendedPermissions('notifications');
+        $this->addExtendedPermissions('mobile_notifications');
     }
 
     /**
@@ -49,5 +50,6 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
     {
         $this->addStandardFormFields('notification', 'categories', $builder, $data);
         $this->addExtendedFormFields('notification', 'notifications', $builder, $data);
+        $this->addExtendedFormFields('notification', 'mobile_notifications', $builder, $data);
     }
 }
diff --git a/app/bundles/NotificationBundle/Translations/en_US/messages.ini b/app/bundles/NotificationBundle/Translations/en_US/messages.ini
index 36377b0d8d1..244f2256aa1 100644
--- a/app/bundles/NotificationBundle/Translations/en_US/messages.ini
+++ b/app/bundles/NotificationBundle/Translations/en_US/messages.ini
@@ -5,19 +5,85 @@ mautic.notification.notifications="Web Notifications"
 mautic.notification.campaign.send_notification="Send web notification"
 mautic.notification.campaign.send_notification.tooltip="Sends a web notification to the contact."
 
+mautic.notification.mobile_notification="Mobile Notification"
+mautic.notification.mobile_notifications="Mobile Notifications"
+mautic.notification.campaign.send_mobile_notification="Send mobile notification"
+mautic.notification.campaign.send_mobile_notification.tooltip="Sends a mobile notification to the contact if they have enabled notifications on their mobile device in your app."
+
+mautic.notification.tab.ios="iOS"
+mautic.notification.tab.android="Android"
+mautic.notification.tab.data="Additional Data"
+
+mautic.notification.tab.mobile="Mobile Settings"
+mautic.integration.form.feature.mobile="Mobile app notifications"
+mautic.integration.form.feature.landing_page_enabled="Enabled on landing pages?"
+mautic.integration.form.feature.welcome_notification_enabled="Welcome notification"
+mautic.integration.form.platforms="Supported Platforms For Mobile Push"
+mautic.integration.form.platforms.tooltip="Select the platforms that your OneSignal configuration will support. Only select platforms for which you have an app and have integrated the OneSignal SDK."
+mautic.integration.form.platforms.ios="iOS"
+mautic.integration.form.platforms.android="Android"
+mautic.integration.form.platforms.error="If the mobile notifications feature is enabled, you must select at least one platform."
+
+mautic.notification.form.mobile.url="URL"
+mautic.notification.form.mobile.url.tooltip="Opens a URL when the notification is clicked."
+mautic.notification.form.mobile.heading="Title"
+
+mautic.notification.form.mobile.ios_subtitle="Message Subtitle"
+mautic.notification.form.mobile.ios_subtitle.tooltip="This is an iOS 10 only feature"
+mautic.notification.form.mobile.ios_sound="Sound"
+mautic.notification.form.mobile.ios_sound.tooltip="Sound file will play when the notification is received by the device. This should either be left blank for the default sound or set to the name of a sound file in your app bundle."
+mautic.notification.form.mobile.ios_badges="Badges"
+mautic.notification.form.mobile.ios_badges.tooltip="Small number on the app icon on the home screen indicating the number of notifications received for your app. Clears when the app is opened."
+mautic.notification.form.mobile.ios_badges.placeholder="Don't set or change"
+mautic.notification.form.mobile.ios_badges.set="Set to"
+mautic.notification.form.mobile.ios_badges.increment="Increase by"
+mautic.notification.form.mobile.ios_badgecount="Badge count"
+mautic.notification.form.mobile.ios_badgecount.tooltip="This will either set or increase the badge count depending on your previous selection."
+mautic.notification.form.mobile.ios_contentavailable="Content Available"
+mautic.notification.form.mobile.ios_contentavailable.tooltip="Only for native iOS apps. Wakes your app when the notification is received so you can do work in the background. See Apple's 'content-available' documentation for more details."
+mautic.notification.form.mobile.ios_media="Media"
+mautic.notification.form.mobile.ios_media.tooltip="Rich media attachment. Image, sound, or video to show when 3D touching the notification. Requires the OneSignal iOS 2.1.1 SDK or newer."
+mautic.notification.form.mobile.ios_mutablecontent="Mutable Content"
+mautic.notification.form.mobile.ios_mutablecontent.tooltip="Native only code running on iOS 10+. Allows you do modify the notification from your app before it is displayed. See Apple's 'mutable-content' documentation for more details."
+
+mautic.notification.form.mobile.android_sound="Sound"
+mautic.notification.form.mobile.android_small_icon="Small Icon"
+mautic.notification.form.mobile.android_large_icon="Large Icon"
+mautic.notification.form.mobile.android_group_key="Group Key"
+mautic.notification.form.mobile.android_lockscreen_visibility="Lockscreen Visibility"
+mautic.notification.form.mobile.android_lockscreen_visibility.placeholder="Public"
+mautic.notification.form.mobile.android_lockscreen_visibility.private="Private"
+mautic.notification.form.mobile.android_lockscreen_visibility.secret="Secret"
+mautic.notification.form.mobile.android_big_picture="Big Picture"
+mautic.notification.form.mobile.android_led_color="LED Color"
+mautic.notification.form.mobile.android_accent_color="Accent Color"
+
+mautic.notification.form.mobile.android_sound.tooltip="Sound resource will play when the notification is received by the device."
+mautic.notification.form.mobile.android_small_icon.tooltip="Icon shows in the status bar. Also show to the left of the notification text unless a large icon is set."
+mautic.notification.form.mobile.android_large_icon.tooltip="Requires Android 3.0+. Icon shows up to the left of the notification text."
+mautic.notification.form.mobile.android_group_key.tooltip="Notifications with the same Group Key will be stacked together as a single summary notification with the number of unopened notifications."
+mautic.notification.form.mobile.android_lockscreen_visibility.tooltip="Only applies to apps targeting Android API level 21+ running on Android 5.0+ devices."
+mautic.notification.form.mobile.android_big_picture.tooltip="Requires Android 4.1+ Shows up in an expandable view below the notification text."
+mautic.notification.form.mobile.android_led_color.tooltip="Sets the device's LED notification light if the device has one. Uses ARGB Hex value. The placeholder text shown is blue."
+mautic.notification.form.mobile.android_accent_color.tooltip="Sets the circle color around your small icon that shows to the left of your notification text. Uses ARGB Hex value. The placeholder text shown red. Only applies to apps targeting Android API level 21+ running on Android 5.0+ devices."
+
 mautic.config.tab.notificationconfig="Web Notification Settings"
 mautic.notification.config.form.notification.enabled="Web Notifications Enabled?"
 mautic.notification.config.form.notification.enabled.tooltip="Enable Web Notifications support in your campaigns?"
-mautic.notification.config.form.notification.landingpage.enabled="Enabled on landing pages?"
+mautic.notification.config.form.notification.landingpage.enabled="Enabled on Mautic landing pages?"
 mautic.notification.config.form.notification.landingpage.enabled.tooltip="Enable Web Notifications on landing pages?"
+mautic.notification.config.form.notification.trackingpage.enabled="Enabled on tracking pages?"
+mautic.notification.config.form.notification.trackinggpage.enabled.tooltip="Enable Web Notifications on tracking pages?"
 mautic.notification.config.form.notification.welcome.enabled="Welcome Notification"
 mautic.notification.config.form.notification.welcome.enabled.tooltip="Enable Welcome Notification after register"
-mautic.notification.config.form.notification.app_id="Web Notifications Provider App ID"
-mautic.notification.config.form.notification.app_id.tooltip="One Signal App ID"
-mautic.notification.config.form.notification.rest_api_key="Web Notifications Provider API Key"
-mautic.notification.config.form.notification.rest_api_key.tooltip="One Signal Rest API Key"
+mautic.notification.config.form.notification.app_id="OneSignal App ID"
+mautic.notification.config.form.notification.app_id.tooltip="OneSignal App ID"
+mautic.notification.config.form.notification.rest_api_key="OneSignal Rest API Key"
+mautic.notification.config.form.notification.rest_api_key.tooltip="OneSignal Rest API Key"
 mautic.notification.config.form.notification.gcm_sender_id="Shared key for push notifications"
 mautic.notification.config.form.notification.gcm_sender_id.tooltip="gcm_sender_id key - do not change it"
+mautic.notification.config.form.notification.subdomain_name="Subdomain of onesignal.com"
+mautic.notification.config.form.notification.subdomain_name.tooltip="Only for non https sites."
 mautic.notification.config.form.notification.notification_safari_web_id="Web Notifications Provider Safari Web ID"
 mautic.notification.config.form.notification.notification_safari_web_id.tooltip="One Signal Safari Web ID for your One Signal App"
 mautic.notification.config.form.notification.icon="Web Notification Icon"
@@ -36,6 +102,8 @@ mautic.notification.form.list="Contact list"
 
 mautic.notification.header.edit="Edit Web Notification"
 mautic.notification.header.new="New Web Notification"
+mautic.notification.mobile.header.edit="Edit Mobile Notification"
+mautic.notification.mobile.header.new="New Mobile Notification"
 
 mautic.notification.text="Web Notification Content"
 mautic.notification.text.tooltip="Your web notification content"
@@ -44,6 +112,7 @@ mautic.notification.headings.tooltip="Your web notification title"
 mautic.notification.link="Link"
 mautic.notification.link.placeholder="http://"
 mautic.notification.link.tooltip="When the user clicks the web notification, where do you want to send them?"
+mautic.notification.permissions.mobile_notifications="Mobile Notifications - User has access to"
 
 mautic.notification.stats="Notification Stats"
 mautic.notification.stats.report.table="Notifications Sent"
@@ -88,4 +157,30 @@ mautic.notification.campaign.failed.not_contactable="Contact is not contactable
 mautic.notification.campaign.failed.not_subscribed="The contact has not subscribed to the Web Notification channel."
 mautic.notification.campaign.failed.missing_entity="The specified Web Notification entity does not exist."
 mautic.notification.show.total.sent="Total sent"
-mautic.notification.help.searchcommands="<strong>Search commands</strong><br />ids:ID1,ID2 (comma separated IDs, no spaces)"
\ No newline at end of file
+mautic.notification.help.searchcommands="<strong>Search commands</strong><br />ids:ID1,ID2 (comma separated IDs, no spaces)"
+
+mautic.report.group.mobile_notifications="Mobile Notifications"
+mautic.mobile_notification.stats.report.table="Mobile Notifications sent"
+mautic.mobile_notification.report.hits_count="Hits Count"
+mautic.mobile_notification.report.hits_ratio="Hits Ratio"
+mautic.mobile_notification.report.read_count="Read Count"
+mautic.mobile_notification.report.read_ratio="Read Ratio"
+mautic.mobile_notification.report.sent_count="Sent Count"
+mautic.mobile_notifications.report.stat.date_read="Date Read"
+mautic.mobile_notifications.report.stat.date_sent="Date Sent"
+mautic.mobile_notification.report.unique_hits_count="Unique Hits"
+mautic.mobile_notification.report.unique_ratio="Unique Ratio"
+mautic.notification.mobile_notification.heading="Title"
+
+mautic.mobile_notification.graph.line.stats.read="Read"
+mautic.mobile_notification.graph.line.stats.sent="Sent"
+mautic.mobile_notification.graph.line.stats="Mobile Notifications sent"
+mautic.mobile_notification.graph.pie.ignored.read.failed.ignored="Ignored"
+mautic.mobile_notification.graph.pie.ignored.read.failed.read="Read"
+mautic.mobile_notification.graph.pie.ignored.read.failed="Ignored / Read / Failed mobile notifications"
+
+mautic.notification.actions="Notification actions"
+mautic.notification.actions.mobile_tooltip="Send the selected mobile notification to the user when a form is filled out if they have mobile notifications enabled."
+mautic.notification.actions.send_mobile_notification="Send mobile notification"
+mautic.notification.form.subdomain_name.label="Subdomain name"
+mautic.campaign.notification.send_mobile_notification="Send mobile notification"
diff --git a/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php b/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php
deleted file mode 100644
index 035ced07531..00000000000
--- a/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * @copyright   2016 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-?>
-
-<div class="panel panel-primary">
-    <div class="panel-heading">
-        <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.config.tab.notificationconfig'); ?></h3>
-    </div>
-    <div class="panel-body">
-        <?php foreach ($form->children as $f): ?>
-        <div class="row">
-            <div class="col-md-6">
-                <?php echo $view['form']->row($f); ?>
-            </div>
-        </div>
-        <?php endforeach; ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/bundles/NotificationBundle/Views/FormTheme/MobileNotification/mobile_notification_details_widget.html.php b/app/bundles/NotificationBundle/Views/FormTheme/MobileNotification/mobile_notification_details_widget.html.php
new file mode 100644
index 00000000000..e3d8caedca3
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/FormTheme/MobileNotification/mobile_notification_details_widget.html.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+
+<?php if (in_array('ios', $integrationSettings['platforms'])) : ?>
+    <div class="tab-pane fade in bdr-w-0" id="ios-notification-container">
+        <div class="row">
+            <div class="col-md-6">
+                <?php echo $view['form']->row($form['ios_subtitle']); ?>
+                <?php echo $view['form']->row($form['ios_media']); ?>
+            </div>
+            <div class="col-md-6">
+                <div class="well">
+                    <h4><?php echo $view['translator']->trans('Advanced Settings'); ?></h4>
+                    <hr />
+                    <?php echo $view['form']->row($form['ios_badges']); ?>
+                    <?php echo $view['form']->row($form['ios_badgeCount']); ?>
+                    <?php echo $view['form']->row($form['ios_sound']); ?>
+                    <?php echo $view['form']->label($form['ios_contentAvailable']); ?>
+                    <?php echo $view['form']->row($form['ios_contentAvailable']); ?>
+                    <?php echo $view['form']->label($form['ios_mutableContent']); ?>
+                    <?php echo $view['form']->row($form['ios_mutableContent']); ?>
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
+<?php if (in_array('android', $integrationSettings['platforms'])) : ?>
+    <div class="tab-pane fade in bdr-w-0" id="android-notification-container">
+        <div class="row">
+            <div class="col-md-6">
+                <?php echo $view['form']->row($form['android_small_icon']); ?>
+                <?php echo $view['form']->row($form['android_large_icon']); ?>
+                <?php echo $view['form']->row($form['android_big_picture']); ?>
+            </div>
+            <div class="col-md-6">
+                <div class="well">
+                    <h4><?php echo $view['translator']->trans('Advanced Settings'); ?></h4>
+                    <hr />
+                    <?php echo $view['form']->row($form['android_sound']); ?>
+                    <?php echo $view['form']->row($form['android_group_key']); ?>
+                    <?php echo $view['form']->row($form['android_led_color']); ?>
+                    <?php echo $view['form']->row($form['android_accent_color']); ?>
+                    <?php echo $view['form']->row($form['android_lockscreen_visibility']); ?>
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/details.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/details.html.php
new file mode 100644
index 00000000000..25679c34c7d
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/details.html.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+$view['slots']->set('mauticContent', 'notification');
+$view['slots']->set('headerTitle', $notification->getName());
+
+$notificationType = $notification->getNotificationType();
+if (empty($notificationType)) {
+    $notificationType = 'template';
+}
+
+$customButtons = [];
+
+$view['slots']->set(
+    'actions',
+    $view->render(
+        'MauticCoreBundle:Helper:page_actions.html.php',
+        [
+            'item'            => $notification,
+            'customButtons'   => (isset($customButtons)) ? $customButtons : [],
+            'templateButtons' => [
+                'edit' => $view['security']->hasEntityAccess(
+                    $permissions['notification:mobile_notifications:editown'],
+                    $permissions['notification:mobile_notifications:editother'],
+                    $notification->getCreatedBy()
+                ),
+                'delete' => $permissions['notification:mobile_notifications:create'],
+                'close'  => $view['security']->hasEntityAccess(
+                    $permissions['notification:mobile_notifications:viewown'],
+                    $permissions['notification:mobile_notifications:viewother'],
+                    $notification->getCreatedBy()
+                ),
+            ],
+            'routeBase' => 'mobile_notification',
+        ]
+    )
+);
+$view['slots']->set(
+    'publishStatus',
+    $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', ['entity' => $notification])
+);
+?>
+
+<!-- start: box layout -->
+<div class="box-layout">
+    <!-- left section -->
+    <div class="col-md-9 bg-white height-auto">
+        <div class="bg-auto bg-dark-xs">
+            <!-- notification detail collapseable toggler -->
+            <div class="hr-expand nm">
+                <span data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.core.details'); ?>">
+                    <a href="javascript:void(0)" class="arrow text-muted collapsed" data-toggle="collapse" data-target="#notification-details"><span class="caret"></span> <?php echo $view['translator']->trans('mautic.core.details'); ?></a>
+                </span>
+            </div>
+            <!--/ notification detail collapseable toggler -->
+
+            <!-- some stats -->
+            <div class="pa-md">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="panel">
+                            <div class="panel-body box-layout">
+                                <div class="col-md-3 va-m">
+                                    <h5 class="text-white dark-md fw-sb mb-xs">
+                                        <span class="fa fa-line-chart"></span>
+                                        <?php echo $view['translator']->trans('mautic.core.stats'); ?>
+                                    </h5>
+                                </div>
+                                <div class="col-md-9 va-m">
+                                    <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm, 'class' => 'pull-right']); ?>
+                                </div>
+                            </div>
+                            <div class="pt-0 pl-15 pb-10 pr-15">
+                                <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $entityViews, 'chartType' => 'line', 'chartHeight' => 300]); ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!--/ stats -->
+
+            <!-- tabs controls -->
+            <ul class="nav nav-tabs pr-md pl-md">
+                <li class="active">
+                    <a href="#clicks-container" role="tab" data-toggle="tab">
+                        <?php echo $view['translator']->trans('mautic.trackable.click_counts'); ?>
+                    </a>
+                </li>
+                <li class="">
+                    <a href="#contacts-container" role="tab" data-toggle="tab">
+                        <?php echo $view['translator']->trans('mautic.lead.leads'); ?>
+                    </a>
+                </li>
+            </ul>
+            <!--/ tabs controls -->
+        </div>
+
+        <!-- start: tab-content -->
+        <div class="tab-content pa-md">
+            <div class="tab-pane active bdr-w-0" id="clicks-container">
+                <?php echo $view->render('MauticPageBundle:Trackable:click_counts.html.php', ['trackables' => $trackables]); ?>
+            </div>
+
+            <div class="tab-pane fade in bdr-w-0 page-list" id="contacts-container">
+                <?php echo $contacts; ?>
+            </div>
+        </div>
+    </div>
+    <!--/ left section -->
+
+    <!-- right section -->
+    <div class="col-md-3 bg-white bdr-l height-auto">
+        <!-- activity feed -->
+        <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
+    </div>
+    <!--/ right section -->
+    <input name="entityId" id="entityId" type="hidden" value="<?php echo $notification->getId(); ?>" />
+</div>
+<!--/ end: box layout -->
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/form.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/form.html.php
new file mode 100644
index 00000000000..f81c5086c43
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/form.html.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+$view['slots']->set('mauticContent', 'mobile_notification');
+
+$header = ($notification->getId()) ?
+    $view['translator']->trans('mautic.notification.mobile.header.edit',
+        ['%name%' => $notification->getName()]) :
+    $view['translator']->trans('mautic.notification.mobile.header.new');
+
+$view['slots']->set('headerTitle', $header);
+
+/** @var \Mautic\NotificationBundle\Integration\OneSignalIntegration $integration */
+$integrationSettings = $integration->getIntegrationSettings()->getFeatureSettings();
+?>
+
+<?php echo $view['form']->start($form); ?>
+<div class="box-layout">
+    <div class="col-md-9 height-auto bg-white">
+        <div class="row">
+            <div class="col-xs-12">
+                <!-- tabs controls -->
+                <ul class="bg-auto nav nav-tabs pr-md pl-md">
+                    <li class="active">
+                        <a href="#notification-container" role="tab" data-toggle="tab">
+                            <?php echo $view['translator']->trans('mautic.core.details'); ?>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#data-notification-container" role="tab" data-toggle="tab">
+                            <?php echo $view['translator']->trans('mautic.notification.tab.data'); ?>
+                        </a>
+                    </li>
+                    <?php if (in_array('ios', $integrationSettings['platforms'])) : ?>
+                        <li>
+                            <a href="#ios-notification-container" role="tab" data-toggle="tab">
+                                <?php echo $view['translator']->trans('mautic.notification.tab.ios'); ?>
+                            </a>
+                        </li>
+                    <?php endif; ?>
+                    <?php if (in_array('android', $integrationSettings['platforms'])) : ?>
+                        <li>
+                            <a href="#android-notification-container" role="tab" data-toggle="tab">
+                                <?php echo $view['translator']->trans('mautic.notification.tab.android'); ?>
+                            </a>
+                        </li>
+                    <?php endif; ?>
+                </ul>
+                <!--/ tabs controls -->
+                <div class="tab-content pa-md">
+                    <div class="tab-pane fade in active bdr-w-0" id="notification-container">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <?php echo $view['form']->row($form['name']); ?>
+                                <?php echo $view['form']->row($form['heading']); ?>
+                                <?php echo $view['form']->row($form['url']); ?>
+                            </div>
+                            <div class="col-md-6">
+                                <?php echo $view['form']->row($form['message']); ?>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="tab-pane fade in bdr-w-0" id="data-notification-container">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <?php echo $view['form']->row($form['mobileSettings']['additional_data']); ?>
+                            </div>
+                        </div>
+                    </div>
+                    <?php echo $view['form']->widget($form['mobileSettings'], ['integrationSettings' => $integrationSettings]); ?>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-3 bg-white height-auto bdr-l">
+        <div class="pr-lg pl-lg pt-md pb-md">
+            <?php echo $view['form']->row($form['category']); ?>
+            <?php echo $view['form']->row($form['language']); ?>
+            <div class="hide">
+                <?php echo $view['form']->row($form['isPublished']); ?>
+                <?php echo $view['form']->row($form['publishUp']); ?>
+                <?php echo $view['form']->row($form['publishDown']); ?>
+
+                <?php echo $view['form']->rest($form); ?>
+            </div>
+        </div>
+    </div>
+</div>
+<?php echo $view['form']->end($form); ?>
\ No newline at end of file
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/index.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/index.html.php
new file mode 100644
index 00000000000..405bd2e226f
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/index.html.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+$view['slots']->set('mauticContent', 'mobile_notification');
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.notification.mobile_notifications'));
+
+$view['slots']->set(
+    'actions',
+    $view->render(
+        'MauticCoreBundle:Helper:page_actions.html.php',
+        [
+            'templateButtons' => [
+                'new' => $permissions['notification:mobile_notifications:create'],
+            ],
+            'routeBase' => 'mobile_notification',
+        ]
+    )
+);
+?>
+
+<div class="panel panel-default bdr-t-wdh-0 mb-0">
+    <?php echo $view->render(
+        'MauticCoreBundle:Helper:list_toolbar.html.php',
+        [
+            'searchValue' => $searchValue,
+            'searchHelp'  => 'mautic.notification.help.searchcommands',
+            'searchId'    => 'mobile-notification-search',
+            'action'      => $currentRoute,
+        ]
+    ); ?>
+
+    <div class="page-list">
+        <?php $view['slots']->output('_content'); ?>
+    </div>
+</div>
+
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/list.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/list.html.php
new file mode 100644
index 00000000000..59babd5776d
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/list.html.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+if ($tmpl == 'index') {
+    $view->extend('MauticNotificationBundle:MobileNotification:index.html.php');
+}
+
+if (count($items)):
+
+    ?>
+    <div class="table-responsive">
+        <table class="table table-hover table-striped table-bordered notification-list">
+            <thead>
+            <tr>
+                <?php
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'checkall'        => 'true',
+                        'routeBase'       => 'mobile_notification',
+                        'templateButtons' => [
+                            'delete' => $permissions['notification:mobile_notifications:deleteown']
+                                || $permissions['notification:mobile_notifications:deleteother'],
+                        ],
+                    ]
+                );
+
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'sessionVar' => 'mobile_notification',
+                        'orderBy'    => 'e.name',
+                        'text'       => 'mautic.core.name',
+                        'class'      => 'col-notification-name',
+                        'default'    => true,
+                    ]
+                );
+
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'sessionVar' => 'mobile_notification',
+                        'orderBy'    => 'c.title',
+                        'text'       => 'mautic.core.category',
+                        'class'      => 'visible-md visible-lg col-notification-category',
+                    ]
+                );
+                ?>
+
+                <th class="visible-sm visible-md visible-lg col-notification-stats"><?php echo $view['translator']->trans(
+                        'mautic.core.stats'
+                    ); ?></th>
+
+                <?php
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'sessionVar' => 'mobile_notification',
+                        'orderBy'    => 'e.id',
+                        'text'       => 'mautic.core.id',
+                        'class'      => 'visible-md visible-lg col-notification-id',
+                    ]
+                );
+                ?>
+            </tr>
+            </thead>
+            <tbody>
+            <?php
+            /** @var \Mautic\NotificationBundle\Entity\Notification $item */
+            foreach ($items as $item):
+                $type = $item->getNotificationType();
+                ?>
+                <tr>
+                    <td>
+                        <?php
+                        $edit = $view['security']->hasEntityAccess(
+                            $permissions['notification:mobile_notifications:editown'],
+                            $permissions['notification:mobile_notifications:editother'],
+                            $item->getCreatedBy()
+                        );
+                        $customButtons = [
+                            [
+                                'attr' => [
+                                    'data-toggle' => 'ajaxmodal',
+                                    'data-target' => '#MauticSharedModal',
+                                    'data-header' => $view['translator']->trans('mautic.notification.mobile_notification.header.preview'),
+                                    'data-footer' => 'false',
+                                    'href'        => $view['router']->path(
+                                        'mautic_mobile_notification_action',
+                                        ['objectId' => $item->getId(), 'objectAction' => 'preview']
+                                    ),
+                                ],
+                                'btnText'   => $view['translator']->trans('mautic.mobile_notification.preview'),
+                                'iconClass' => 'fa fa-share',
+                            ],
+                        ];
+                        echo $view->render(
+                            'MauticCoreBundle:Helper:list_actions.html.php',
+                            [
+                                'item'            => $item,
+                                'templateButtons' => [
+                                    'edit'   => $edit,
+                                    'delete' => $view['security']->hasEntityAccess(
+                                        $permissions['notification:mobile_notifications:deleteown'],
+                                        $permissions['notification:mobile_notifications:deleteother'],
+                                        $item->getCreatedBy()
+                                    ),
+                                ],
+                                'routeBase'     => 'mobile_notification',
+                                'customButtons' => $customButtons,
+                            ]
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <div>
+                            <?php if ($type == 'template'): ?>
+                                <?php echo $view->render(
+                                    'MauticCoreBundle:Helper:publishstatus_icon.html.php',
+                                    ['item' => $item, 'model' => 'notification']
+                                ); ?>
+                            <?php else: ?>
+                                <i class="fa fa-fw fa-lg fa-toggle-on text-muted disabled"></i>
+                            <?php endif; ?>
+                            <a href="<?php echo $view['router']->path(
+                                'mautic_mobile_notification_action',
+                                ['objectAction' => 'view', 'objectId' => $item->getId()]
+                            ); ?>">
+                                <?php echo $item->getName(); ?>
+                                <?php if ($type == 'list'): ?>
+                                    <span data-toggle="tooltip" title="<?php echo $view['translator']->trans(
+                                        'mautic.notification.icon_tooltip.list_notification'
+                                    ); ?>"><i class="fa fa-fw fa-list"></i></span>
+                                <?php endif; ?>
+                            </a>
+                        </div>
+                    </td>
+                    <td class="visible-md visible-lg">
+                        <?php $category = $item->getCategory(); ?>
+                        <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
+                        <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
+                        <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
+                    </td>
+                    <td class="visible-sm visible-md visible-lg col-stats">
+                        <span class="mt-xs label label-warning"><?php echo $view['translator']->trans(
+                                'mautic.notification.stat.sentcount',
+                                ['%count%' => $item->getSentCount(true)]
+                            ); ?></span>
+                    </td>
+                    <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+    <div class="panel-footer">
+        <?php echo $view->render(
+            'MauticCoreBundle:Helper:pagination.html.php',
+            [
+                'totalItems' => $totalItems,
+                'page'       => $page,
+                'limit'      => $limit,
+                'baseUrl'    => $view['router']->path('mautic_mobile_notification_index'),
+                'sessionVar' => 'mobile_notification',
+            ]
+        ); ?>
+    </div>
+<?php else: ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php'); ?>
+<?php endif; ?>
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/list_graph.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/list_graph.html.php
new file mode 100644
index 00000000000..786352114cd
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/list_graph.html.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+<!--
+some stats: need more input on what type of form data to show.
+delete if it is not require
+-->
+<div class="pa-md">
+    <div class="row">
+        <div class="col-sm-12">
+            <?php if ($showVariants): ?>
+            <div class="text-right small">
+                <span>
+                    <?php if ($isVariant): ?>
+                    <span data-chart="variant"><?php echo $view['translator']->trans('mautic.notification.variant.graph.variant'); ?></span>
+                    <?php else: ?>
+                    <a data-chart="variant" href="javascript:void(0)"><?php echo $view['translator']->trans('mautic.notification.variant.graph.variant'); ?></a>
+                    <?php endif; ?>
+                </span>
+                </span> | </span>
+                <span>
+                    <?php if ($isVariant): ?>
+                    <a data-chart="all" href="javascript:void(0)"><?php echo $view['translator']->trans('mautic.notification.variant.graph.all'); ?></a>
+                    <?php else: ?>
+                    <span data-chart="all"><?php echo $view['translator']->trans('mautic.notification.variant.graph.all'); ?></span>
+                    <?php endif; ?>
+                </span>
+            </div>
+            <?php endif; ?>
+            <div class="panel">
+                <div class="panel-body box-layout">
+                    <div class="col-xs-4 va-m">
+                        <h5 class="text-white dark-md fw-sb mb-xs">
+                            <span class="fa fa-envelope"></span>
+                            <?php echo $view['translator']->trans('mautic.notification.lead.list.comparison'); ?>
+                        </h5>
+                    </div>
+                    <div class="col-xs-8 va-m" id="legend"></div>
+                </div>
+                <div class="pt-0 pl-15 pb-10 pr-15">
+                    <div>
+                        <canvas id="list-compare-chart" height="300"></canvas>
+                    </div>
+                </div>
+                <div id="list-compare-chart-data" class="hide"><?php echo json_encode($stats); ?></div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--/ some stats -->
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/preview.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/preview.html.php
new file mode 100644
index 00000000000..f29204e1333
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/preview.html.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+/* @var \Mautic\NotificationBundle\Entity\Notification $notification */
+$url    = $notification->getUrl();
+$button = $notification->getButton();
+
+?>
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">
+            <?php echo $notification->getHeading()?>
+            <?php if ($url) : ?>
+            <span class="pull-right">
+                <a href="<?php echo $url; ?>" target="_blank"><span class="fa fa-external-link"></span></a>
+            </span>
+            <?php endif; ?>
+        </h3>
+    </div>
+    <div class="panel-body">
+        <p><?php echo $notification->getMessage()?></p>
+        <?php if ($url && $button) : ?>
+            <br>
+            <p><a href="<?php echo $url ?>" class="btn btn-primary"><?php echo $button ?></a></p>
+        <?php endif; ?>
+    </div>
+</div>
diff --git a/app/bundles/NotificationBundle/Views/MobileNotification/template_graph.html.php b/app/bundles/NotificationBundle/Views/MobileNotification/template_graph.html.php
new file mode 100644
index 00000000000..b1639f91a97
--- /dev/null
+++ b/app/bundles/NotificationBundle/Views/MobileNotification/template_graph.html.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+?>
+<!--
+some stats: need more input on what type of form data to show.
+delete if it is not require
+-->
+<div class="pa-md">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="panel">
+                <div class="panel-body box-layout">
+                    <div class="col-xs-4 va-m">
+                        <h5 class="text-white dark-md fw-sb mb-xs">
+                            <span class="fa fa-envelope"></span>
+                            <?php echo $view['translator']->trans('mautic.notification.stats'); ?>
+                        </h5>
+                    </div>
+                    <div class="col-xs-6 va-m" id="legend"></div>
+                    <div class="col-xs-2 va-m">
+                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['callback' => 'updateNotificationStatsChart']); ?>
+
+                    </div>
+                </div>
+                <div class="pt-0 pl-15 pb-10 pr-15">
+                    <div>
+                        <canvas id="stat-chart" height="300"></canvas>
+                    </div>
+                </div>
+                <div id="stat-chart-data" class="hide"><?php echo json_encode($stats); ?></div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--/ some stats -->
diff --git a/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
index d8201c2196a..9b0be91d5b9 100644
--- a/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -9,7 +9,9 @@
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $data = $event['extra']['log']['metadata'];
-
+if (isset($data['failed'])) {
+    return;
+}
 ?>
 
 <dl class="dl-horizontal">
diff --git a/app/bundles/PageBundle/Config/config.php b/app/bundles/PageBundle/Config/config.php
index cd9d3a9a7e0..de41578eb59 100644
--- a/app/bundles/PageBundle/Config/config.php
+++ b/app/bundles/PageBundle/Config/config.php
@@ -152,7 +152,10 @@
                 ],
             ],
             'mautic.page.webhook.subscriber' => [
-                'class' => 'Mautic\PageBundle\EventListener\WebhookSubscriber',
+                'class'       => 'Mautic\PageBundle\EventListener\WebhookSubscriber',
+                'methodCalls' => [
+                    'setWebhookModel' => ['mautic.webhook.model.webhook'],
+                ],
             ],
             'mautic.page.dashboard.subscriber' => [
                 'class'     => 'Mautic\PageBundle\EventListener\DashboardSubscriber',
@@ -252,6 +255,9 @@
                     'setCatInUrl' => [
                         '%mautic.cat_in_page_url%',
                     ],
+                    'setTrackByFingerprint' => [
+                        '%mautic.track_by_fingerprint%',
+                    ],
                 ],
             ],
             'mautic.page.model.redirect' => [
@@ -283,10 +289,11 @@
     ],
 
     'parameters' => [
-        'cat_in_page_url'     => false,
-        'google_analytics'    => false,
-        'track_contact_by_ip' => false,
-        'redirect_list_types' => [
+        'cat_in_page_url'      => false,
+        'google_analytics'     => false,
+        'track_contact_by_ip'  => false,
+        'track_by_fingerprint' => false,
+        'redirect_list_types'  => [
             '301' => 'mautic.page.form.redirecttype.permanent',
             '302' => 'mautic.page.form.redirecttype.temporary',
         ],
diff --git a/app/bundles/PageBundle/Entity/TrackableRepository.php b/app/bundles/PageBundle/Entity/TrackableRepository.php
index 50de44c0285..1e3a3a3e2f3 100644
--- a/app/bundles/PageBundle/Entity/TrackableRepository.php
+++ b/app/bundles/PageBundle/Entity/TrackableRepository.php
@@ -148,7 +148,7 @@ public function upHitCount($redirectId, $channel, $channelId, $increaseBy = 1, $
     public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
-            ->select('count(DISTINCT(cut.redirect_id)) as click_count')
+            ->select('count(ph.id) as click_count')
             ->from(MAUTIC_TABLE_PREFIX.'channel_url_trackables', 'cut')
             ->leftJoin('cut', MAUTIC_TABLE_PREFIX.'page_hits', 'ph', 'ph.redirect_id = cut.redirect_id');
 
@@ -160,7 +160,7 @@ public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery
             if (!is_array($channelIds)) {
                 $channelIds = [(int) $channelIds];
             }
-            $q->where(
+            $q->andWhere(
                 $q->expr()->in('cut.channel_id', $channelIds)
             );
         }
@@ -171,6 +171,12 @@ public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery
             if (true === $listId) {
                 $q->addSelect('cs.leadlist_id')
                     ->groupBy('cs.leadlist_id');
+            } elseif (is_array($listId)) {
+                $q->andWhere(
+                    $q->expr()->in('cs.leadlist_id', array_map('intval', $listId))
+                )
+                    ->addSelect('cs.leadlist_id')
+                    ->groupBy('cs.leadlist_id');
             } else {
                 $q->andWhere('cs.leadlist_id = :list_id')
                     ->setParameter('list_id', $listId);
@@ -183,7 +189,7 @@ public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery
 
         $results = $q->execute()->fetchAll();
 
-        if (true === $listId) {
+        if (true === $listId || is_array($listId)) {
             // Return array of results
             $byList = [];
             foreach ($results as $result) {
diff --git a/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php b/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
index 89cd4781842..983d7831d9b 100644
--- a/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
@@ -238,6 +238,10 @@ public function onBuildJsForVideo(BuildJsEvent $event)
         $mediaElementCss = $this->assetsHelper->getUrl('media/css/mediaelementplayer.css', null, null, true);
         $jQueryUrl       = $this->assetsHelper->getUrl('app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js', null, null, true);
 
+        $mauticBaseUrl   = str_replace('/index_dev.php', '', $mauticBaseUrl);
+        $mediaElementCss = str_replace('/index_dev.php', '', $mediaElementCss);
+        $jQueryUrl       = str_replace('/index_dev.php', '', $jQueryUrl);
+
         $mediaElementJs = <<<'JS'
 /*!
  *
@@ -272,8 +276,13 @@ public function onBuildJsForVideo(BuildJsEvent $event)
         $js = <<<JS
 MauticJS.initGatedVideo = function () {
     MauticJS.videoElements = MauticJS.videoElements || document.getElementsByTagName('video');
-    
+    if (MauticJS.videoElements.length) {
+        MauticJS.videoElements = Array.prototype.filter.call(MauticJS.videoElements, function(videoElements){
+            return null !== videoElements.attributes.getNamedItem('data-form-id');
+        });
+    }
     if (! MauticJS.videoElements.length) {
+        MauticJS.videoElements = null;
         return;
     }
 
diff --git a/app/bundles/PageBundle/EventListener/BuilderSubscriber.php b/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
index c294f6102e5..3b70aa7c92a 100644
--- a/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
@@ -12,6 +12,7 @@
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Form\Type\GatedVideoType;
 use Mautic\CoreBundle\Form\Type\SlotTextType;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
 use Mautic\EmailBundle\EmailEvents;
@@ -127,9 +128,25 @@ public function onPageBuild(Events\PageBuilderEvent $event)
                 'Image',
                 'image',
                 'MauticCoreBundle:Slots:image.html.php',
-                'slot',
+                'slot_image',
                 900
             );
+            $event->addSlotType(
+                'imagecard',
+                'Image Card',
+                'id-card-o',
+                'MauticCoreBundle:Slots:imagecard.html.php',
+                'slot_imagecard',
+                870
+            );
+            $event->addSlotType(
+                'imagecaption',
+                'Image+Caption',
+                'image',
+                'MauticCoreBundle:Slots:imagecaption.html.php',
+                'slot_imagecaption',
+                850
+            );
             $event->addSlotType(
                 'button',
                 'Button',
@@ -138,13 +155,45 @@ public function onPageBuild(Events\PageBuilderEvent $event)
                 'slot_button',
                 800
             );
+            $event->addSlotType(
+                'socialshare',
+                'Social Share',
+                'share-alt',
+                'MauticCoreBundle:Slots:socialshare.html.php',
+                'slot_socialshare',
+                700
+            );
+            $event->addSlotType(
+                'socialfollow',
+                'Social Follow',
+                'twitter',
+                'MauticCoreBundle:Slots:socialfollow.html.php',
+                'slot_socialfollow',
+                600
+            );
+            $event->addSlotType(
+                'codemode',
+                'Code Mode',
+                'code',
+                'MauticCoreBundle:Slots:codemode.html.php',
+                'slot_codemode',
+                500
+            );
             $event->addSlotType(
                 'separator',
                 'Separator',
                 'minus',
                 'MauticCoreBundle:Slots:separator.html.php',
-                'slot',
-                700
+                'slot_separator',
+                400
+            );
+            $event->addSlotType(
+                'gatedvideo',
+                'Video',
+                'video-camera',
+                'MauticCoreBundle:Slots:gatedvideo.html.php',
+                GatedVideoType::class,
+                600
             );
         }
 
diff --git a/app/bundles/PageBundle/EventListener/CampaignSubscriber.php b/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
index 3725a319e7b..9080d61fcfd 100644
--- a/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
@@ -153,7 +153,7 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
 
         // **Page hit is true if:**
         // 1. no landing page is set and no URL rule is set
-        $applyToAny = (empty($config['url']) && empty($limitToPages));
+        $applyToAny = (empty($config['url']) && empty($config['referer']) && empty($limitToPages));
 
         // 2. some landing pages are set and page ID match
         $langingPageIsHit = (!empty($limitToPages) && in_array($pageHitId, $limitToPages));
diff --git a/app/bundles/PageBundle/EventListener/ReportSubscriber.php b/app/bundles/PageBundle/EventListener/ReportSubscriber.php
index 9b1e087ab73..d5ffe9ecaab 100644
--- a/app/bundles/PageBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/ReportSubscriber.php
@@ -102,7 +102,8 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $columns = array_merge(
                 $columns,
                 $event->getStandardColumns('p.', ['name', 'description'], 'mautic_page_action'),
-                $event->getCategoryColumns()
+                $event->getCategoryColumns(),
+                $event->getCampaignByChannelColumns()
             );
             $data = [
                 'display_name' => 'mautic.page.pages',
@@ -257,6 +258,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                     ->leftJoin('p', MAUTIC_TABLE_PREFIX.'pages', 'tp', 'p.id = tp.id')
                     ->leftJoin('p', MAUTIC_TABLE_PREFIX.'pages', 'vp', 'p.id = vp.id');
                 $event->addCategoryLeftJoin($qb, 'p');
+                $event->addCampaignByChannelJoin($qb, 'p', 'page');
                 break;
             case 'page.hits':
                 $event->applyDateFilters($qb, 'date_hit', 'ph');
@@ -271,6 +273,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                 $event->addIpAddressLeftJoin($qb, 'ph');
                 $event->addCategoryLeftJoin($qb, 'p');
                 $event->addLeadLeftJoin($qb, 'ph');
+                $event->addCampaignByChannelJoin($qb, 'p', 'page');
                 break;
         }
 
diff --git a/app/bundles/PageBundle/EventListener/WebhookSubscriber.php b/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
index 7141809a1e7..1a49e15653b 100644
--- a/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
@@ -12,8 +12,10 @@
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\PageBundle\Event\PageHitEvent;
 use Mautic\PageBundle\PageEvents;
 use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\EventListener\WebhookModelTrait;
 use Mautic\WebhookBundle\WebhookEvents;
 
 /**
@@ -21,6 +23,8 @@
  */
 class WebhookSubscriber extends CommonSubscriber
 {
+    use WebhookModelTrait;
+
     /**
      * @return array
      */
@@ -28,6 +32,7 @@ public static function getSubscribedEvents()
     {
         return [
             WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+            PageEvents::PAGE_ON_HIT         => ['onPageHit', 0],
         ];
     }
 
@@ -47,4 +52,23 @@ public function onWebhookBuild(WebhookBuilderEvent $event)
         // add it to the list
         $event->addEvent(PageEvents::PAGE_ON_HIT, $pageHit);
     }
+
+    /**
+     * @param PageHitEvent $event
+     */
+    public function onPageHit(PageHitEvent $event)
+    {
+        $this->webhookModel->queueWebhooksByType(
+            PageEvents::PAGE_ON_HIT,
+            [
+                'hit' => $event->getHit(),
+            ],
+            [
+                'hitDetails',
+                'emailDetails',
+                'pageList',
+                'leadList',
+            ]
+        );
+    }
 }
diff --git a/app/bundles/PageBundle/Form/Type/ConfigType.php b/app/bundles/PageBundle/Form/Type/ConfigType.php
index 89220aa354a..7612be29dc9 100644
--- a/app/bundles/PageBundle/Form/Type/ConfigType.php
+++ b/app/bundles/PageBundle/Form/Type/ConfigType.php
@@ -63,6 +63,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ]
         );
+
+        $builder->add('track_by_fingerprint', 'yesno_button_group', [
+            'label' => 'mautic.page.config.form.track.by.fingerprint',
+            'data'  => (bool) $options['data']['track_by_fingerprint'],
+            'attr'  => [
+                'tooltip' => 'mautic.page.config.form.track.by.fingerprint.tooltip',
+            ],
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Model/PageModel.php b/app/bundles/PageBundle/Model/PageModel.php
index 0cdb4a305d2..8ac2f5dfdf9 100644
--- a/app/bundles/PageBundle/Model/PageModel.php
+++ b/app/bundles/PageBundle/Model/PageModel.php
@@ -54,6 +54,11 @@ class PageModel extends FormModel
      */
     protected $catInUrl;
 
+    /**
+     * @var bool
+     */
+    protected $trackByFingerprint;
+
     /**
      * @var CookieHelper
      */
@@ -119,6 +124,14 @@ public function setCatInUrl($catInUrl)
         $this->catInUrl = $catInUrl;
     }
 
+    /**
+     * @param $trackByFingerprint
+     */
+    public function setTrackByFingerprint($trackByFingerprint)
+    {
+        $this->trackByFingerprint = $trackByFingerprint;
+    }
+
     /**
      * @return \Mautic\PageBundle\Entity\PageRepository
      */
@@ -453,7 +466,7 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
 
         // Get lead if required
         if (null == $lead) {
-            $lead = $this->leadModel->getContactFromRequest($query);
+            $lead = $this->leadModel->getContactFromRequest($query, $this->trackByFingerprint);
         }
 
         if ($lead && !$lead->getId()) {
@@ -857,8 +870,8 @@ public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $date
         }
 
         if ($flag == 'unique' || $flag == 'total_and_unique') {
-            $q = $query->prepareTimeDataQuery('page_hits', 'date_hit', $filter);
-            $q->groupBy('t.lead_id, t.date_hit');
+            $q = $query->prepareTimeDataQuery('page_hits', 'date_hit', $filter, 'distinct(t.lead_id)');
+            $q->groupBy('DATE_FORMAT(t.date_hit, \'%Y-%m-%d\')');
 
             if (!$canViewOthers) {
                 $this->limitQueryToCreator($q);
diff --git a/app/bundles/PageBundle/Translations/en_US/messages.ini b/app/bundles/PageBundle/Translations/en_US/messages.ini
index 33c41260d07..ae834d9b095 100644
--- a/app/bundles/PageBundle/Translations/en_US/messages.ini
+++ b/app/bundles/PageBundle/Translations/en_US/messages.ini
@@ -20,6 +20,8 @@ mautic.page.campaign.event.pagehit="Visits a page"
 mautic.page.campaign.event.pagehit_descr="Trigger actions on a page/url hit."
 mautic.page.config.form.cat.in.url="Show category in page URL?"
 mautic.page.config.form.cat.in.url.tooltip="If enabled, the category slug will be included in the URL."
+mautic.page.config.form.track.by.fingerprint="Identify returning visitor by device fingerprint"
+mautic.page.config.form.track.by.fingerprint.tooltip="If enabled, identify returning visitor by device fingerprint when no cookie exists yet."
 mautic.page.config.form.google.analytics="Analytics script (i.e. Google Analytics)"
 mautic.page.config.form.google.analytics.tooltip="Insert the analytics script to have it automatically included in the soure of landing pages."
 mautic.page.config.form.track_contact_by_ip="Track visitors by IP"
diff --git a/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php b/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
index d294bd2b7f8..583b19c7bb6 100644
--- a/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
+++ b/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
@@ -16,7 +16,7 @@
     </div>
     <div class="panel-body">
         <?php foreach ($form->children as $name => $f): ?>
-            <?php if ('track_contact_by_ip' == $name) {
+            <?php if ('track_contact_by_ip' == $name && 'track_by_fingerprint' == $name) {
     continue;
 } ?>
             <div class="row">
@@ -30,6 +30,7 @@
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.config.tab.pagetracking'); ?></h3>
     </div>
     <div class="panel-body">
+        <div class="form-group">
     <p><?php echo $view['translator']->trans('mautic.config.tab.pagetracking.info'); ?></p>
 <pre>&lt;script&gt;
     (function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n;
@@ -39,10 +40,14 @@
 
     mt('send', 'pageview');
 &lt;/script&gt;</pre>
+        </div>
         <div class="row">
             <div class="col-md-6">
                 <?php echo $view['form']->row($form['track_contact_by_ip']); ?>
             </div>
+            <div class="col-md-6">
+                <?php echo $view['form']->row($form->children['track_by_fingerprint']); ?>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Assets/css/plugin.css b/app/bundles/PluginBundle/Assets/css/plugin.css
index f205f6b2fa9..31fdcc28e7d 100644
--- a/app/bundles/PluginBundle/Assets/css/plugin.css
+++ b/app/bundles/PluginBundle/Assets/css/plugin.css
@@ -19,3 +19,31 @@
     filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'1 0 0 0 0, 0 1 0 0 0, 0 0 1 0 0, 0 0 0 1 0\'/></filter></svg>#grayscale");
     -webkit-filter: grayscale(0%);
 }
+.field-selector {
+    width: 500px;
+}
+.col-centered{
+    margin: 0 auto;
+    float: none;
+}
+
+.placeholder
+{
+    position: relative;
+}
+
+.placeholder::after
+{
+    position: absolute;
+    right: 3px;
+    top: 19px;
+    content: attr(data-placeholder);
+    pointer-events: none;
+    opacity: 0.3;
+    font-size: 9px
+}
+
+.integration-fields{
+    font-size: 12px;
+    padding-left: 7px;
+}
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Assets/js/plugin.js b/app/bundles/PluginBundle/Assets/js/plugin.js
index 310e23cc638..5dfae876d2a 100644
--- a/app/bundles/PluginBundle/Assets/js/plugin.js
+++ b/app/bundles/PluginBundle/Assets/js/plugin.js
@@ -1,5 +1,17 @@
 /* PluginBundle */
-
+Mautic.matchedFields = function (index, object, integration) {
+    var integrationField = mQuery('#integration_details_featureSettings_'+object+'Fields_i_' + index).val();
+    var mauticField = mQuery('#integration_details_featureSettings_'+object+'Fields_m_' + index + ' option:selected').val();
+    if (object == 'lead') {
+        var updateMauticField = mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic' + index + ']"]:checked').val();
+    } else {
+        var updateMauticField = mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic_company' + index + ']"]:checked').val();
+    }
+    Mautic.ajaxActionRequest('plugin:matchFields', {object: object, integration: integration, integrationField : integrationField, mauticField: mauticField, updateMautic : updateMauticField}, function(response) {
+        var theMessage = (response.success) ? '<i class="fa fa-check-circle text-success"></i>' : '';
+        mQuery('#matched-' + index + "-" + object).html(theMessage);
+    });
+};
 Mautic.initiateIntegrationAuthorization = function() {
     mQuery('#integration_details_in_auth').val(1);
 
@@ -51,6 +63,50 @@ Mautic.integrationOnLoad = function(container, response) {
     } else {
         Mautic.filterIntegrations();
     }
+    mQuery('[data-toggle="tooltip"]').tooltip();
+};
+
+Mautic.integrationConfigOnLoad = function(container) {
+    if (mQuery('.fields-container select.integration-field').length) {
+        var selects = mQuery('.fields-container select.integration-field');
+        selects.on('change', function() {
+            var select   = mQuery(this),
+                newValue = select.val(),
+                previousValue = select.attr('data-value');
+            select.attr('data-value', newValue);
+
+            var groupSelects = mQuery(this).closest('.fields-container').find('select.integration-field').not(select);
+
+            // Enable old value
+            if (previousValue) {
+                mQuery('option[value="' + previousValue + '"]', groupSelects).each(function() {
+                    if (!mQuery(this).closest('select').prop('disabled')) {
+                        mQuery(this).prop('disabled', false);
+                        mQuery(this).removeAttr('disabled');
+                    }
+                });
+            }
+
+            if (newValue) {
+                mQuery('option[value="' + newValue + '"]', groupSelects).each(function() {
+                    if (!mQuery(this).closest('select').prop('disabled')) {
+                        mQuery(this).prop('disabled', true);
+                        mQuery(this).attr('disabled', 'disabled');
+                    }
+                });
+            }
+
+            groupSelects.each(function() {
+                mQuery(this).trigger('chosen:updated');
+            });
+        });
+
+        selects.each(function() {
+            if (!mQuery(this).closest('.field-container').hasClass('hide')) {
+                mQuery(this).trigger('change');
+            }
+        });
+    }
 };
 
 Mautic.filterIntegrations = function(update) {
@@ -91,85 +147,142 @@ Mautic.filterIntegrations = function(update) {
 };
 
 Mautic.getIntegrationLeadFields = function (integration, el, settings) {
-    Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
 
     if (typeof settings == 'undefined') {
         settings = {};
     }
+    settings.integration = integration;
+    settings.object      = 'lead';
 
-    var data = {integration: integration, settings: settings};
+    Mautic.getIntegrationFields(settings, 1, el);
+};
+
+Mautic.getIntegrationCompanyFields = function (integration, el, settings) {
+    if (typeof settings == 'undefined') {
+        settings = {};
+    }
+    settings.integration = integration;
+    settings.object      = 'company';
+
+    Mautic.getIntegrationFields(settings, 1, el);
+};
 
-    mQuery('#leadFieldsContainer').html('');
+Mautic.getIntegrationFields = function(settings, page, el) {
+    var object    = settings.object ? settings.object : 'lead';
+    var fieldsTab = ('lead' === object) ? '#fields-tab' : '#'+object+'-fields-container';
+
+    if (el) {
+        Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
+    }
 
-    Mautic.ajaxActionRequest('plugin:getIntegrationLeadFields', data,
+    var fieldsContainer = '#'+object+'FieldsContainer';
+
+    var inModal = mQuery(fieldsContainer).closest('.modal');
+    if (inModal) {
+        var modalId = '#'+mQuery(fieldsContainer).closest('.modal').attr('id');
+        Mautic.startModalLoadingBar(modalId);
+    }
+
+    Mautic.ajaxActionRequest('plugin:getIntegrationFields',
+        {
+            page: page,
+            integration: (settings.integration) ? settings.integration : null,
+            settings: settings
+        },
         function(response) {
             if (response.success) {
-                mQuery('#leadFieldsContainer').replaceWith(response.html);
-                Mautic.onPageLoad('#leadFieldsContainer');
-
-                if (mQuery('#fields-tab').length) {
-                    mQuery('#fields-tab').removeClass('hide');
+                mQuery(fieldsContainer).replaceWith(response.html);
+                Mautic.onPageLoad(fieldsContainer);
+                Mautic.integrationConfigOnLoad(fieldsContainer);
+                if (mQuery(fieldsTab).length) {
+                    mQuery(fieldsTab).removeClass('hide');
                 }
             } else {
-                if (mQuery('#fields-tab').length) {
-                    mQuery('#fields-tab').addClass('hide');
+                if (mQuery(fieldsTab).length) {
+                    mQuery(fieldsTab).addClass('hide');
                 }
             }
-            Mautic.removeLabelLoadingIndicator();
+
+            if (el) {
+                Mautic.removeLabelLoadingIndicator();
+            }
+
+            if (inModal) {
+                Mautic.stopModalLoadingBar(modalId);
+            }
         }
     );
 };
 
-Mautic.getIntegrationCompanyFields = function (integration, el, settings) {
+Mautic.getIntegrationConfig = function (el, settings) {
     Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
 
     if (typeof settings == 'undefined') {
         settings = {};
     }
 
-    var data = {integration: integration, settings: settings};
-
-    mQuery('#companyFieldsContainer').html('');
+    settings.name = mQuery(el).attr('name');
+    var data = {integration: mQuery(el).val(), settings: settings};
+    mQuery('.integration-campaigns-status').html('');
+    mQuery('.integration-config-container').html('');
 
-    Mautic.ajaxActionRequest('plugin:getIntegrationCompanyFields', data,
-        function(response) {
+    Mautic.ajaxActionRequest('plugin:getIntegrationConfig', data,
+        function (response) {
             if (response.success) {
-                mQuery('#companyFieldsContainer').replaceWith(response.html);
-                Mautic.onPageLoad('#companyFieldsContainer');
-
-                if (mQuery('#company-fields-container').length) {
-                    mQuery('#company-fields-container').removeClass('hide');
-                }
-            } else {
-                if (mQuery('#company-fields-container').length) {
-                    mQuery('#company-fields-container').addClass('hide');
-                }
+                mQuery('.integration-config-container').html(response.html);
+                Mautic.onPageLoad('.integration-config-container', response);
             }
+
+            Mautic.integrationConfigOnLoad('.integration-config-container');
             Mautic.removeLabelLoadingIndicator();
         }
     );
-};
 
 
-Mautic.getIntegrationConfig = function (el, settings) {
-    Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
+};
 
+Mautic.getIntegrationCampaignStatus = function (el, settings) {
+    Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
     if (typeof settings == 'undefined') {
         settings = {};
     }
+    settings.name = mQuery('#campaignevent_properties_integration').attr('name');
+    var data = {integration:mQuery('#campaignevent_properties_integration').val(),campaign: mQuery(el).val(), settings: settings};
+    if(typeof mQuery('#campaignevent_properties_integration').val() == 'undefined') {
+        data = {integration:mQuery('#formaction_properties_integration').val(),campaign: mQuery(el).val(), settings: settings};
+    }
+    mQuery('.integration-campaigns-status').html('');
+    mQuery('.integration-campaigns-status').removeClass('hide');
+    Mautic.ajaxActionRequest('plugin:getIntegrationCampaignStatus', data,
+        function (response) {
 
-    settings.name = mQuery(el).attr('name');
-    var data = {integration: mQuery(el).val(), settings: settings};
+            if (response.success) {
+                mQuery('.integration-campaigns-status').append(response.html);
+                Mautic.onPageLoad('.integration-campaigns-status', response);
+            }
 
-    mQuery('.integration-config-container').html('');
+            Mautic.integrationConfigOnLoad('.integration-campaigns-status');
+            Mautic.removeLabelLoadingIndicator();
+        }
+    );
+};
 
-    Mautic.ajaxActionRequest('plugin:getIntegrationConfig', data,
+Mautic.getIntegrationCampaigns = function (el, settings) {
+    Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));
+
+    var data = {integration: mQuery(el).val()};
+
+    mQuery('.integration-campaigns').html('');
+
+    Mautic.ajaxActionRequest('plugin:getIntegrationCampaigns', data,
         function (response) {
             if (response.success) {
-                mQuery('.integration-config-container').html(response.html);
-                Mautic.onPageLoad('.integration-config-container');
+                console.log(response.html);
+                mQuery('.integration-campaigns').html(response.html);
+                Mautic.onPageLoad('.integration-campaigns', response);
             }
 
+            Mautic.integrationConfigOnLoad('.integration-campaigns');
             Mautic.removeLabelLoadingIndicator();
         }
     );
diff --git a/app/bundles/PluginBundle/Command/FetchLeadsCommand.php b/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
index 642750c4c17..3eed67c249b 100644
--- a/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
+++ b/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
@@ -30,8 +30,7 @@ protected function configure()
             ->setName('mautic:integration:fetchleads')
             ->setAliases(
                 [
-                    'mautic:integration:fetchleads',
-                    'mautic:fetchleads:integration',
+                    'mautic:integration:synccontacts',
                 ]
             )
             ->setDescription('Fetch leads from integration.')
@@ -55,6 +54,13 @@ protected function configure()
                 InputOption::VALUE_OPTIONAL,
                 'Send time interval to check updates on Salesforce, it should be a correct php formatted time interval in the past eg:(-10 minutes)'
             )
+            ->addOption(
+                '--limit',
+                '-l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of records to process when syncing objects',
+                25
+            )
             ->addOption('--force', '-f', InputOption::VALUE_NONE, 'Force execution even if another process is assumed running.');
 
         parent::configure();
@@ -67,14 +73,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $container = $this->getContainer();
 
-        /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
-        $factory = $container->get('mautic.factory');
-
-        $translator  = $factory->getTranslator();
+        $translator  = $container->get('translator');
         $integration = $input->getOption('integration');
         $startDate   = $input->getOption('start-date');
         $endDate     = $input->getOption('end-date');
         $interval    = $input->getOption('time-interval');
+        $limit       = $input->getOption('limit');
+        $leads       = $contacts       = 0;
 
         if (!$interval) {
             $interval = '15 minutes';
@@ -87,28 +92,40 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         if ($integration && $startDate && $endDate) {
             /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
-            $integrationHelper = $factory->getHelper('integration');
+            $integrationHelper = $container->get('mautic.helper.integration');
 
             $integrationObject = $integrationHelper->getIntegrationObject($integration);
             $config            = $integrationObject->mergeConfigToFeatureSettings();
+            $supportedFeatures = $integrationObject->getIntegrationSettings()->getSupportedFeatures();
+
+            if (!isset($config['objects'])) {
+                $config['objects'] = [];
+            }
 
             $params['start'] = $startDate;
             $params['end']   = $endDate;
-
-            if ($integrationObject !== null && method_exists($integrationObject, 'getLeads') && (in_array('Lead', $config['objects']) || in_array('contacts', $config['objects']))) {
-                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.fetch.leads', ['%integration%' => $integration]).'</info>');
-                if (strtotime($startDate) > strtotime('-30 days')) {
-                    $processed = intval($integrationObject->getLeads($params));
-
-                    $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.starting').'</comment>');
-
-                    $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.events_executed', ['%events%' => $processed]).'</comment>'."\n");
-                } else {
-                    $output->writeln('<error>'.$translator->trans('mautic.plugin.command.fetch.leads.wrong.date').'</error>');
+            $params['limit'] = $limit;
+            if (isset($supportedFeatures) && in_array('get_leads', $supportedFeatures)) {
+                if ($integrationObject !== null && method_exists($integrationObject, 'getLeads') && isset($config['objects'])) {
+                    $output->writeln('<info>'.$translator->trans('mautic.plugin.command.fetch.leads', ['%integration%' => $integration]).'</info>');
+                    if (strtotime($startDate) > strtotime('-30 days')) {
+                        if (in_array('Lead', $config['objects'])) {
+                            $processed = intval($integrationObject->getLeads($params, null, $leads, [], 'Lead'));
+                        }
+                        if (in_array('Contact', $config['objects'])) {
+                            $processed += intval($integrationObject->getLeads($params, null, $contacts, [], 'Contact'));
+                        }
+
+                        $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.starting').'</comment>');
+
+                        $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.events_executed', ['%events%' => $processed]).'</comment>'."\n");
+                    } else {
+                        $output->writeln('<error>'.$translator->trans('mautic.plugin.command.fetch.leads.wrong.date').'</error>');
+                    }
                 }
             }
 
-            if ($integrationObject !== null && method_exists($integrationObject, 'getCompanies') && in_array('company', $config['objects'])) {
+            if ($integrationObject !== null && method_exists($integrationObject, 'getCompanies') && isset($config['objects']) && in_array('company', $config['objects'])) {
                 $output->writeln('<info>'.$translator->trans('mautic.plugin.command.fetch.companies', ['%integration%' => $integration]).'</info>');
 
                 if (strtotime($startDate) > strtotime('-30 days')) {
@@ -121,8 +138,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $output->writeln('<error>'.$translator->trans('mautic.plugin.command.fetch.leads.wrong.date').'</error>');
                 }
             }
-        }
 
-        return 0;
+            if (isset($supportedFeatures) && in_array('push_leads', $supportedFeatures)) {
+                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.pushing.leads', ['%integration%' => $integration]).'</info>');
+                list($updated, $created) = $integrationObject->pushLeads($params);
+                $output->writeln(
+                    '<comment>'.$translator->trans(
+                        'mautic.plugin.command.fetch.pushing.leads.events_executed',
+                        [
+                            '%updated%' => $updated,
+                            '%created%' => $created,
+                        ]
+                    )
+                    .'</comment>'."\n"
+                );
+            }
+
+            return true;
+        }
     }
 }
diff --git a/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php b/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
index c0aabacf307..174c731204b 100644
--- a/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
+++ b/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
@@ -31,7 +31,6 @@ protected function configure()
             ->setAliases(
                 [
                     'mautic:integration:pushactivity',
-                    'mautic:pushactivity:integration',
                 ]
             )
             ->setDescription('Push lead activity to integration.')
diff --git a/app/bundles/PluginBundle/Config/config.php b/app/bundles/PluginBundle/Config/config.php
index 8a956f28480..2482bf47e82 100644
--- a/app/bundles/PluginBundle/Config/config.php
+++ b/app/bundles/PluginBundle/Config/config.php
@@ -25,7 +25,7 @@
                 'controller' => 'MauticPluginBundle:Plugin:index',
             ],
             'mautic_plugin_config' => [
-                'path'       => '/plugins/config/{name}',
+                'path'       => '/plugins/config/{name}/{page}',
                 'controller' => 'MauticPluginBundle:Plugin:config',
             ],
             'mautic_plugin_info' => [
@@ -80,6 +80,12 @@
                     'mautic.helper.integration',
                 ],
             ],
+            'mautic.plugin.leadbundle.subscriber' => [
+                'class'     => 'Mautic\PluginBundle\EventListener\LeadSubscriber',
+                'arguments' => [
+                    'mautic.plugin.model.plugin',
+                ],
+            ],
         ],
         'forms' => [
             'mautic.form.type.integration.details' => [
@@ -88,8 +94,13 @@
             ],
             'mautic.form.type.integration.settings' => [
                 'class'     => 'Mautic\PluginBundle\Form\Type\FeatureSettingsType',
-                'arguments' => 'mautic.factory',
-                'alias'     => 'integration_featuresettings',
+                'arguments' => [
+                    'session',
+                    'mautic.helper.core_parameters',
+                    'translator',
+                    'monolog.logger.mautic',
+                ],
+                'alias' => 'integration_featuresettings',
             ],
             'mautic.form.type.integration.fields' => [
                 'class' => 'Mautic\PluginBundle\Form\Type\FieldsType',
@@ -112,6 +123,10 @@
                 'class' => 'Mautic\PluginBundle\Form\Type\IntegrationConfigType',
                 'alias' => 'integration_config',
             ],
+            'mautic.form.type.integration.campaign' => [
+                'class' => 'Mautic\PluginBundle\Form\Type\IntegrationCampaignsType',
+                'alias' => 'integration_campaign_status',
+            ],
         ],
         'other' => [
             'mautic.helper.integration' => [
diff --git a/app/bundles/PluginBundle/Controller/AjaxController.php b/app/bundles/PluginBundle/Controller/AjaxController.php
index 9a5d6b974d5..cf022020909 100644
--- a/app/bundles/PluginBundle/Controller/AjaxController.php
+++ b/app/bundles/PluginBundle/Controller/AjaxController.php
@@ -13,6 +13,7 @@
 
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
 use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\PluginBundle\Model\PluginModel;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -41,49 +42,74 @@ protected function setIntegrationFilterAction(Request $request)
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function getIntegrationLeadFieldsAction(Request $request)
+    protected function getIntegrationFieldsAction(Request $request)
     {
         $integration = $request->request->get('integration');
         $settings    = $request->request->get('settings');
+        $page        = $request->request->get('page');
 
         $dataArray = ['success' => 0];
 
         if (!empty($integration) && !empty($settings)) {
             /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
-            $helper = $this->factory->getHelper('integration');
-            /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $object */
-            $object = $helper->getIntegrationObject($integration);
+            $helper = $this->get('mautic.helper.integration');
+            /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $integrationObject */
+            $integrationObject = $helper->getIntegrationObject($integration);
 
-            if ($object) {
-                $integrationFields = $object->getFormLeadFields($settings);
+            if ($integrationObject) {
+                if (!$object = $request->attributes->get('object')) {
+                    $object = (isset($settings['object'])) ? $settings['object'] : 'lead';
+                }
+
+                $isLead            = ('lead' === $object);
+                $integrationFields = ($isLead)
+                    ? $integrationObject->getFormLeadFields($settings)
+                    : $integrationObject->getFormCompanyFields(
+                        $settings
+                    );
 
                 if (!empty($integrationFields)) {
+                    $session = $this->get('session');
+                    $session->set('mautic.plugin.'.$integration.'.'.$object.'.page', $page);
+
+                    /** @var PluginModel $pluginModel */
+                    $pluginModel = $this->getModel('plugin');
+
                     // Get a list of custom form fields
-                    $leadFields                            = $this->getModel('plugin')->getLeadFields();
-                    list($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
-                    $defaults                              = $object->getIntegrationSettings()->getFeatureSettings();
-                    $data                                  = isset($defaults['leadFields']) ? $defaults['leadFields'] : [];
-
-                    $form = $this->createForm('integration_fields', $data, [
-                        'lead_fields'          => $leadFields,
-                        'integration_fields'   => $integrationFields,
-                        'csrf_protection'      => false,
-                        'special_instructions' => $specialInstructions,
-                        'alert_type'           => $alertType,
-                    ]);
-
-                    $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
-
-                    $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
-                        'form'      => $form,
-                        'function'  => 'row',
-                        'variables' => [
-                            'integration' => $object,
-                        ],
-                    ])->getContent();
+                    $mauticFields       = ($isLead) ? $pluginModel->getLeadFields() : $pluginModel->getCompanyFields();
+                    $featureSettings    = $integrationObject->getIntegrationSettings()->getFeatureSettings();
+                    $formSettings       = $integrationObject->getFormDisplaySettings();
+                    $enableDataPriority = !empty($formSettings['enable_data_priority']);
+                    $formType           = $isLead ? 'integration_fields' : 'integration_company_fields';
+                    $form               = $this->createForm(
+                        $formType,
+                        isset($featureSettings[$object.'Fields']) ? $featureSettings[$object.'Fields'] : [],
+                        [
+                            'mautic_fields'        => $mauticFields,
+                            'integration_fields'   => $integrationFields,
+                            'csrf_protection'      => false,
+                            'integration_object'   => $integrationObject,
+                            'enable_data_priority' => $enableDataPriority,
+                            'integration'          => $integration,
+                            'page'                 => $page,
+                            'limit'                => $this->get('mautic.helper.core_parameters')->getParameter('default_pagelimit'),
+                        ]
+                    );
+
+                    $html = $this->render(
+                        'MauticCoreBundle:Helper:blank_form.html.php',
+                        [
+                            'form' => $this->setFormTheme(
+                                $form,
+                                'MauticCoreBundle:Helper:blank_form.html.php',
+                                'MauticPluginBundle:FormTheme\Integration'
+                            ),
+                            'function' => 'row',
+                        ]
+                    )->getContent();
 
                     if (!isset($settings['prefix'])) {
-                        $prefix = 'integration_details[featureSettings][leadFields]';
+                        $prefix = 'integration_details[featureSettings]['.$object.'Fields]';
                     } else {
                         $prefix = $settings['prefix'];
                     }
@@ -93,8 +119,8 @@ protected function getIntegrationLeadFieldsAction(Request $request)
                         $idPrefix = substr($idPrefix, 0, -1);
                     }
 
-                    $html = preg_replace('/integration_fields\[(.*?)\]/', $prefix.'[$1]', $html);
-                    $html = str_replace('integration_fields', $idPrefix, $html);
+                    $html = preg_replace('/'.$formType.'\[(.*?)\]/', $prefix.'[$1]', $html);
+                    $html = str_replace($formType, $idPrefix, $html);
 
                     $dataArray['success'] = 1;
                     $dataArray['html']    = $html;
@@ -108,72 +134,31 @@ protected function getIntegrationLeadFieldsAction(Request $request)
     /**
      * Get the HTML for list of fields.
      *
-     * @param Request $request
+     * @deprecated 2.8.0 to be removed in 3.0
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function getIntegrationCompanyFieldsAction(Request $request)
+    protected function getIntegrationLeadFieldsAction(Request $request)
     {
-        $integration = $request->request->get('integration');
-        $settings    = $request->request->get('settings');
-
-        $dataArray = ['success' => 0];
-
-        if (!empty($integration) && !empty($settings)) {
-            /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
-            $helper = $this->get('mautic.helper.integration');
-            /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $object */
-            $object = $helper->getIntegrationObject($integration);
-
-            if ($object) {
-                $integrationFields = $object->getCompanyLeadFields($settings);
-
-                if (!empty($integrationFields)) {
-                    // Get a list of custom form fields
-                    $defaults                              = $object->getIntegrationSettings()->getFeatureSettings();
-                    $companyFields                         = $this->getModel('plugin')->getCompanyFields($defaults);
-                    list($specialInstructions, $alertType) = $object->getFormNotes('companyfield_match');
-                    $data                                  = isset($defaults['companyFields']) ? $defaults['companyFields'] : [];
-
-                    $form = $this->createForm('integration_company_fields', $data, [
-                        'company_fields'             => $companyFields,
-                        'integration_company_fields' => $integrationFields,
-                        'csrf_protection'            => false,
-                        'special_instructions'       => $specialInstructions,
-                        'alert_type'                 => $alertType,
-                    ]);
-
-                    $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
-
-                    $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
-                        'form'      => $form,
-                        'function'  => 'row',
-                        'variables' => [
-                            'integration' => $object,
-                        ],
-                    ])->getContent();
-
-                    if (!isset($settings['prefix'])) {
-                        $prefix = 'integration_details[featureSettings][companyFields]';
-                    } else {
-                        $prefix = $settings['prefix'];
-                    }
-
-                    $idPrefix = str_replace(['][', '[', ']'], '_', $prefix);
-                    if (substr($idPrefix, -1) == '_') {
-                        $idPrefix = substr($idPrefix, 0, -1);
-                    }
+        $request->attributes->set('object', 'lead');
 
-                    $html = preg_replace('/integration_fields\[(.*?)\]/', $prefix.'[$1]', $html);
-                    $html = str_replace('integration_fields', $idPrefix, $html);
+        return $this->getIntegrationFieldsAction($request);
+    }
 
-                    $dataArray['success'] = 1;
-                    $dataArray['html']    = $html;
-                }
-            }
-        }
+    /**
+     * Get the HTML for list of fields.
+     *
+     * @deprecated 2.8.0 to be removed in 3.0
+     *
+     * @param Request $request
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    protected function getIntegrationCompanyFieldsAction(Request $request)
+    {
+        $request->attributes->set('object', 'company');
 
-        return $this->sendJsonResponse($dataArray);
+        return $this->getIntegrationFieldsAction($request);
     }
 
     /**
@@ -196,12 +181,21 @@ protected function getIntegrationConfigAction(Request $request)
             $object = $helper->getIntegrationObject($integration);
 
             if ($object) {
+                $data           = $statusData           = [];
                 $objectSettings = $object->getIntegrationSettings();
                 $defaults       = $objectSettings->getFeatureSettings();
-
+                if (method_exists($object, 'getCampaigns')) {
+                    $campaigns = $object->getCampaigns();
+                    if (isset($campaigns['records']) && !empty($campaigns['records'])) {
+                        foreach ($campaigns['records'] as $campaign) {
+                            $data[$campaign['Id']] = $campaign['Name'];
+                        }
+                    }
+                }
                 $form = $this->createForm('integration_config', $defaults, [
                     'integration'     => $object,
                     'csrf_protection' => false,
+                    'campaigns'       => $data,
                 ]);
 
                 $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
@@ -230,4 +224,161 @@ protected function getIntegrationConfigAction(Request $request)
 
         return $this->sendJsonResponse($dataArray);
     }
+
+    protected function getIntegrationCampaignStatusAction(Request $request)
+    {
+        $integration = $request->request->get('integration');
+        $campaign    = $request->request->get('campaign');
+        $settings    = $request->request->get('settings');
+        $dataArray   = ['success' => 0];
+        $statusData  = [];
+        if (!empty($integration) && !empty($campaign)) {
+            /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
+            $helper = $this->factory->getHelper('integration');
+            /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $object */
+            $object = $helper->getIntegrationObject($integration);
+
+            if ($object) {
+                if (method_exists($object, 'getCampaignMemberStatus')) {
+                    $campaignMemberStatus = $object->getCampaignMemberStatus($campaign);
+                    if (isset($campaignMemberStatus['records']) && !empty($campaignMemberStatus['records'])) {
+                        foreach ($campaignMemberStatus['records'] as $status) {
+                            $statusData[$status['Label']] = $status['Label'];
+                        }
+                    }
+                }
+                $form = $this->createForm('integration_campaign_status', $statusData, [
+                    'csrf_protection'       => false,
+                    'campaignContactStatus' => $statusData,
+                ]);
+
+                $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
+
+                $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
+                    'form'      => $form,
+                    'function'  => 'widget',
+                    'variables' => [
+                        'integration' => $object,
+                    ],
+                ])->getContent();
+
+                $prefix = str_replace('[integration]', '[campaign_member_status][campaign_member_status]', $settings['name']);
+
+                $idPrefix = str_replace(['][', '[', ']'], '_', $prefix);
+
+                if (substr($idPrefix, -1) == '_') {
+                    $idPrefix = substr($idPrefix, 0, -1);
+                }
+
+                $html = preg_replace('/integration_campaign_status_campaign_member_status\[(.*?)\]/', $prefix.'[$1]', $html);
+                $html = str_replace('integration_campaign_status_campaign_member_status', $idPrefix, $html);
+                $html = str_replace('integration_campaign_status[campaign_member_status]', $prefix, $html);
+
+                $dataArray['success'] = 1;
+                $dataArray['html']    = $html;
+            }
+        }
+
+        return $this->sendJsonResponse($dataArray);
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    protected function getIntegrationCampaignsAction(Request $request)
+    {
+        $integration = $request->request->get('integration');
+        $dataArray   = ['success' => 0];
+
+        if (!empty($integration)) {
+            /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
+            $helper = $this->factory->getHelper('integration');
+            /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $object */
+            $object = $helper->getIntegrationObject($integration);
+            $data   = [];
+            if ($object) {
+                $campaigns = $object->getCampaigns();
+                if (isset($campaigns['records']) && !empty($campaigns['records'])) {
+                    foreach ($campaigns['records'] as $campaign) {
+                        $data[$campaign['Id']] = $campaign['Name'];
+                    }
+                }
+                $form = $this->createForm('integration_campaigns', $data, [
+                    'integration'     => $integration,
+                    'campaigns'       => $data,
+                    'csrf_protection' => false,
+                ]);
+
+                $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
+
+                $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
+                    'form'      => $form,
+                    'function'  => 'row',
+                    'variables' => [
+                        'campaigns'   => $data,
+                        'integration' => $object,
+                    ],
+                ])->getContent();
+
+                $dataArray['success'] = 1;
+                $dataArray['html']    = $html;
+            }
+        }
+
+        return $this->sendJsonResponse($dataArray);
+    }
+
+    protected function matchFieldsAction(Request $request)
+    {
+        $integration       = $request->request->get('integration');
+        $integration_field = $request->request->get('integrationField');
+        $mautic_field      = $request->request->get('mauticField');
+        $update_mautic     = $request->request->get('updateMautic');
+        $object            = $request->request->get('object');
+
+        $helper             = $this->factory->getHelper('integration');
+        $integration_object = $helper->getIntegrationObject($integration);
+        $entity             = $integration_object->getIntegrationSettings();
+        $featureSettings    = $entity->getFeatureSettings();
+        $doNotMatchField    = ($mautic_field === '-1' || $mautic_field === '');
+        if ($object == 'lead') {
+            $fields       = 'leadFields';
+            $updateFields = 'update_mautic';
+        } else {
+            $fields       = 'companyFields';
+            $updateFields = 'update_mautic_company';
+        }
+        $newFeatureSettings = [];
+        if ($doNotMatchField) {
+            if (isset($featureSettings[$updateFields]) && array_key_exists($integration_field, $featureSettings[$updateFields])) {
+                unset($featureSettings[$updateFields][$integration_field]);
+            }
+            if (isset($featureSettings[$fields]) && array_key_exists($integration_field, $featureSettings[$fields])) {
+                unset($featureSettings[$fields][$integration_field]);
+            }
+            $dataArray = ['success' => 0];
+        } else {
+            $newFeatureSettings[$integration_field] = $update_mautic;
+            if (isset($featureSettings[$updateFields])) {
+                $featureSettings[$updateFields] = array_merge($featureSettings[$updateFields], $newFeatureSettings);
+            } else {
+                $featureSettings[$updateFields] = $newFeatureSettings;
+            }
+            $newFeatureSettings[$integration_field] = $mautic_field;
+            if (isset($featureSettings[$fields])) {
+                $featureSettings[$fields] = array_merge($featureSettings[$fields], $newFeatureSettings);
+            } else {
+                $featureSettings[$fields] = $newFeatureSettings;
+            }
+
+            $dataArray = ['success' => 1];
+        }
+        $entity->setFeatureSettings($featureSettings);
+
+        $this->getModel('plugin')->saveFeatureSettings($entity);
+
+        return $this->sendJsonResponse($dataArray);
+    }
 }
diff --git a/app/bundles/PluginBundle/Controller/PluginController.php b/app/bundles/PluginBundle/Controller/PluginController.php
index 6a1349d8e4c..63897e72e27 100644
--- a/app/bundles/PluginBundle/Controller/PluginController.php
+++ b/app/bundles/PluginBundle/Controller/PluginController.php
@@ -14,11 +14,14 @@
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\PluginBundle\Entity\Integration;
 use Mautic\PluginBundle\Entity\Plugin;
 use Mautic\PluginBundle\Event\PluginIntegrationAuthRedirectEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationEvent;
+use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Mautic\PluginBundle\Model\PluginModel;
 use Mautic\PluginBundle\PluginEvents;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -68,14 +71,15 @@ public function indexAction()
 
         foreach ($integrationObjects as $name => $object) {
             $settings = $object->getIntegrationSettings();
-            $pluginId = $settings->getPlugin()->getId();
-            if (isset($plugins[$pluginId])) {
+            $plugin   = $settings->getPlugin();
+            $pluginId = $plugin ? $plugin->getId() : $name;
+            if (isset($plugins[$pluginId]) || $pluginId === $name) {
                 $integrations[$name] = [
                     'name'     => $object->getName(),
                     'display'  => $object->getDisplayName(),
                     'icon'     => $integrationHelper->getIconPath($object),
                     'enabled'  => $settings->isPublished(),
-                    'plugin'   => $settings->getPlugin()->getId(),
+                    'plugin'   => $pluginId,
                     'isBundle' => false,
                 ];
             }
@@ -139,16 +143,21 @@ function ($a, $b) {
      *
      * @return JsonResponse|Response
      */
-    public function configAction($name)
+    public function configAction($name, $activeTab = 'details-container', $page = 1)
     {
         if (!$this->get('mautic.security')->isGranted('plugin:plugins:manage')) {
             return $this->accessDenied();
         }
+        if (!empty($this->request->get('activeTab'))) {
+            $activeTab = $this->request->get('activeTab');
+        }
 
+        $session   = $this->get('session');
         $authorize = $this->request->request->get('integration_details[in_auth]', false, true);
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
         $integrationHelper = $this->factory->getHelper('integration');
+        /** @var AbstractIntegration $integrationObject */
         $integrationObject = $integrationHelper->getIntegrationObject($name);
 
         // Verify that the requested integration exists
@@ -156,12 +165,19 @@ public function configAction($name)
             throw $this->createNotFoundException($this->get('translator')->trans('mautic.core.url.error.404'));
         }
 
-        /** @var PluginModel $pluginModel */
-        $pluginModel = $this->getModel('plugin');
+        $object = ('leadFieldsContainer' === $activeTab) ? 'lead' : 'company';
+        $limit  = $this->coreParametersHelper->getParameter('default_pagelimit');
+        $start  = ($page === 1) ? 0 : (($page - 1) * $limit);
+        if ($start < 0) {
+            $start = 0;
+        }
+        $session->set('mautic.plugin.'.$name.'.'.$object.'.start', $start);
+        $session->set('mautic.plugin.'.$name.'.'.$object.'.page', $page);
 
+        /** @var PluginModel $pluginModel */
+        $pluginModel   = $this->getModel('plugin');
         $leadFields    = $pluginModel->getLeadFields();
         $companyFields = $pluginModel->getCompanyFields();
-
         /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $integrationObject */
         $entity = $integrationObject->getIntegrationSettings();
 
@@ -182,13 +198,12 @@ public function configAction($name)
             if (!$cancelled = $this->isFormCancelled($form)) {
                 $currentKeys            = $integrationObject->getDecryptedApiKeys($entity);
                 $currentFeatureSettings = $entity->getFeatureSettings();
+                $valid                  = $this->isFormValid($form);
 
-                if ($valid = $this->isFormValid($form)) {
+                if ($authorize || $valid) {
                     $em          = $this->get('doctrine.orm.entity_manager');
                     $integration = $entity->getName();
-
-                    // Merge keys
-                    $keys = $form['apiKeys']->getData();
+                    $keys        = $form['apiKeys']->getData();
 
                     // Prevent merged keys
                     $secretKeys = $integrationObject->getSecretKeys();
@@ -202,16 +217,39 @@ public function configAction($name)
                     if (!$authorize) {
                         $features = $entity->getSupportedFeatures();
                         if (in_array('public_profile', $features) || in_array('push_lead', $features)) {
-                            //make sure now non-existent aren't saved
-                            $featureSettings = $entity->getFeatureSettings();
-                            $submittedFields = $this->request->request->get('integration_details[featureSettings][leadFields]', [], true);
-                            if (isset($featureSettings['leadFields'])) {
-                                foreach ($featureSettings['leadFields'] as $f => $v) {
-                                    if (empty($v) || !isset($submittedFields[$f])) {
-                                        unset($featureSettings['leadFields'][$f]);
+                            // Ungroup the fields
+                            $mauticLeadFields = [];
+                            foreach ($leadFields as $group => $groupFields) {
+                                $mauticLeadFields = array_merge($mauticLeadFields, $groupFields);
+                            }
+                            $mauticCompanyFields = [];
+                            foreach ($companyFields as $group => $groupFields) {
+                                $mauticCompanyFields = array_merge($mauticCompanyFields, $groupFields);
+                            }
+
+                            if ($missing = $integrationObject->cleanUpFields($entity, $mauticLeadFields, $mauticCompanyFields)) {
+                                if ($entity->getIsPublished()) {
+                                    // Only fail validation if the integration is enabled
+                                    if (!empty($missing['leadFields'])) {
+                                        $valid = false;
+
+                                        $form->get('featureSettings')->get('leadFields')->addError(
+                                            new FormError(
+                                                $this->get('translator')->trans('mautic.plugin.field.required_mapping_missing', [], 'validators')
+                                            )
+                                        );
+                                    }
+
+                                    if (!empty($missing['companyFields'])) {
+                                        $valid = false;
+
+                                        $form->get('featureSettings')->get('companyFields')->addError(
+                                            new FormError(
+                                                $this->get('translator')->trans('mautic.plugin.field.required_mapping_missing', [], 'validators')
+                                            )
+                                        );
                                     }
                                 }
-                                $entity->setFeatureSettings($featureSettings);
                             }
                         }
                     } else {
@@ -219,13 +257,15 @@ public function configAction($name)
                         $entity->setFeatureSettings($currentFeatureSettings);
                     }
 
-                    $dispatcher = $this->get('event_dispatcher');
-                    if ($dispatcher->hasListeners(PluginEvents::PLUGIN_ON_INTEGRATION_CONFIG_SAVE)) {
-                        $dispatcher->dispatch(PluginEvents::PLUGIN_ON_INTEGRATION_CONFIG_SAVE, new PluginIntegrationEvent($integrationObject));
-                    }
+                    if ($valid || $authorize) {
+                        $dispatcher = $this->get('event_dispatcher');
+                        if ($dispatcher->hasListeners(PluginEvents::PLUGIN_ON_INTEGRATION_CONFIG_SAVE)) {
+                            $dispatcher->dispatch(PluginEvents::PLUGIN_ON_INTEGRATION_CONFIG_SAVE, new PluginIntegrationEvent($integrationObject));
+                        }
 
-                    $em->persist($entity);
-                    $em->flush();
+                        $em->persist($entity);
+                        $em->flush();
+                    }
 
                     if ($authorize) {
                         //redirect to the oauth URL
@@ -251,14 +291,15 @@ public function configAction($name)
                 }
             }
 
-            if (($cancelled || $valid) && !$authorize) {
+            if (($cancelled || ($valid && !$this->isFormApplied($form))) && !$authorize) {
                 // Close the modal and return back to the list view
                 return new JsonResponse(
                     [
                         'closeModal'    => 1,
                         'enabled'       => $entity->getIsPublished(),
                         'name'          => $integrationObject->getName(),
-                        'mauticContent' => 'integration',
+                        'mauticContent' => 'integrationConfig',
+                        'sidebar'       => $this->get('templating')->render('MauticCoreBundle:LeftPanel:index.html.php'),
                     ]
                 );
             }
@@ -297,12 +338,14 @@ public function configAction($name)
                     'formSettings' => $formSettings,
                     'formNotes'    => $formNotes,
                     'callbackUrl'  => $callbackUrl,
+                    'activeTab'    => $activeTab,
                 ],
                 'contentTemplate' => $template,
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_plugin_index',
-                    'mauticContent' => 'integration',
+                    'mauticContent' => 'integrationConfig',
                     'route'         => false,
+                    'sidebar'       => $this->get('templating')->render('MauticCoreBundle:LeftPanel:index.html.php'),
                 ],
             ]
         );
diff --git a/app/bundles/PluginBundle/Entity/IntegrationEntity.php b/app/bundles/PluginBundle/Entity/IntegrationEntity.php
index adb504add3e..c7d621756ca 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationEntity.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationEntity.php
@@ -83,7 +83,8 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->addIndex(['integration', 'integration_entity', 'integration_entity_id'], 'integration_external_entity')
             ->addIndex(['integration', 'internal_entity', 'internal_entity_id'], 'integration_internal_entity')
             ->addIndex(['integration', 'internal_entity', 'integration_entity'], 'integration_entity_match')
-            ->addIndex(['integration', 'last_sync_date'], 'integration_last_sync_date');
+            ->addIndex(['integration', 'last_sync_date'], 'integration_last_sync_date')
+            ->addIndex(['internal_entity_id', 'integration_entity_id', 'internal_entity', 'integration_entity'], 'internal_integration_entity');
 
         $builder->addId();
 
diff --git a/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php b/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
index ce52c9c26d2..7c243d90152 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
@@ -31,19 +31,22 @@ class IntegrationEntityRepository extends CommonRepository
      *
      * @return array
      */
-    public function getIntegrationsEntityId($integration, $integrationEntity, $internalEntity, $internalEntityId = null, $startDate = null, $endDate = null, $push = false, $start = 0, $limit = 0)
+    public function getIntegrationsEntityId($integration, $integrationEntity, $internalEntity, $internalEntityId = null, $startDate = null, $endDate = null, $push = false, $start = 0, $limit = 0, $integrationEntityIds = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
-            ->select('i.integration_entity_id, i.id, i.internal_entity_id')
+            ->select('DISTINCT(i.integration_entity_id), i.id, i.internal_entity_id, i.integration_entity')
             ->from(MAUTIC_TABLE_PREFIX.'integration_entity', 'i');
 
         $q->where('i.integration = :integration')
-            ->andWhere('i.integration_entity = :integrationEntity')
             ->andWhere('i.internal_entity = :internalEntity')
-
             ->setParameter('integration', $integration)
-            ->setParameter('integrationEntity', $integrationEntity)
             ->setParameter('internalEntity', $internalEntity);
+
+        if ($integrationEntity) {
+            $q->andWhere('i.integration_entity = :integrationEntity')
+                ->setParameter('integrationEntity', $integrationEntity);
+        }
+
         if ($push) {
             $q->join('i', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = i.internal_entity_id and l.last_active >= :startDate')
                 ->setParameter('startDate', $startDate);
@@ -69,9 +72,110 @@ public function getIntegrationsEntityId($integration, $integrationEntity, $inter
         if ($limit) {
             $q->setMaxResults((int) $limit);
         }
+        if ($integrationEntityIds) {
+            $q->andWhere('i.integration_entity_id in ('.$integrationEntityIds.')');
+        }
+
+        $results = $q->execute()->fetchAll();
+
+        return $results;
+    }
+
+    /**
+     * @param $integration
+     * @param $internalEntity
+     * @param $leadFields
+     *
+     * @return array
+     */
+    public function findLeadsToUpdate($integration, $internalEntity, $leadFields, $limit = 25)
+    {
+        $q = $this->_em->getConnection()->createQueryBuilder()
+            ->select('i.integration_entity_id, i.integration_entity, i.id, i.internal_entity_id,'.$leadFields)
+            ->from(MAUTIC_TABLE_PREFIX.'integration_entity', 'i');
+
+        $q->where('i.integration = :integration')
+            ->andWhere('i.internal_entity = :internalEntity')
+            ->andWhere('i.integration_entity = "Lead" or i.integration_entity = "Contact"')
+            ->setParameter('integration', $integration)
+            ->setParameter('internalEntity', $internalEntity);
+
+        $q->join('i', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = i.internal_entity_id and l.date_modified > i.last_sync_date and l.date_identified is not null and l.email is not null');
+
+        $q->setMaxResults($limit);
 
         $results = $q->execute()->fetchAll();
 
         return $results;
     }
+
+    /**
+     * @param $integration
+     * @param $leadFields
+     *
+     * @return array
+     */
+    public function findLeadsToCreate($integration, $leadFields, $limit = 25)
+    {
+        $q = $this->_em->getConnection()->createQueryBuilder()
+            ->select('l.id as internal_entity_id,'.$leadFields)
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
+
+        $q->where('l.date_identified is not null')
+            ->andWhere('l.email is not null')
+            ->andWhere('not exists (select null from '.MAUTIC_TABLE_PREFIX.'integration_entity i where i.integration = :integration and (i.internal_entity = "lead" or i.internal_entity = "lead-deleted" or i.internal_entity = "lead-error") and i.internal_entity_id = l.id )')
+            ->setParameter('integration', $integration);
+
+        $q->setMaxResults($limit);
+
+        $results = $q->execute()->fetchAll();
+
+        $leads = [];
+        foreach ($results as $result) {
+            $leads[$result['internal_entity_id']] = $result;
+        }
+
+        return $leads;
+    }
+
+    /**
+     * @param array $integrationIds
+     * @param       $integration
+     * @param       $internalEntityType
+     */
+    public function markAsDeleted(array $integrationIds, $integration, $internalEntityType)
+    {
+        $q = $this->_em->getConnection()->createQueryBuilder();
+        $q->update(MAUTIC_TABLE_PREFIX.'integration_entity')
+            ->set('internal_entity', ':entity')
+            ->where(
+                $q->expr()->andX(
+                    $q->expr()->eq('integration', ':integration'),
+                    $q->expr()->in('integration_entity_id', array_map([$q->expr(), 'literal'], $integrationIds))
+                )
+            )
+            ->setParameter('integration', $integration)
+            ->setParameter('entity', $internalEntityType.'-deleted')
+            ->execute();
+    }
+
+    /**
+     * @param $integration
+     * @param $internalEntity
+     * @param $leadId
+     *
+     * @return array
+     */
+    public function findLeadsToDelete($internalEntity, $leadId)
+    {
+        $q = $this->_em->getConnection()->createQueryBuilder()
+            ->delete(MAUTIC_TABLE_PREFIX.'integration_entity')
+            ->from(MAUTIC_TABLE_PREFIX.'integration_entity');
+
+        $q->where('internal_entity_id = :leadId')
+            ->andWhere($q->expr()->like('internal_entity', ':internalEntity'))
+            ->setParameter('leadId', $leadId)
+            ->setParameter('internalEntity', $internalEntity)
+        ->execute();
+    }
 }
diff --git a/app/bundles/PluginBundle/Entity/IntegrationRepository.php b/app/bundles/PluginBundle/Entity/IntegrationRepository.php
index 78e85ee0edc..ce459238ae9 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationRepository.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationRepository.php
@@ -32,4 +32,21 @@ public function getIntegrations()
 
         return $results;
     }
+
+    /**
+     * Get core (no plugin) integrations.
+     */
+    public function getCoreIntegrations()
+    {
+        $services = $this->createQueryBuilder('i')
+            ->getQuery()
+            ->getResult();
+
+        $results = [];
+        foreach ($services as $s) {
+            $results[$s->getName()] = $s;
+        }
+
+        return $results;
+    }
 }
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationFormBuildEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationFormBuildEvent.php
new file mode 100644
index 00000000000..c02c8fc3b0b
--- /dev/null
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationFormBuildEvent.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\PluginBundle\Event;
+
+use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Symfony\Component\Form\FormBuilder;
+
+/**
+ * Class PluginIntegrationFormBuildEvent.
+ */
+class PluginIntegrationFormBuildEvent extends AbstractPluginIntegrationEvent
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @var FormBuilder
+     */
+    private $builder;
+
+    /**
+     * PluginIntegrationFormBuildEvent constructor.
+     *
+     * @param AbstractIntegration $integration
+     * @param FormBuilder         $builder
+     * @param array               $options
+     */
+    public function __construct(AbstractIntegration $integration, FormBuilder $builder, array $options)
+    {
+        $this->integration = $integration;
+        $this->builder     = $builder;
+    }
+
+    /**
+     * @return FormBuilder
+     */
+    public function getFormBuilder()
+    {
+        return $this->builder;
+    }
+
+    /**
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+}
diff --git a/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php b/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
index 6db7e1526a1..80418ad58dd 100644
--- a/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
@@ -73,23 +73,28 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $config = $event->getConfig();
         $lead   = $event->getLead();
 
-        $integration = (!empty($config['integration'])) ? $config['integration'] : null;
-        $feature     = (empty($integration)) ? 'push_lead' : null;
+        $integration             = (!empty($config['integration'])) ? $config['integration'] : null;
+        $integrationCampaign     = (!empty($config['config']['campaigns'])) ? $config['config']['campaigns'] : null;
+        $integrationMemberStatus = (!empty($config['campaign_member_status']['campaign_member_status'])) ? $config['campaign_member_status']['campaign_member_status'] : null;
+        $feature                 = (!empty($integration) && empty($integrationCampaign)) ? 'push_lead' : 'push_to_campaign';
 
-        $services = $this->integrationHelper->getIntegrationObjects($integration, $feature);
+        $services = $this->integrationHelper->getIntegrationObjects($integration);
         $success  = false;
-
         foreach ($services as $name => $s) {
             $settings = $s->getIntegrationSettings();
             if (!$settings->isPublished()) {
                 continue;
             }
-
-            if (method_exists($s, 'pushLead')) {
+            if (method_exists($s, 'pushLead') && $feature == 'push_lead') {
                 if ($s->pushLead($lead, $config)) {
                     $success = true;
                 }
             }
+            if (method_exists($s, 'pushLeadToCampaign') && $feature == 'push_to_campaign') {
+                if ($s->pushLeadToCampaign($lead, $integrationCampaign, $integrationMemberStatus)) {
+                    $success = true;
+                }
+            }
         }
 
         return $event->setResult($success);
diff --git a/app/bundles/PluginBundle/EventListener/LeadSubscriber.php b/app/bundles/PluginBundle/EventListener/LeadSubscriber.php
new file mode 100644
index 00000000000..66789a4541f
--- /dev/null
+++ b/app/bundles/PluginBundle/EventListener/LeadSubscriber.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\PluginBundle\EventListener;
+
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\LeadBundle\Event\LeadEvent;
+use Mautic\LeadBundle\LeadEvents;
+use Mautic\PluginBundle\Model\PluginModel;
+
+/**
+ * Class LeadSubscriber.
+ */
+class LeadSubscriber extends CommonSubscriber
+{
+    /**
+     * @var PluginModel
+     */
+    protected $pluginModel;
+
+    /**
+     * LeadSubscriber constructor.
+     *
+     * @param PluginModel $pluginModel
+     */
+    public function __construct(PluginModel $pluginModel)
+    {
+        $this->pluginModel = $pluginModel;
+    }
+    /**
+     * @return array
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            LeadEvents::LEAD_PRE_DELETE => ['onLeadDelete', 0],
+        ];
+    }
+
+    /*
+     * Delete lead event
+     */
+    public function onLeadDelete(LeadEvent $event)
+    {
+        /** @var \Mautic\LeadBundle\Entity\Lead $lead */
+        $lead                  = $event->getLead();
+        $integrationEntityRepo = $this->pluginModel->getIntegrationEntityRepository();
+        $integrationEntityRepo->findLeadsToDelete('lead%', $lead->getId());
+        $success = false;
+
+        return $success;
+    }
+}
diff --git a/app/bundles/PluginBundle/Exception/ApiErrorException.php b/app/bundles/PluginBundle/Exception/ApiErrorException.php
index eda5252ee9f..12e4f0445be 100644
--- a/app/bundles/PluginBundle/Exception/ApiErrorException.php
+++ b/app/bundles/PluginBundle/Exception/ApiErrorException.php
@@ -11,10 +11,69 @@
 
 namespace Mautic\PluginBundle\Exception;
 
+use Mautic\LeadBundle\Entity\Lead;
+
 class ApiErrorException extends \Exception
 {
+    /**
+     * @var
+     */
+    private $contactId;
+
+    /**
+     * @var Lead
+     */
+    private $contact;
+
+    /**
+     * ApiErrorException constructor.
+     *
+     * @param string          $message
+     * @param int             $code
+     * @param \Exception|null $previous
+     */
     public function __construct($message = 'API error', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
+
+    /**
+     * @return mixed
+     */
+    public function getContactId()
+    {
+        return $this->contactId;
+    }
+
+    /**
+     * @param mixed $contactId
+     *
+     * @return ApiErrorException
+     */
+    public function setContactId($contactId)
+    {
+        $this->contactId = $contactId;
+
+        return $this;
+    }
+
+    /**
+     * @return Lead
+     */
+    public function getContact()
+    {
+        return $this->contact;
+    }
+
+    /**
+     * @param Lead $contact
+     *
+     * @return ApiErrorException
+     */
+    public function setContact(Lead $contact)
+    {
+        $this->contact = $contact;
+
+        return $this;
+    }
 }
diff --git a/app/bundles/PluginBundle/Form/Type/CompanyFieldsType.php b/app/bundles/PluginBundle/Form/Type/CompanyFieldsType.php
index 86678c3ea1f..a4bf484a8de 100644
--- a/app/bundles/PluginBundle/Form/Type/CompanyFieldsType.php
+++ b/app/bundles/PluginBundle/Form/Type/CompanyFieldsType.php
@@ -11,7 +11,6 @@
 
 namespace Mautic\PluginBundle\Form\Type;
 
-use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -23,24 +22,15 @@
  */
 class CompanyFieldsType extends AbstractType
 {
+    use FieldsTypeTrait;
+
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        foreach ($options['integration_company_fields'] as $field => $details) {
-            $label = (is_array($details)) ? $details['label'] : $details;
-            $field = InputHelper::alphanum($field, false, '_');
-
-            $builder->add($field, 'choice', [
-                'choices'    => $options['company_fields'],
-                'label'      => $label,
-                'required'   => (is_array($details) && isset($details['required'])) ? $details['required'] : false,
-                'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control', 'data-placeholder' => ' '],
-            ]);
-        }
+        $this->buildFormFields($builder, $options, $options['integration_fields'], $options['mautic_fields'], 'company', $options['limit'], $options['start']);
     }
 
     /**
@@ -48,14 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setRequired(['integration_company_fields', 'company_fields']);
-        $resolver->setDefaults(
-            [
-                'special_instructions' => '',
-                'alert_type'           => '',
-                'allow_extra_fields'   => true,
-            ]
-        );
+        $this->configureFieldOptions($resolver, 'company');
     }
 
     /**
@@ -71,7 +54,6 @@ public function getName()
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['specialInstructions'] = $options['special_instructions'];
-        $view->vars['alertType']           = $options['alert_type'];
+        $this->buildFieldView($view,  $options, 'company');
     }
 }
diff --git a/app/bundles/PluginBundle/Form/Type/DetailsType.php b/app/bundles/PluginBundle/Form/Type/DetailsType.php
index 2e51441aa3c..b13329b672d 100644
--- a/app/bundles/PluginBundle/Form/Type/DetailsType.php
+++ b/app/bundles/PluginBundle/Form/Type/DetailsType.php
@@ -113,14 +113,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->add('in_auth', 'hidden', ['mapped' => false]);
 
-        $builder->add('buttons', 'form_buttons', [
-            'apply_text' => false,
-            'save_text'  => 'mautic.core.form.save',
-        ]);
+        $builder->add('buttons', 'form_buttons');
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);
         }
+
+        $options['integration_object']->modifyForm($builder, $options);
     }
 
     /**
diff --git a/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php b/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
index a6a0bc92f08..3adda619ad1 100644
--- a/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
+++ b/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
@@ -11,14 +11,17 @@
 
 namespace Mautic\PluginBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Helper\CoreParametersHelper;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Class FeatureSettingsType.
@@ -26,11 +29,42 @@
 class FeatureSettingsType extends AbstractType
 {
     /**
-     * @param MauticFactory $factory
+     * @var Session
      */
-    public function __construct(MauticFactory $factory)
-    {
-        $this->factory = $factory;
+    protected $session;
+
+    /**
+     * @var CoreParametersHelper
+     */
+    protected $coreParametersHelper;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * FeatureSettingsType constructor.
+     *
+     * @param Session              $session
+     * @param CoreParametersHelper $coreParametersHelper
+     * @param TranslatorInterface  $translator
+     */
+    public function __construct(
+        Session $session,
+        CoreParametersHelper $coreParametersHelper,
+        TranslatorInterface $translator,
+        LoggerInterface $logger
+    ) {
+        $this->session              = $session;
+        $this->coreParametersHelper = $coreParametersHelper;
+        $this->translator           = $translator;
+        $this->logger               = $logger;
     }
 
     /**
@@ -39,25 +73,41 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $integration_object = $options['integration_object'];
+        $integrationObject = $options['integration_object'];
 
         //add custom feature settings
-        $integration_object->appendToForm($builder, $options['data'], 'features');
+        $integrationObject->appendToForm($builder, $options['data'], 'features');
         $leadFields    = $options['lead_fields'];
         $companyFields = $options['company_fields'];
+        $formSettings  = $options['integration_object']->getFormDisplaySettings();
+
+        $formModifier = function (FormInterface $form, $data, $method = 'get') use ($integrationObject, $leadFields, $companyFields, $formSettings) {
+            $integrationName = $integrationObject->getName();
+            $session         = $this->session;
+            $limit           = $session->get(
+                'mautic.plugin.'.$integrationName.'.lead.limit',
+                $this->coreParametersHelper->getParameter('default_pagelimit')
+            );
+            $page        = $session->get('mautic.plugin.'.$integrationName.'.lead.page', 1);
+            $companyPage = $session->get('mautic.plugin.'.$integrationName.'.company.page', 1);
 
-        $formModifier = function (FormInterface $form, $data, $method = 'get') use ($integration_object, $leadFields, $companyFields) {
             $settings = [
                 'silence_exceptions' => false,
                 'feature_settings'   => $data,
-                'ignore_field_cache' => true,
+                'ignore_field_cache' => ($page == 1 && 'POST' !== $_SERVER['REQUEST_METHOD']) ? true : false,
             ];
+
             try {
-                $fields = $integration_object->getFormLeadFields($settings);
-                $fields = (isset($fields[0])) ? $fields[0] : $fields;
-                unset($fields['company']);
+                if (empty($fields)) {
+                    $fields = $integrationObject->getFormLeadFields($settings);
+                    $fields = (isset($fields[0])) ? $fields[0] : $fields;
+                    unset($fields['company']);
+                }
+
                 if (isset($settings['feature_settings']['objects']) and in_array('company', $settings['feature_settings']['objects'])) {
-                    $integrationCompanyFields = $integration_object->getFormCompanyFields($settings);
+                    if (empty($integrationCompanyFields)) {
+                        $integrationCompanyFields = $integrationObject->getFormCompanyFields($settings);
+                    }
                     if (isset($integrationCompanyFields['company'])) {
                         $integrationCompanyFields = $integrationCompanyFields['company'];
                     }
@@ -68,51 +118,61 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
                 $error = '';
             } catch (\Exception $e) {
-                $fields = [];
-                $error  = $e->getMessage();
-            }
-            list($specialInstructions, $alertType) = $integration_object->getFormNotes('leadfield_match');
-            /**
-             * Auto Match Integration Fields with Mautic Fields.
-             */
-            $flattenLeadFields = [];
-            foreach (array_values($leadFields) as $fieldsWithoutGroups) {
-                $flattenLeadFields = array_merge($flattenLeadFields, $fieldsWithoutGroups);
-            }
-            $integrationFields  = array_keys($fields);
-            $flattenLeadFields  = array_keys($flattenLeadFields);
-            $fieldsIntersection = array_uintersect($integrationFields, $flattenLeadFields, 'strcasecmp');
+                $error = $e->getMessage();
+                $this->logger->error($e);
 
-            $autoMatchedFields = [];
-            foreach ($fieldsIntersection as $field) {
-                $autoMatchedFields[$field] = strtolower($field);
+                // Prevent pagination from confusing things by using the cache
+                $page   = 1;
+                $fields = $integrationCompanyFields = [];
             }
 
+            $enableDataPriority = !empty($formSettings['enable_data_priority']);
+
+            $leadFields['-1'] = '';
+
+            $leadFields['mauticContactTimelineLink'] = $this->translator->trans('mautic.plugin.integration.contact.timeline.link');
+
             $form->add(
                 'leadFields',
                 'integration_fields',
                 [
                     'label'                => 'mautic.integration.leadfield_matches',
                     'required'             => true,
-                    'lead_fields'          => $leadFields,
-                    'data'                 => isset($data['leadFields']) && !empty($data['leadFields']) ? $data['leadFields'] : $autoMatchedFields,
+                    'mautic_fields'        => $leadFields,
+                    'data'                 => isset($data['leadFields']) && !empty($data['leadFields']) ? $data['leadFields'] : [],
+                    'update_mautic'        => isset($data['update_mautic']) && !empty($data['update_mautic']) ? $data['update_mautic'] : [],
                     'integration_fields'   => $fields,
-                    'special_instructions' => $specialInstructions,
-                    'alert_type'           => $alertType,
+                    'enable_data_priority' => $enableDataPriority,
+                    'integration'          => $integrationObject->getName(),
+                    'integration_object'   => $integrationObject,
+                    'limit'                => $limit,
+                    'page'                 => $page,
+                    'mapped'               => false,
+                    'error_bubbling'       => false,
                 ]
             );
+
             if (!empty($integrationCompanyFields)) {
+                list($specialInstructions, $alertType) = $integrationObject->getFormNotes('leadfield_match');
+
                 $form->add(
                     'companyFields',
                     'integration_company_fields',
                     [
-                        'label'          => 'mautic.integration.comapanyfield_matches',
-                        'required'       => false,
-                        'company_fields' => $companyFields,
-                        //'data'               => isset($data['leadFields']) && !empty($data['leadFields']) ? $data['leadFields'] : [],
-                        'integration_company_fields' => $integrationCompanyFields,
-                        'special_instructions'       => $specialInstructions,
-                        'alert_type'                 => $alertType,
+                        'label'                 => 'mautic.integration.comapanyfield_matches',
+                        'required'              => false,
+                        'mautic_fields'         => $companyFields,
+                        'data'                  => isset($data['companyFields']) && !empty($data['companyFields']) ? $data['companyFields'] : [],
+                        'update_mautic_company' => isset($data['update_mautic_company']) && !empty($data['update_mautic_company'])
+                            ? $data['update_mautic_company'] : [],
+                        'integration_fields'   => $integrationCompanyFields,
+                        'enable_data_priority' => $enableDataPriority,
+                        'integration'          => $integrationObject->getName(),
+                        'integration_object'   => $integrationObject,
+                        'limit'                => $limit,
+                        'page'                 => $companyPage,
+                        'mapped'               => false,
+                        'error_bubbling'       => false,
                     ]
                 );
             }
@@ -141,7 +201,7 @@ function (FormEvent $event) use ($formModifier) {
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired(['integration', 'integration_object', 'lead_fields', 'company_fields']);
     }
diff --git a/app/bundles/PluginBundle/Form/Type/FieldsType.php b/app/bundles/PluginBundle/Form/Type/FieldsType.php
index acaeb4506d3..42606a3ac2d 100644
--- a/app/bundles/PluginBundle/Form/Type/FieldsType.php
+++ b/app/bundles/PluginBundle/Form/Type/FieldsType.php
@@ -11,7 +11,6 @@
 
 namespace Mautic\PluginBundle\Form\Type;
 
-use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -19,28 +18,19 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class SocialMediaServiceType.
+ * Class FieldsType.
  */
 class FieldsType extends AbstractType
 {
+    use FieldsTypeTrait;
+
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        foreach ($options['integration_fields'] as $field => $details) {
-            $label = (is_array($details)) ? $details['label'] : $details;
-            $field = InputHelper::alphanum($field, false, '_');
-
-            $builder->add($field, 'choice', [
-                'choices'    => $options['lead_fields'],
-                'label'      => $label,
-                'required'   => (is_array($details) && isset($details['required'])) ? $details['required'] : false,
-                'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control', 'data-placeholder' => ' '],
-            ]);
-        }
+        $this->buildFormFields($builder, $options, $options['integration_fields'], $options['mautic_fields'], '', $options['limit'], $options['start']);
     }
 
     /**
@@ -48,14 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setRequired(['integration_fields', 'lead_fields']);
-        $resolver->setDefaults(
-            [
-                'special_instructions' => '',
-                'alert_type'           => '',
-                'allow_extra_fields'   => true,
-            ]
-        );
+        $this->configureFieldOptions($resolver, 'lead');
     }
 
     /**
@@ -71,7 +54,6 @@ public function getName()
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['specialInstructions'] = $options['special_instructions'];
-        $view->vars['alertType']           = $options['alert_type'];
+        $this->buildFieldView($view,  $options, 'lead');
     }
 }
diff --git a/app/bundles/PluginBundle/Form/Type/FieldsTypeTrait.php b/app/bundles/PluginBundle/Form/Type/FieldsTypeTrait.php
new file mode 100644
index 00000000000..bc7b7b520e7
--- /dev/null
+++ b/app/bundles/PluginBundle/Form/Type/FieldsTypeTrait.php
@@ -0,0 +1,254 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic, Inc.
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\PluginBundle\Form\Type;
+
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+trait FieldsTypeTrait
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     * @param array                $integrationFields
+     * @param array                $mauticFields
+     * @param string               $fieldObject
+     */
+    protected function buildFormFields(
+        FormBuilderInterface $builder,
+        array $options,
+        array $integrationFields,
+        array $mauticFields,
+        $fieldObject,
+        $limit,
+        $start
+    ) {
+        $builder->addEventListener(
+            FormEvents::PRE_SET_DATA,
+            function (FormEvent $event) use ($options, $integrationFields, $mauticFields, $fieldObject, $limit, $start) {
+                $form = $event->getForm();
+                $index = 0;
+                $choices = [];
+                $requiredFields = [];
+                $optionalFields = [];
+                $group = [];
+                $fieldData = $event->getData();
+                // First loop to build options
+                foreach ($integrationFields as $field => $details) {
+                    $groupName = '0default';
+                    if (is_array($details)) {
+                        if (isset($details['group'])) {
+                            if (!isset($choices[$details['group']])) {
+                                $choices[$details['group']] = [];
+                            }
+                            $label = (isset($details['optionLabel'])) ? $details['optionLabel'] : $details['label'];
+                            $group[$field] = $groupName = $details['group'];
+                            $choices[$field] = $label;
+                        } else {
+                            $choices[$field] = $details['label'];
+                        }
+                    } else {
+                        $choices[$field] = $details;
+                    }
+
+                    if (!isset($requiredFields[$groupName])) {
+                        $requiredFields[$groupName] = [];
+                        $optionalFields[$groupName] = [];
+                    }
+
+                    if (is_array($details) && !empty($details['required'])) {
+                        $requiredFields[$groupName][$field] = $details;
+                    } else {
+                        $optionalFields[$groupName][$field] = $details;
+                    }
+                }
+
+                // Order the fields by label
+                ksort($requiredFields, SORT_NATURAL);
+                ksort($optionalFields, SORT_NATURAL);
+
+                $sortFieldsFunction = function ($a, $b) {
+                    if (is_array($a)) {
+                        $aLabel = (isset($a['optionLabel'])) ? $a['optionLabel'] : $a['label'];
+                    } else {
+                        $aLabel = $a;
+                    }
+
+                    if (is_array($b)) {
+                        $bLabel = (isset($b['optionLabel'])) ? $b['optionLabel'] : $b['label'];
+                    } else {
+                        $bLabel = $b;
+                    }
+
+                    return strnatcasecmp($aLabel, $bLabel);
+                };
+
+                $fields = [];
+                foreach ($requiredFields as $groupName => $groupedFields) {
+                    uasort($groupedFields, $sortFieldsFunction);
+
+                    $fields = array_merge($fields, $groupedFields);
+                }
+                foreach ($optionalFields as $groupName => $groupedFields) {
+                    uasort($groupedFields, $sortFieldsFunction);
+
+                    $fields = array_merge($fields, $groupedFields);
+                }
+
+                // Ensure that fields aren't hidden
+                if ($start > count($fields) || $options['page'] == 0) {
+                    $start = 0;
+                }
+
+                $paginatedFields = array_slice($fields, $start, $limit);
+                foreach ($paginatedFields as $field => $details) {
+                    $matched = isset($fieldData[$field]);
+                    $required = (int) !empty($integrationFields[$field]['required']);
+                    ++$index;
+                    $form->add(
+                        'label_'.$index,
+                        'text',
+                        [
+                            'label' => false,
+                            'data'  => $choices[$field],
+                            'attr'  => [
+                                'class'         => 'form-control integration-fields',
+                                'data-required' => $required,
+                                'data-label'    => $choices[$field],
+                                'placeholder'   => isset($group[$field]) ? $group[$field] : '',
+                                'readonly'      => true,
+                            ],
+                            'by_reference' => true,
+                            'mapped'       => false,
+                        ]
+                    );
+                    if (isset($options['enable_data_priority']) and $options['enable_data_priority']) {
+                        $updateName = 'update_mautic';
+                        if ($fieldObject) {
+                            $updateName .= '_'.$fieldObject;
+                        }
+                        $form->add(
+                            $updateName.$index,
+                            'button_group',
+                            [
+                                'choices' => [
+                                    '<btn class="btn-nospin fa fa-arrow-circle-left"></btn>',
+                                    '<btn class="btn-nospin fa fa-arrow-circle-right"></btn>',
+                                ],
+                                'label'       => false,
+                                'data'        => isset($options[$updateName][$field]) ? (int) $options[$updateName][$field] : 1,
+                                'empty_value' => false,
+                                'attr'        => [
+                                    'data-toggle' => 'tooltip',
+                                    'title'       => 'mautic.plugin.direction.data.update',
+                                ],
+                            ]
+                        );
+                    }
+
+                    $form->add(
+                        'm_'.$index,
+                        'choice',
+                        [
+                            'choices'    => $mauticFields,
+                            'label'      => false,
+                            'data'       => $matched ? $fieldData[$field] : '',
+                            'label_attr' => ['class' => 'control-label'],
+                            'attr'       => [
+                                'class'            => 'field-selector',
+                                'data-placeholder' => ' ',
+                                'data-required'    => $required,
+                                'data-value'       => $matched ? $fieldData[$field] : '',
+                                'data-choices'     => $mauticFields,
+                            ],
+                        ]
+                    );
+                    $form->add(
+                        'i_'.$index,
+                        HiddenType::class,
+                        [
+                            'data' => $field,
+                            'attr' => [
+                                'data-required' => $required,
+                            ],
+                        ]
+                    );
+                    $form->add(
+                        $field,
+                        HiddenType::class,
+                        [
+                            'data' => $index,
+                            'attr' => [
+                                'data-required' => $required,
+                            ],
+                        ]
+                    );
+                }
+            }
+        );
+    }
+
+    /**
+     * @param OptionsResolver $resolver
+     * @param                 $object
+     */
+    protected function configureFieldOptions(OptionsResolver $resolver, $object)
+    {
+        $resolver->setRequired(['integration_fields', 'mautic_fields', 'integration', 'integration_object', 'page']);
+        $resolver->setDefined([('lead' === $object) ? 'update_mautic' : 'update_mautic_company']);
+        $resolver->setDefaults(
+            [
+                'special_instructions' => function (Options $options) use ($object) {
+                    list($specialInstructions, $alertType) = $options['integration_object']->getFormNotes('leadfield_match');
+
+                    return $specialInstructions;
+                },
+                'alert_type' => function (Options $options) use ($object) {
+                    list($specialInstructions, $alertType) = $options['integration_object']->getFormNotes('leadfield_match');
+
+                    return $alertType;
+                },
+                'allow_extra_fields'   => true,
+                'enable_data_priority' => false,
+                'totalFields'          => function (Options $options) {
+                    return count($options['integration_fields']);
+                },
+                'fixedPageNum' => function (Options $options) {
+                    return ceil($options['totalFields'] / $options['limit']);
+                },
+                'limit' => 10,
+                'start' => function (Options $options) {
+                    return (1 === (int) $options['page']) ? 0 : ((int) $options['page'] - 1) * (int) $options['limit'];
+                },
+            ]
+        );
+    }
+
+    /**
+     * @param FormView $view
+     * @param array    $options
+     */
+    protected function buildFieldView(FormView $view, array $options)
+    {
+        $view->vars['specialInstructions'] = $options['special_instructions'];
+        $view->vars['alertType']           = $options['alert_type'];
+        $view->vars['integration']         = $options['integration'];
+        $view->vars['totalFields']         = $options['totalFields'];
+        $view->vars['page']                = $options['page'];
+        $view->vars['fixedPageNum']        = $options['fixedPageNum'];
+    }
+}
diff --git a/app/bundles/PluginBundle/Form/Type/IntegrationCampaignsType.php b/app/bundles/PluginBundle/Form/Type/IntegrationCampaignsType.php
new file mode 100644
index 00000000000..e5951cbc5ea
--- /dev/null
+++ b/app/bundles/PluginBundle/Form/Type/IntegrationCampaignsType.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\PluginBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Class IntegrationCampaignsType.
+ */
+class IntegrationCampaignsType extends AbstractType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+                'campaign_member_status',
+                'choice',
+                [
+                    'choices' => $options['campaignContactStatus'],
+                    'attr'    => [
+                        'class' => 'form-control', ],
+                    'label'    => 'mautic.plugin.integration.campaigns.member.status',
+                    'required' => false,
+                ]
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(
+            ['campaignContactStatus' => []]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'integration_campaign_status';
+    }
+}
diff --git a/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php b/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
index acf2ce9b7ac..8bfffcfd524 100644
--- a/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
+++ b/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
@@ -28,6 +28,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if ($options['integration'] != null) {
             $options['integration']->appendToForm($builder, $options['data'], 'integration');
         }
+
+        if (!empty($options['campaigns'])) {
+            $builder->add(
+                'campaigns',
+                'choice',
+                [
+                    'choices' => $options['campaigns'],
+                    'attr'    => [
+                        'class' => 'form-control', 'onchange' => 'Mautic.getIntegrationCampaignStatus(this);', ],
+                    'label'       => 'mautic.plugin.integration.campaigns',
+                    'empty_value' => 'mautic.plugin.config.campaign.member.chooseone',
+                    'required'    => false,
+                ]
+
+            );
+        }
     }
 
     /**
@@ -37,7 +53,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(['integration']);
         $resolver->setDefaults([
-            'label' => false,
+            'label'     => false,
+            'campaigns' => [],
         ]);
     }
 
diff --git a/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php b/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
index ad8fde34213..5fb3ee0b087 100644
--- a/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
+++ b/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
@@ -79,7 +79,32 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $formModifier = function (FormInterface $form, $data) use ($integrationObjects) {
+        $formModifier = function (FormInterface $form, $data) use ($integrationObjects, $integrationHelper) {
+            $statusChoices   = [];
+            $campaignChoices = [];
+
+            if (isset($data['integration'])) {
+                $integration       = $data['integration'];
+                $integrationObject = $integrationHelper->getIntegrationObject($data['integration']);
+                if (method_exists($integrationObject, 'getCampaigns')) {
+                    $campaigns = $integrationObject->getCampaigns();
+
+                    if (isset($campaigns['records']) && !empty($campaigns['records'])) {
+                        foreach ($campaigns['records'] as $campaign) {
+                            $campaignChoices[$campaign['Id']] = $campaign['Name'];
+                        }
+                    }
+                }
+                if (method_exists($integrationObject, 'getCampaignMemberStatus') && isset($data['config']['campaigns'])) {
+                    $campaignStatus = $integrationObject->getCampaignMemberStatus($data['config']['campaigns']);
+
+                    if (isset($campaignStatus['records']) && !empty($campaignStatus['records'])) {
+                        foreach ($campaignStatus['records'] as $campaignS) {
+                            $statusChoices[$campaignS['Label']] = $campaignS['Label'];
+                        }
+                    }
+                }
+            }
             $form->add(
                 'config',
                 'integration_config',
@@ -89,9 +114,23 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'class' => 'integration-config-container',
                     ],
                     'integration' => (isset($integrationObjects[$data['integration']])) ? $integrationObjects[$data['integration']] : null,
+                    'campaigns'   => $campaignChoices,
                     'data'        => (isset($data['config'])) ? $data['config'] : [],
                 ]
             );
+            $hideClass = (isset($data['campaign_member_status'])) ? '' : ' hide';
+            $form->add(
+                'campaign_member_status',
+                'integration_campaign_status',
+                [
+                    'label' => false,
+                    'attr'  => [
+                        'class' => 'integration-campaigns-status'.$hideClass,
+                    ],
+                    'campaignContactStatus' => $statusChoices,
+                    'data'                  => (isset($data['campaign_member_status'])) ? $data['campaign_member_status'] : [],
+                ]
+            );
         };
 
         $builder->addEventListener(
diff --git a/app/bundles/PluginBundle/Helper/IntegrationHelper.php b/app/bundles/PluginBundle/Helper/IntegrationHelper.php
index 2794dd8a819..b650d259644 100644
--- a/app/bundles/PluginBundle/Helper/IntegrationHelper.php
+++ b/app/bundles/PluginBundle/Helper/IntegrationHelper.php
@@ -125,6 +125,7 @@ public function getIntegrationObjects($specificIntegrations = null, $withFeature
                         /** @var \Mautic\PluginBundle\Entity\Integration $settings */
                         $settings                    = $integrationSettings[$integrationName];
                         $available[$integrationName] = [
+                            'isPlugin'    => true,
                             'integration' => $integrationName,
                             'settings'    => $settings,
                             'namespace'   => $pluginNamespace,
@@ -140,14 +141,61 @@ public function getIntegrationObjects($specificIntegrations = null, $withFeature
                         }
                         $byPlugin[$id][] = $integrationName;
                     }
+                }
+            }
+
+            $coreIntegrationSettings = $this->getCoreIntegrationSettings();
+
+            // Scan core bundles for integration classes
+            foreach ($this->factory->getMauticBundles() as $coreBundle) {
+                if (is_dir($coreBundle['directory'].'/Integration')) {
+                    $finder = new Finder();
+                    $finder->files()->name('*Integration.php')->in($coreBundle['directory'].'/Integration')->ignoreDotFiles(true);
+
+                    $coreBundleNamespace = str_replace('Mautic', '', $coreBundle['bundle']);
+
+                    foreach ($finder as $file) {
+                        $integrationName = substr($file->getBaseName(), 0, -15);
+
+                        if (!isset($coreIntegrationSettings[$integrationName])) {
+                            $newIntegration = new Integration();
+                            $newIntegration->setName($integrationName);
+                            $integrationSettings[$integrationName] = $newIntegration;
+
+                            // Initiate the class in order to get the features supported
+                            $class           = '\\Mautic\\'.$coreBundleNamespace.'\\Integration\\'.$integrationName.'Integration';
+                            $reflectionClass = new \ReflectionClass($class);
+                            if ($reflectionClass->isInstantiable()) {
+                                $integrations[$integrationName] = new $class($this->factory);
+                                $features                       = $integrations[$integrationName]->getSupportedFeatures();
+                                $newIntegration->setSupportedFeatures($features);
+
+                                // Go ahead and stash it since it's built already
+                                $integrations[$integrationName]->setIntegrationSettings($newIntegration);
+
+                                $newIntegrations[] = $newIntegration;
+                            } else {
+                                continue;
+                            }
+                        }
 
-                    // Save newly found integrations
-                    if (!empty($newIntegrations)) {
-                        $integrationRepo->saveEntities($newIntegrations);
-                        unset($newIntegrations);
+                        /** @var \Mautic\PluginBundle\Entity\Integration $settings */
+                        $settings                    = isset($coreIntegrationSettings[$integrationName]) ? $coreIntegrationSettings[$integrationName] : $newIntegration;
+                        $available[$integrationName] = [
+                            'isPlugin'    => false,
+                            'integration' => $integrationName,
+                            'settings'    => $settings,
+                            'namespace'   => $coreBundleNamespace,
+                        ];
                     }
                 }
             }
+
+            // Save newly found integrations
+            if (!empty($newIntegrations)) {
+                $integrationRepo->saveEntities($newIntegrations);
+                unset($newIntegrations);
+            }
         }
 
         // Ensure appropriate formats
@@ -193,13 +241,14 @@ public function getIntegrationObjects($specificIntegrations = null, $withFeature
 
             if (!isset($integrations[$integrationName])) {
                 $integration     = $available[$integrationName];
-                $class           = '\\MauticPlugin\\'.$integration['namespace'].'\\Integration\\'.$integrationName.'Integration';
+                $rootNamespace   = $integration['isPlugin'] ? 'MauticPlugin' : 'Mautic';
+                $class           = '\\'.$rootNamespace.'\\'.$integration['namespace'].'\\Integration\\'.$integrationName.'Integration';
                 $reflectionClass = new \ReflectionClass($class);
                 if ($reflectionClass->isInstantiable()) {
                     $integrations[$integrationName] = new $class($this->factory);
                     $integrations[$integrationName]->setIntegrationSettings($integration['settings']);
                 } else {
-                    $integrations[$integrationName] = false;
+                    continue;
                 }
             }
 
@@ -334,6 +383,11 @@ public function getIntegrationSettings()
         return $this->factory->getEntityManager()->getRepository('MauticPluginBundle:Integration')->getIntegrations();
     }
 
+    public function getCoreIntegrationSettings()
+    {
+        return $this->factory->getEntityManager()->getRepository('MauticPluginBundle:Integration')->getCoreIntegrations();
+    }
+
     /**
      * Get the user's social profile data from cache or integrations if indicated.
      *
diff --git a/app/bundles/PluginBundle/Integration/AbstractIntegration.php b/app/bundles/PluginBundle/Integration/AbstractIntegration.php
index 386d2a26e12..a7f1b4824b5 100644
--- a/app/bundles/PluginBundle/Integration/AbstractIntegration.php
+++ b/app/bundles/PluginBundle/Integration/AbstractIntegration.php
@@ -17,18 +17,26 @@
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\PluginBundle\Entity\Integration;
 use Mautic\PluginBundle\Event\PluginIntegrationAuthCallbackUrlEvent;
+use Mautic\PluginBundle\Event\PluginIntegrationFormBuildEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationFormDisplayEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationKeyEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationRequestEvent;
+use Mautic\PluginBundle\Exception\ApiErrorException;
 use Mautic\PluginBundle\Helper\oAuthHelper;
 use Mautic\PluginBundle\PluginEvents;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * Class AbstractIntegration.
  */
 abstract class AbstractIntegration
 {
+    /**
+     * @var bool
+     */
+    protected $coreIntegration = false;
+
     /**
      * @var MauticFactory
      */
@@ -47,7 +55,7 @@ abstract class AbstractIntegration
     /**
      * @var array Decrypted keys
      */
-    protected $keys;
+    protected $keys = [];
 
     /**
      * @var CacheStorageHelper
@@ -59,6 +67,18 @@ abstract class AbstractIntegration
      */
     protected $em;
 
+    /**
+     * Used for notifications.
+     *
+     * @var array|null
+     */
+    protected $adminUsers;
+
+    /**
+     * @var
+     */
+    protected $notifications = [];
+
     /**
      * @param MauticFactory $factory
      *
@@ -97,6 +117,14 @@ public function init()
     {
     }
 
+    /**
+     * @return bool
+     */
+    public function isCoreIntegration()
+    {
+        return $this->coreIntegration;
+    }
+
     /**
      * Determines what priority the integration should have against the other integrations.
      *
@@ -166,6 +194,15 @@ public function getIcon()
      */
     abstract public function getAuthenticationType();
 
+    /**
+     * Get if data priority is enabled in the integration or not default is false.
+     *
+     * @return string
+     */
+    public function getDataPriority()
+    {
+        return false;
+    }
     /**
      * Get a list of supported features for this integration.
      *
@@ -596,6 +633,9 @@ public function makeRequest($url, $parameters = [], $method = 'GET', $settings =
             $headers    = $event->getHeaders();
             $parameters = $event->getParameters();
         }
+        if (isset($settings['batchSizeSF'])) {
+            $headers[] = 'Sforce-Query-Options: batchSize='.$settings['batchSizeSF'];
+        }
 
         if (!isset($settings['query'])) {
             $settings['query'] = [];
@@ -1264,6 +1304,108 @@ public function getAvailableLeadFields($settings = [])
         return [];
     }
 
+    /**
+     * @param Integration $entity
+     * @param array       $mauticLeadFields
+     * @param array       $mauticCompanyFields
+     *
+     * @return array
+     */
+    public function cleanUpFields(Integration $entity, array $mauticLeadFields, array $mauticCompanyFields)
+    {
+        $featureSettings        = $entity->getFeatureSettings();
+        $submittedFields        = (isset($featureSettings['leadFields'])) ? $featureSettings['leadFields'] : [];
+        $submittedCompanyFields = (isset($featureSettings['companyFields'])) ? $featureSettings['companyFields'] : [];
+        $submittedObjects       = (isset($featureSettings['objects'])) ? $featureSettings['objects'] : [];
+        $missingRequiredFields  = [];
+
+        //make sure now non-existent aren't saved
+        $settings = [
+            'ignore_field_cache' => false,
+        ];
+        $settings['feature_settings']['objects'] = $submittedObjects;
+        $availableIntegrationFields              = $this->getAvailableLeadFields($settings);
+        $leadFields                              = [];
+
+        /**
+         * @param $mappedFields
+         * @param $integrationFields
+         * @param $mauticFields
+         * @param $fieldType
+         */
+        $cleanup = function (&$mappedFields, $integrationFields, $mauticFields, $fieldType) use (&$missingRequiredFields, &$featureSettings) {
+            $updateKey    = ('companyFields' === $fieldType) ? 'update_mautic_company' : 'update_mautic';
+            $removeFields = array_keys(array_diff_key($mappedFields, $integrationFields));
+
+            // Find all the mapped fields that no longer exist in Mautic
+            if ($nonExistentFields = array_diff($mappedFields, array_keys($mauticFields))) {
+                // Remove those fields
+                $removeFields = array_merge($removeFields, array_keys($nonExistentFields));
+            }
+
+            foreach ($removeFields as $field) {
+                unset($mappedFields[$field]);
+
+                if (isset($featureSettings[$updateKey])) {
+                    unset($featureSettings[$updateKey][$field]);
+                }
+            }
+
+            // Check if required fields are missing
+            $required = $this->getRequiredFields($integrationFields);
+            if (array_diff_key($required, $mappedFields)) {
+                $missingRequiredFields[$fieldType] = true;
+            }
+        };
+
+        if ($submittedObjects) {
+            if (in_array('company', $submittedObjects)) {
+                // special handling for company fields
+                if (isset($availableIntegrationFields['company'])) {
+                    $cleanup($submittedCompanyFields, $availableIntegrationFields['company'], $mauticCompanyFields, 'companyFields');
+                    $featureSettings['companyFields'] = $submittedCompanyFields;
+                    unset($availableIntegrationFields['company']);
+                }
+            }
+
+            // Rest of the objects are merged and assumed to be leadFields
+            foreach ($submittedObjects as $object) {
+                if (isset($availableIntegrationFields[$object])) {
+                    $leadFields = array_merge($leadFields, $availableIntegrationFields[$object]);
+                }
+            }
+        } else {
+            // Cleanup assuming there are no objects as keys
+            $leadFields = $availableIntegrationFields;
+        }
+
+        if (!empty($leadFields)) {
+            $cleanup($submittedFields, $leadFields, $mauticLeadFields, 'leadFields');
+            $featureSettings['leadFields'] = $submittedFields;
+        }
+
+        $entity->setFeatureSettings($featureSettings);
+
+        return $missingRequiredFields;
+    }
+
+    /**
+     * @param array $fields
+     *
+     * @return array
+     */
+    public function getRequiredFields(array $fields)
+    {
+        $requiredFields = [];
+        foreach ($fields as $field => $details) {
+            if (is_array($details) && !empty($details['required'])) {
+                $requiredFields[$field] = $field;
+            }
+        }
+
+        return $requiredFields;
+    }
+
     /**
      * Match lead data with integration fields.
      *
@@ -1284,8 +1426,10 @@ public function populateLeadData($lead, $config = [])
 
         if ($lead instanceof Lead) {
             $fields = $lead->getFields(true);
+            $leadId = $lead->getId();
         } else {
             $fields = $lead;
+            $leadId = $lead['id'];
         }
 
         $leadFields      = $config['leadFields'];
@@ -1297,19 +1441,34 @@ public function populateLeadData($lead, $config = [])
         $matched = [];
 
         foreach ($availableFields as $key => $field) {
-            $integrationKey = $this->convertLeadFieldKey($key, $field);
+            $integrationKey = $matchIntegrationKey = $this->convertLeadFieldKey($key, $field);
+            if (is_array($integrationKey)) {
+                list($integrationKey, $matchIntegrationKey) = $integrationKey;
+            }
 
             if (isset($leadFields[$integrationKey])) {
+                if ($leadFields[$integrationKey] == 'mauticContactTimelineLink') {
+                    $this->pushContactLink  = true;
+                    $mauticContactLinkField = $integrationKey;
+                    continue;
+                }
                 $mauticKey = $leadFields[$integrationKey];
                 if (isset($fields[$mauticKey]) && !empty($fields[$mauticKey]['value'])) {
-                    $matched[$integrationKey] = $fields[$mauticKey]['value'];
+                    $matched[$matchIntegrationKey] = $fields[$mauticKey]['value'];
                 }
             }
 
-            if (!empty($field['required']) && empty($matched[$integrationKey])) {
-                $matched[$integrationKey] = $unknown;
+            if (!empty($field['required']) && empty($matched[$matchIntegrationKey])) {
+                $matched[$matchIntegrationKey] = $unknown;
             }
         }
+        if ($this->pushContactLink) {
+            $matched[$mauticContactLinkField] = $this->factory->getRouter()->generate(
+                'mautic_plugin_timeline_view',
+                ['integration' => $this->getName(), 'leadId' => $leadId],
+                UrlGeneratorInterface::ABSOLUTE_URL
+            );
+        }
 
         return $matched;
     }
@@ -1660,17 +1819,84 @@ public function checkImageExists($url)
         return $retcode == 200;
     }
 
+    /**
+     * @return \Mautic\CoreBundle\Model\NotificationModel
+     */
+    public function getNotificationModel()
+    {
+        return $this->factory->getModel('core.notification');
+    }
+
     /**
      * @param \Exception $e
+     * @param null       $contact
      */
-    public function logIntegrationError(\Exception $e)
+    public function logIntegrationError(\Exception $e, Lead $contact = null)
     {
         $logger = $this->factory->getLogger();
-        if ('dev' == MAUTIC_ENV) {
-            $logger->addError('INTEGRATION ERROR: '.$this->getName().' - '.$e);
-        } else {
-            $logger->addError('INTEGRATION ERROR: '.$this->getName().' - '.$e->getMessage());
+
+        if ($e instanceof ApiErrorException) {
+            if (null === $this->adminUsers) {
+                $this->adminUsers = $this->em->getRepository('MauticUserBundle:User')->getEntities(
+                    [
+                        'filter' => [
+                            'force' => [
+                                [
+                                    'column' => 'r.isAdmin',
+                                    'expr'   => 'eq',
+                                    'value'  => true,
+                                ],
+                            ],
+                        ],
+                    ]
+                );
+            }
+
+            $errorMessage = ('dev' == MAUTIC_ENV) ? (string) $e : $e->getMessage();
+            $errorHeader  = $this->getTranslator()->trans(
+                'mautic.integration.error',
+                [
+                    '%name%' => $this->getName(),
+                ]
+            );
+
+            if ($contact || $contact = $e->getContact()) {
+                // Append a link to the contact
+                $contactId   = $contact->getId();
+                $contactName = $contact->getPrimaryIdentifier();
+            } elseif ($contactId = $e->getContactId()) {
+                $contactName = $this->getTranslator()->trans('mautic.integration.error.generic_contact_name', ['%id%' => $contactId]);
+            }
+
+            if ($contactId) {
+                $contactLink = $this->factory->getRouter()->generate('mautic_contact_action', [
+                    'objectAction' => 'view', 'objectId' => $contactId,
+                ],
+                    UrlGeneratorInterface::ABSOLUTE_URL
+                );
+                $errorMessage .= ' <a href="'.$contactLink.'">'.$contactName.'</a>';
+            }
+
+            // Prevent a flood of the same messages
+            $messageHash = md5($errorMessage);
+            if (!array_key_exists($messageHash, $this->notifications)) {
+                foreach ($this->adminUsers as $user) {
+                    $this->getNotificationModel()->addNotification(
+                        $errorHeader,
+                        $this->getName(),
+                        false,
+                        $errorMessage,
+                        'text-danger fa-exclamation-circle',
+                        null,
+                        $user
+                    );
+                }
+
+                $this->notifications[$messageHash] = true;
+            }
         }
+
+        $logger->addError('INTEGRATION ERROR: '.$this->getName().' - '.$errorMessage);
     }
 
     /**
@@ -1704,6 +1930,18 @@ public function appendToForm(&$builder, $data, $formArea)
     {
     }
 
+    /**
+     * @param FormBuilder $builder
+     * @param array       $options
+     */
+    public function modifyForm($builder, $options)
+    {
+        $this->dispatcher->dispatch(
+            PluginEvents::PLUGIN_ON_INTEGRATION_FORM_BUILD,
+            new PluginIntegrationFormBuildEvent($this, $builder, $options)
+        );
+    }
+
     /**
      * Returns settings for the integration form.
      *
@@ -1711,7 +1949,8 @@ public function appendToForm(&$builder, $data, $formArea)
      */
     public function getFormSettings()
     {
-        $type = $this->getAuthenticationType();
+        $type               = $this->getAuthenticationType();
+        $enableDataPriority = $this->getDataPriority();
         switch ($type) {
             case 'oauth1a':
             case 'oauth2':
@@ -1726,6 +1965,7 @@ public function getFormSettings()
             'requires_callback'      => $callback,
             'requires_authorization' => $authorization,
             'default_features'       => [],
+            'enable_data_priority'   => $enableDataPriority,
         ];
     }
 
diff --git a/app/bundles/PluginBundle/Model/PluginModel.php b/app/bundles/PluginBundle/Model/PluginModel.php
index 45aec119fac..ec1e5da5607 100644
--- a/app/bundles/PluginBundle/Model/PluginModel.php
+++ b/app/bundles/PluginBundle/Model/PluginModel.php
@@ -44,6 +44,11 @@ public function getRepository()
         return $this->em->getRepository('MauticPluginBundle:Plugin');
     }
 
+    public function getIntegrationEntityRepository()
+    {
+        return $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -67,4 +72,10 @@ public function getCompanyFields()
     {
         return $this->leadFieldModel->getFieldList(true, true, ['isPublished' => true, 'object' => 'company']);
     }
+
+    public function saveFeatureSettings($entity)
+    {
+        $this->em->persist($entity);
+        $this->em->flush();
+    }
 }
diff --git a/app/bundles/PluginBundle/PluginEvents.php b/app/bundles/PluginBundle/PluginEvents.php
index b2cac898178..c3db7c7dcd3 100644
--- a/app/bundles/PluginBundle/PluginEvents.php
+++ b/app/bundles/PluginBundle/PluginEvents.php
@@ -108,4 +108,13 @@ final class PluginEvents
      * @var string
      */
     const PLUGIN_ON_INTEGRATION_FORM_DISPLAY = 'mautic.plugin_on_integration_form_display';
+
+    /**
+     * The mautic.plugin_on_integration_form_build event is dispatched when building an integration's config form.
+     *
+     * The event listener receives a Mautic\PluginBundle\Event\PluginIntegrationFormBuildEvent instance.
+     *
+     * @var string
+     */
+    const PLUGIN_ON_INTEGRATION_FORM_BUILD = 'mautic.plugin_on_integration_form_build';
 }
diff --git a/app/bundles/PluginBundle/Translations/en_US/messages.ini b/app/bundles/PluginBundle/Translations/en_US/messages.ini
index 8f16ba634c3..c7a8527ba91 100644
--- a/app/bundles/PluginBundle/Translations/en_US/messages.ini
+++ b/app/bundles/PluginBundle/Translations/en_US/messages.ini
@@ -1,6 +1,8 @@
 mautic.campaign.plugin.leadpush="Push contact"
 mautic.integration.callbackuri="If applicable, use the following as the callback URL (may also be called the return URI) when configuring your application:"
 mautic.integration.closewindow="Close Window"
+mautic.integration.error="%name% Error"
+mautic.integration.error.generic_contact_name="Contact ID# %id%"
 mautic.integration.error.refreshtoken_expired="The refresh token has expired. Re-authorization is required."
 mautic.integration.filter.all="Show all plugins"
 mautic.integration.form.authorize="Authorize App"
@@ -8,13 +10,13 @@ mautic.integration.form.enabled="Is enabled?"
 mautic.integration.form.feature.login_button="Login Button"
 mautic.integration.form.feature.public_activity="Display public activity"
 mautic.integration.form.feature.public_profile="Display public profile and enable profile to contact field matching"
-mautic.integration.form.feature.push_lead="Push contacts to this integration"
+mautic.integration.form.feature.push_lead="Triggered action push contacts to integration"
 mautic.integration.form.feature.settings="Feature Specific Settings"
 mautic.integration.form.feature.share_button="Display share button on landing page social widget"
 mautic.integration.form.feature.sso_service="Single Sign On - Service Authentication"
 mautic.integration.form.feature.sso_form="Single Sign On - Form Authentication"
 mautic.integration.form.features="Enabled features"
-mautic.integration.form.field_match_notes="A red asterisk (*) is required by the integration. If the values are empty for the contact, a value of 'Unknown' will be sent. If the integration field is a pick list, be sure the list values of Mautic's field matches those of the integration."
+mautic.integration.form.field_match_notes="If the values are empty for the Mautic object, a value of 'Unknown' will be sent. If the integration field is a pick list, be sure the list values of Mautic's field matches those of the integration."
 mautic.integration.form.lead.unknown="Unknown"
 mautic.integration.form.profile="Public Profile"
 mautic.integration.form.reauthorize="Reauthorize App"
@@ -33,6 +35,7 @@ mautic.integration.keyfield.consumersecret="Consumer Secret"
 mautic.integration.keyfield.username="Username"
 mautic.integration.keyfield.password="Password"
 mautic.integration.leadfield_matches="Assign available integration fields to local contact fields."
+mautic.integration.comapanyfield_matches="Assign available integration fields to local company fields."
 mautic.integration.missingkeys="Keys are not available for this transaction to take place. Please verify your settings then try again."
 mautic.integration.noresults.tip="Expecting integrations but see none? Enable the associated addon via the Addon Manager! For example, the Social Media addon must be enabled in order for Facebook to be listed."
 mautic.integration.sso.auto_create_user="Automatically create local user?"
@@ -57,6 +60,7 @@ mautic.plugin.command.fetch.leads.events_executed="Number of contacts fetched: %
 mautic.plugin.command.fetch.companies.events_executed="Number of companies fetched: %events%"
 mautic.plugin.command.fetch.leads.wrong.date="Start date must be less than 30 days in the past"
 mautic.plugin.command.push.leads.events_executed="Number of contacts processed: %events%"
+mautic.plugin.form.add.fields="Add Field"
 mautic.plugin.plugins="Plugins"
 mautic.plugin.help.searchcommands="<strong>Search commands</strong><br />is:published<br />is:unpublished"
 mautic.plugin.integration.tab.details="Enabled/Auth"
@@ -73,4 +77,15 @@ mautic.integration.form.feature.get_leads="Pull contacts from integration"
 mautic.plugin.command.push.leads.activity="Push activity timeline to salesforce mautic object"
 mautic.plugin.command.fetch.companies="Fetching companies"
 mautic.plugin.command.fetch.companies.starting="Fetch companies command is starting"
-mautic.integration.comapanyfield_matches="Company Fields"
\ No newline at end of file
+mautic.plugin.command.pushing.leads="Updating/creating leads from Mautic to %integration%"
+mautic.plugin.command.fetch.pushing.leads.events_executed="Number of contacts pushed: %updated% updated and %created% created"
+mautic.plugins.integration.fields="Integration fields"
+mautic.plugins.mautic.direction="Direction"
+mautic.plugins.mautic.fields="Mautic fields"
+mautic.plugin.direction.data.update="Pick direction of data update"
+mautic.integration.form.feature.push_leads="Push contacts to this integration"
+mautic.plugin.integration.campaign_members="Integration Campaign Members"
+mautic.plugin.integration.contact.timeline.link="Contact's timeline link"
+mautic.plugin.integration.campaigns="Push contacts to this integration campaign"
+mautic.plugin.config.campaign.member.chooseone="Choose a campaign to insert contacts into"
+mautic.plugin.integration.campaigns.member.status="Campaign member status"
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Translations/en_US/validators.ini b/app/bundles/PluginBundle/Translations/en_US/validators.ini
new file mode 100644
index 00000000000..8d002c6fc74
--- /dev/null
+++ b/app/bundles/PluginBundle/Translations/en_US/validators.ini
@@ -0,0 +1 @@
+mautic.plugin.field.required_mapping_missing="At least one required field is not mapped."
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Views/Auth/postauth.html.php b/app/bundles/PluginBundle/Views/Auth/postauth.html.php
index 4848709126f..bfa7a7347b7 100644
--- a/app/bundles/PluginBundle/Views/Auth/postauth.html.php
+++ b/app/bundles/PluginBundle/Views/Auth/postauth.html.php
@@ -10,6 +10,7 @@
  */
 $view->extend('MauticCoreBundle:Default:slim.html.php');
 $view['slots']->set('mauticContent', 'social');
+
 $data = json_encode($data);
 $js   = <<<JS
 function postFormHandler() {
@@ -20,16 +21,22 @@ function postFormHandler() {
         Mautic.refreshIntegrationForm();
     }
     window.close()
-
 }
+JS;
+
+if (!empty($message) && 'success' === $alert):
+    $js .= <<<'JS'
+    
 (function() {
    postFormHandler();
 })();
 JS;
+endif;
 ?>
 <script>
     <?php echo $js; ?>
 </script>
+
 <?php if (!empty($message)): ?>
     <div class="alert alert-<?php echo $alert; ?>">
         <?php echo $message; ?>
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php
deleted file mode 100644
index ec6e825cfee..00000000000
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-?>
-
-<div class="row" id="leadFieldsContainer">
-    <?php if (!empty($specialInstructions)): ?>
-        <div class="alert alert-<?php echo $alertType; ?>">
-            <?php echo $view['translator']->trans($specialInstructions); ?>
-        </div>
-    <?php endif; ?>
-    <div class="form-group col-xs-12">
-        <?php echo $view['form']->errors($form); ?>
-        <?php $rowCount = 1; ?>
-        <?php foreach ($form->children as $child): ?>
-        <?php if ($rowCount++ % 2 == 1): ?>
-        <div class="row">
-        <?php endif; ?>
-            <div class="col-sm-6">
-                <?php echo $view['form']->row($child); ?>
-            </div>
-        <?php if ($rowCount++ % 2 == 1): ?>
-        </div>
-        <?php endif; ?>
-        <?php ++$rowCount; ?>
-        <?php endforeach; ?>
-        <?php
-        if ($rowCount % 2 == 0):?>
-    </div>
-        <?php endif; ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/fields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/fields_row.html.php
new file mode 100644
index 00000000000..e66116ab532
--- /dev/null
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/fields_row.html.php
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+/** @var int $numberOfFields */
+$rowCount   = 0;
+$indexCount = 1;
+?>
+
+<div class="row fields-container" id="<?php echo $containerId; ?>">
+    <?php if (!empty($specialInstructions)): ?>
+        <div class="alert alert-<?php echo $alertType; ?>">
+            <?php echo $view['translator']->trans($specialInstructions); ?>
+        </div>
+    <?php endif; ?>
+    <?php if (count($form->vars['errors'])): ?>
+        <div class="alert alert-danger">
+            <?php foreach ($form->vars['errors'] as $error): ?>
+                <p><?php echo $error->getMessage() ?></p>
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+    <div class="<?php echo $object; ?>-field form-group col-xs-12">
+        <div class="row">
+            <?php $class = ($numberOfFields == 5) ? 5 : 6; ?>
+            <div class="mb-xs col-sm-<?php echo $class; ?> text-center"><h4><?php echo $view['translator']->trans('mautic.plugins.integration.fields'); ?></h4></div>
+            <?php if ($numberOfFields == 5): ?>
+                <div class="col-sm-2"></div>
+            <?php endif; ?>
+            <div class="mb-xs col-sm-<?php echo $class; ?> text-center"><h4><?php echo $view['translator']->trans('mautic.plugins.mautic.fields'); ?></h4></div>
+        </div>
+        <?php foreach ($form->children as $child):
+            $selected = false;
+            ?>
+            <?php $isRequired = !empty($child->vars['attr']['data-required']); ?>
+            <?php if ($rowCount % $numberOfFields == 0):  ?>
+            <div id="<?php echo $object; ?>-<?php echo $rowCount; ?>" class="field-container row<?php if ($numberOfFields !== 5): echo ' pb-md'; endif; ?>">
+            <?php endif; ?>
+            <?php ++$rowCount; ?>
+            <?php
+            if ('hidden' === $child->vars['block_prefixes'][1]):
+                echo $view['form']->row($child);
+            else:
+                $class = '';
+                switch (true):
+                    case $rowCount % $numberOfFields == 1:
+                    case $rowCount % $numberOfFields == 3:
+                        $class = (5 === $numberOfFields) ? 'col-sm-5' : 'col-sm-6';
+                        break;
+                    case $rowCount % $numberOfFields == 2:
+                        $class = (5 === $numberOfFields) ? 'col-sm-2' : 'col-sm-6';
+                        break;
+                endswitch;
+            endif;
+            if ($child->vars['name'] == 'label_'.$indexCount):
+                if ($isRequired):
+                    $name = $child->vars['full_name'];
+                    echo '<input type="hidden" value="'.$child->vars['value'].'" name="'.$name.'" />';
+                endif;
+                ?>
+                <div class="pl-xs pr-xs <?php echo $class; ?><?php if ($isRequired): echo ' has-error'; endif; ?>">
+                    <div class="placeholder" data-placeholder="<?php echo $child->vars['attr']['placeholder']; ?>">
+                        <input type="text"
+                               id="<?php echo $child->vars['id']; ?>"
+                               name="<?php echo $child->vars['full_name']; ?>"
+                               class="<?php echo $child->vars['attr']['class']; ?>"
+                               value="<?php echo $child->vars['value']; ?>"
+                               readonly />
+                    </div>
+                </div>
+            <?php endif; ?>
+            <?php if (strstr($child->vars['name'], 'update_mautic')): ?>
+            <div class="pr-xs <?php echo $class; ?>" style="padding-left: 8px;" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.plugin.direction.data.update'); ?>">
+                <div class="row">
+                    <div class="form-group col-xs-12 ">
+                        <div class="choice-wrapper">
+                            <div class="btn-group btn-block" data-toggle="buttons">
+                                <?php $checked = $child->vars['value'] === '0'; ?>
+                                <label class="btn btn-default<?php if ($checked): echo ' active'; endif; ?>">
+                                    <input type="radio"
+                                           id="<?php echo $child->vars['id']; ?>_0"
+                                           name="<?php echo $child->vars['full_name']; ?>"
+                                           data-toggle="tooltip"
+                                           title=""
+                                           autocomplete="false"
+                                           value="0"
+                                           onchange="Mautic.matchedFields(<?php echo $indexCount; ?>, '<?php echo $object; ?>', '<?php echo $integration; ?>')"
+                                           <?php if ($checked): ?>checked="checked"<?php endif; ?>>
+                                    <btn class="btn-nospin fa fa-arrow-circle-left"></btn>
+                                </label>
+                                <?php $checked = $child->vars['value'] === '1'; ?>
+                                <label class="btn btn-default<?php if ($checked): echo ' active'; endif; ?>">
+                                    <input type="radio" id="<?php echo $child->vars['id']; ?>_1"
+                                           name="<?php echo $child->vars['full_name']; ?>"
+                                           data-toggle="tooltip"
+                                           title=""
+                                           autocomplete="false"
+                                           value="1"
+                                           onchange="Mautic.matchedFields(<?php echo $indexCount; ?>, '<?php echo $object; ?>', '<?php echo $integration; ?>')"
+                                           <?php if ($child->vars['value'] === '1'): ?>checked="checked"<?php endif; ?>>
+                                    <btn class="btn-nospin fa fa-arrow-circle-right"></btn>
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <?php endif; ?>
+
+            <?php if ($child->vars['name'] == 'm_'.$indexCount): ?>
+            <div class="pl-xs pr-xs <?php echo $class; ?>">
+                <?php if ($isRequired): ?>
+                <div class="has-errors">
+                <?php endif; ?>
+                <select id="<?php echo $child->vars['id']; ?>"
+                        name="<?php echo $child->vars['full_name']; ?>"
+                        class="<?php echo $child->vars['attr']['class']; ?>"
+                        data-placeholder=" "
+                        autocomplete="false" onchange="Mautic.matchedFields(<?php echo $indexCount; ?>, '<?php echo $object; ?>', '<?php echo $integration; ?>')">
+                    <option value=""></option>
+                    <?php
+                    $mauticChoices = $child->vars['attr']['data-choices'];
+                    foreach ($mauticChoices as $keyLabel => $options): ?>
+                    <?php if (is_array($options)) : ?>
+                    <optgroup label="<?php echo $keyLabel; ?>">
+                        <?php foreach ($options as $keyValue => $o): ?>
+                        <option value="<?php echo $keyValue; ?>" <?php if ($keyValue === $child->vars['data']): echo 'selected'; $selected = true; elseif (empty($selected) && $keyValue == '-1'): echo 'selected'; endif; ?>>
+                            <?php echo $o; ?>
+                        </option>
+                        <?php endforeach; ?>
+
+                    </optgroup>
+                    <?php else : ?>
+                    <option value="<?php echo $keyLabel; ?>" <?php if ($keyLabel === $child->vars['data']): echo 'selected'; $selected = true; elseif (empty($selected) && $keyLabel == '-1'): echo 'selected'; endif; ?>>
+                        <?php echo $options; ?>
+                    </option>
+                    <?php endif; ?>
+                    <?php endforeach; ?>
+                </select>
+                <?php if ($isRequired): ?>
+                </div>
+                <?php endif; ?>
+            </div>
+
+            <?php endif; ?>
+
+            <?php if ($rowCount % $numberOfFields == 0): ?>
+                </div>
+                <?php
+                ++$indexCount;
+            endif;
+            ?>
+        <?php endforeach; ?>
+    </div>
+    <?php if ($indexCount - 1 < $totalFields): ?>
+    <div class="panel-footer">
+
+        <?php echo $view->render(
+            'MauticCoreBundle:Helper:pagination.html.php',
+            [
+                'page'        => $page,
+                'fixedPages'  => $fixedPageNum,
+                'fixedLimit'  => true,
+                'target'      => '#IntegrationEditModal',
+                'totalItems'  => $totalFields,
+                'jsCallback'  => 'Mautic.getIntegrationFields',
+                'jsArguments' => [
+                    [
+                        'object'      => $object,
+                        'integration' => $integration,
+                    ],
+                ],
+            ]
+        ); ?>
+    </div>
+    <?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_company_fields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_company_fields_row.html.php
index e83a0b0d16b..7ac52e595fc 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_company_fields_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_company_fields_row.html.php
@@ -8,28 +8,9 @@
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-?>
 
-<div class="row" id="companyFieldsContainer">
-    <?php if (!empty($specialInstructions)): ?>
-        <div class="alert alert-<?php echo $alertType; ?>">
-            <?php echo $view['translator']->trans($specialInstructions); ?>
-        </div>
-    <?php endif; ?>
-    <div class="form-group col-xs-12">
-        <?php echo $view['form']->errors($form); ?>
-        <?php $rowCount = 1; ?>
-        <?php foreach ($form->children as $child): ?>
-            <?php if ($rowCount++ % 2 == 1): ?>
-                <div class="row">
-            <?php endif; ?>
-            <div class="col-sm-6">
-                <?php echo $view['form']->row($child); ?>
-            </div>
-            <?php if ($rowCount++ % 2 == 1): ?>
-                </div>
-            <?php endif; ?>
-            <?php ++$rowCount; ?>
-        <?php endforeach; ?>
-    </div>
-</div>
\ No newline at end of file
+$containerId    = 'companyFieldsContainer';
+$numberOfFields = ($form->offsetExists('update_mautic_company1')) ? 5 : 4;
+$object         = 'company';
+
+include __DIR__.'/fields_row.html.php';
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
index f6f72a79dff..8775b36708b 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
@@ -8,29 +8,9 @@
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-?>
 
-<div class="row" id="leadFieldsContainer">
-    <?php if (!empty($specialInstructions)): ?>
-        <div class="alert alert-<?php echo $alertType; ?>">
-            <?php echo $view['translator']->trans($specialInstructions); ?>
-        </div>
-    <?php endif; ?>
+$containerId    = 'leadFieldsContainer';
+$numberOfFields = ($form->offsetExists('update_mautic1')) ? 5 : 4;
+$object         = 'lead';
 
-    <div class="form-group col-xs-12">
-        <?php echo $view['form']->errors($form); ?>
-        <?php $rowCount = 1; ?>
-        <?php foreach ($form->children as $child): ?>
-        <?php if ($rowCount++ % 2 == 1): ?>
-        <div class="row">
-        <?php endif; ?>
-            <div class="col-sm-6">
-                <?php echo $view['form']->row($child); ?>
-            </div>
-        <?php if ($rowCount++ % 2 == 1): ?>
-        </div>
-        <?php endif; ?>
-        <?php ++$rowCount; ?>
-        <?php endforeach; ?>
-    </div>
-</div>
\ No newline at end of file
+include __DIR__.'/fields_row.html.php';
diff --git a/app/bundles/PluginBundle/Views/Integration/form.html.php b/app/bundles/PluginBundle/Views/Integration/form.html.php
index c0e6e36e79e..9ebdf63fe21 100644
--- a/app/bundles/PluginBundle/Views/Integration/form.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/form.html.php
@@ -14,22 +14,38 @@
     }
 }
 
-if (!$hasFields = (isset($form['featureSettings']) && count($form['featureSettings']['leadFields']))) {
+if (!$hasFields = (!empty($formSettings['dynamic_contact_fields']) || isset($form['featureSettings']) && count($form['featureSettings']['leadFields']))) {
     // Unset if set to prevent features tab from showing when there's no feature to show
     unset($form['featureSettings']['leadFields']);
+} else {
+    $hideContactFieldTab = (!empty($formSettings['dynamic_contact_fields']) && !count($form['featureSettings']['leadFields']));
 }
-if (!$hasFeatureSettings = (isset($form['featureSettings']) && (($hasFields && count($form['featureSettings']) > 1) || (!$hasFields && count($form['featureSettings']))))) {
+
+if (!$hasFeatureSettings = (isset($form['featureSettings'])
+    && (($hasFields && count($form['featureSettings']) > 1)
+        || (!$hasFields
+            && count(
+                $form['featureSettings']
+            ))))
+) {
     if (isset($form['featureSettings'])) {
         $form['featureSettings']->setRendered();
     }
 }
+$hasCompanyFields      = (isset($form['featureSettings']['companyFields']) && count($form['featureSettings']['companyFields']));
+$companyFieldHtml      = ($hasCompanyFields) ? $view['form']->row($form['featureSettings']['companyFields']) : '';
+$fieldHtml             = ($hasFields) ? $view['form']->row($form['featureSettings']['leadFields']) : '';
+$fieldLabel            = ($hasFields) ? $form['featureSettings']['leadFields']->vars['label'] : '';
+$fieldTabClass         = ($hasFields && empty($hideContactFieldTab)) ? '' : ' hide';
+$hasLeadFieldErrors    = ($hasFields && $view['form']->containsErrors($form['featureSettings']['leadFields']));
+$hasCompanyFieldErrors = ($hasCompanyFields && $view['form']->containsErrors($form['featureSettings']['companyFields']));
 
-$fieldHtml        = ($hasFields) ? $view['form']->row($form['featureSettings']['leadFields']) : '';
-$companyFieldHtml = (isset($form['featureSettings']['companyFields']) && count($form['featureSettings']['companyFields'])) ? $view['form']->row($form['featureSettings']['companyFields']) : '';
-$fieldLabel       = ($hasFields) ? $form['featureSettings']['leadFields']->vars['label'] : '';
-$fieldTabClass    = ($hasFields) ? '' : ' hide';
 unset($form['featureSettings']['leadFields']);
 unset($form['featureSettings']['companyFields']);
+
+$hasFeatureErrors =
+    ($hasSupportedFeatures && $view['form']->containsErrors($form['supportedFeatures'])) ||
+    ($hasFeatureSettings && $view['form']->containsErrors($form['featureSettings']));
 ?>
 
 <?php if (!empty($description)) : ?>
@@ -38,23 +54,49 @@
     </div>
 <?php endif; ?>
 <ul class="nav nav-tabs">
-    <li class="active" id="details-tab"><a href="#details-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.plugin.integration.tab.details'); ?></a></li>
+    <li class="<?php if (isset($activeTab) && $activeTab == 'details-container'): echo 'active'; endif; ?> " id="details-tab">
+        <a href="#details-container" role="tab" data-toggle="tab">
+            <?php echo $view['translator']->trans('mautic.plugin.integration.tab.details'); ?>
+        </a>
+    </li>
     <?php if ($hasSupportedFeatures || $hasFeatureSettings): ?>
-        <li class="" id="features-tab"><a href="#features-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.plugin.integration.tab.features'); ?></a></li>
+        <li class="" id="features-tab">
+            <a href="#features-container" role="tab" data-toggle="tab">
+                <?php echo $view['translator']->trans('mautic.plugin.integration.tab.features'); ?>
+                <?php if ($hasFeatureErrors): ?>
+                <i class="fa fa-fw fa-warning text-danger"></i>
+                <?php endif; ?>
+            </a>
+        </li>
     <?php endif; ?>
     <?php if ($hasFields): ?>
-        <li class="<?php echo $fieldTabClass; ?>" id="fields-tab"><a href="#fields-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.plugin.integration.tab.fieldmapping'); ?></a></li>
+        <li class="<?php echo $fieldTabClass; ?> <?php if (isset($activeTab) && $activeTab == 'leadFieldsContainer'): echo 'active'; endif; ?> " id="fields-tab">
+            <a href="#fields-container" role="tab" data-toggle="tab">
+                <?php echo $view['translator']->trans('mautic.plugin.integration.tab.fieldmapping'); ?>
+                <?php if ($hasLeadFieldErrors): ?>
+                    <i class="fa fa-fw fa-warning text-danger"></i>
+                <?php endif; ?>
+            </a>
+        </li>
     <?php endif; ?>
     <?php if (!empty($companyFieldHtml)) : ?>
-    <li class="<?php echo $fieldTabClass; ?>" id="fields-tab"><a href="#company-fields-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.plugin.integration.tab.companyfieldmapping'); ?></a></li>
+        <li class="<?php echo $fieldTabClass; ?> <?php if (isset($activeTab) && $activeTab == 'companyFieldsContainer'): echo 'active'; endif; ?> " id="company-fields-tab">
+            <a href="#company-fields-container" role="tab" data-toggle="tab">
+                <?php echo $view['translator']->trans('mautic.plugin.integration.tab.companyfieldmapping'); ?>
+                <?php if ($hasCompanyFieldErrors): ?>
+                    <i class="fa fa-fw fa-warning text-danger"></i>
+                <?php endif; ?>
+            </a>
+        </li>
     <?php endif; ?>
 </ul>
 
 <?php echo $view['form']->start($form); ?>
 <!--/ tabs controls -->
 <div class="tab-content pa-md bg-white">
-    <div class="tab-pane fade in active bdr-w-0" id="details-container">
+    <div class="tab-pane fade <?php if (isset($activeTab) && $activeTab == 'details-container'): echo 'in active'; endif; ?> bdr-w-0" id="details-container">
         <?php echo $view['form']->row($form['isPublished']); ?>
+        <?php echo $view['form']->rowIfExists($form, 'virtual'); ?>
         <?php echo $view['form']->row($form['apiKeys']); ?>
         <?php if (isset($formNotes['authorization'])): ?>
             <div class="alert alert-<?php echo $formNotes['authorization']['type']; ?>">
@@ -63,8 +105,8 @@
         <?php endif; ?>
         <?php if (count($form['apiKeys']) && !empty($callbackUrl)): ?>
             <div class="well well-sm">
-                <?php echo $view['translator']->trans('mautic.integration.callbackuri'); ?><br />
-                <input type="text" readonly onclick="this.setSelectionRange(0, this.value.length);" value="<?php echo $callbackUrl; ?>" class="form-control" />
+                <?php echo $view['translator']->trans('mautic.integration.callbackuri'); ?><br/>
+                <input type="text" readonly onclick="this.setSelectionRange(0, this.value.length);" value="<?php echo $callbackUrl; ?>" class="form-control"/>
             </div>
         <?php endif; ?>
         <?php if (isset($form['authButton'])): ?>
@@ -92,14 +134,16 @@
     <?php endif; ?>
 
     <?php if ($hasFields): ?>
-        <div class="tab-pane fade bdr-w-0" id="fields-container">
+        <div class="tab-pane fade <?php if (isset($activeTab) && $activeTab == 'leadFieldsContainer'): echo 'in active'; endif; ?>  bdr-w-0" id="fields-container">
             <h4 class="mb-sm"><?php echo $view['translator']->trans($fieldLabel); ?></h4>
             <?php echo $fieldHtml; ?>
         </div>
     <?php endif; ?>
-    <div class="tab-pane fade bdr-w-0" id="company-fields-container">
+    <?php if ($hasCompanyFields): ?>
+    <div class="tab-pane fade <?php if (isset($activeTab) && $activeTab == 'companyFieldsContainer'): echo 'in active'; endif; ?> bdr-w-0" id="company-fields-container">
         <h4 class="mb-sm"><?php echo $view['translator']->trans('mautic.integration.comapanyfield_matches'); ?></h4>
         <?php echo $companyFieldHtml; ?>
     </div>
+    <?php endif; ?>
 </div>
 <?php echo $view['form']->end($form); ?>
diff --git a/app/bundles/PluginBundle/Views/Integration/grid.html.php b/app/bundles/PluginBundle/Views/Integration/grid.html.php
index 3e9462ae4d5..1a76f074094 100644
--- a/app/bundles/PluginBundle/Views/Integration/grid.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/grid.html.php
@@ -15,17 +15,24 @@
 <?php if (count($items)): ?>
 <div class="pa-md bg-auto">
     <div class="row shuffle-integrations">
-            <?php foreach ($items as $item): ?>
+            <?php foreach ($items as $item):
+                if (array_key_exists($item['plugin'], $plugins)) {
+                    $pluginTitle = $plugins[$item['plugin']]['name'].' - '.$item['display'];
+                } else {
+                    $pluginTitle = $item['name'].' - '.$item['display'];
+                }
+                ?>
                 <div class="shuffle shuffle-item grid ma-10 pull-left text-center integration plugin<?php echo $item['plugin']; ?> integration-<?php echo $item['name']; ?> <?php if (!$item['enabled']) {
-    echo  'integration-disabled';
-} ?>">
+                    echo  'integration-disabled';
+                } ?>">
                     <div class="panel ovf-h pa-10">
-                        <a href="<?php echo $view['router']->path(($item['isBundle'] ? 'mautic_plugin_info' : 'mautic_plugin_config'), ['name' => $item['name']]); ?>" data-toggle="ajaxmodal" data-target="#IntegrationEditModal" data-header="<?php echo $item['display']; ?>"<?php if ($item['isBundle']) {
-    echo ' data-footer="false"';
-} ?>>
+
+                        <a href="<?php echo $view['router']->path(($item['isBundle'] ? 'mautic_plugin_info' : 'mautic_plugin_config'), ['name' => $item['name']]); ?>" data-prevent-dismiss="true" data-toggle="ajaxmodal" data-target="#IntegrationEditModal" data-header="<?php echo $item['display']; ?>"<?php if ($item['isBundle']) {
+                    echo ' data-footer="false"';
+                } ?>>
                             <p><img style="height: 78px;" class="img img-responsive" src="<?php echo $view['assets']->getUrl($item['icon']); ?>" /></p>
                             <h5 class="mt-20">
-                                <span class="ellipsis" data-toggle="tooltip" title="<?php echo $plugins[$item['plugin']]['name'].' - '.$item['display']; ?>"><?php echo $item['display']; ?>
+                                <span class="ellipsis" data-toggle="tooltip" title="<?php echo $pluginTitle; ?>"><?php echo $item['display']; ?>
                                 </span>
                             </h5>
                         </a>
diff --git a/app/bundles/ReportBundle/Assets/css/report.css b/app/bundles/ReportBundle/Assets/css/report.css
index 479b4409389..9c194be3297 100644
--- a/app/bundles/ReportBundle/Assets/css/report.css
+++ b/app/bundles/ReportBundle/Assets/css/report.css
@@ -20,3 +20,6 @@
 #report_columns_chosen {
 	width: 100% !important;
 }
+#ms-report_groupBy ul{
+	height: 115px;
+}
diff --git a/app/bundles/ReportBundle/Assets/js/report.js b/app/bundles/ReportBundle/Assets/js/report.js
index 29e2126ebcf..47e01495703 100644
--- a/app/bundles/ReportBundle/Assets/js/report.js
+++ b/app/bundles/ReportBundle/Assets/js/report.js
@@ -7,9 +7,9 @@ Mautic.reportOnLoad = function (container) {
 
     // Append an index of the number of filters on the edit form
     if (mQuery('div[id=report_filters]').length) {
-        mQuery('div[id=report_filters]').data('index', mQuery('#report_filters > div').length);
-
-        mQuery('div[id=report_tableOrder]').data('index', mQuery('#report_tableOrder > div').length);
+        mQuery('div[id=report_filters]').attr('data-index', mQuery('#report_filters > div').length + 1);
+        mQuery('div[id=report_tableOrder]').attr('data-index', mQuery('#report_tableOrder > div').length + 1);
+        mQuery('div[id=report_aggregators]').attr('data-index', mQuery('#report_aggregators > div').length + 1);
 
         if (mQuery('.filter-columns').length) {
             mQuery('.filter-columns').each(function () {
@@ -29,7 +29,7 @@ Mautic.reportOnLoad = function (container) {
             })
         })
     }
-
+    Mautic.checkSelectedGroupBy();
     Mautic.initDateRangePicker();
 };
 
@@ -59,7 +59,6 @@ Mautic.addReportRow = function (elId) {
     prototypeHolder.append(output);
 
     var newColumnId = '#' + elId + '_' + index + '_column';
-
     if (elId == 'report_filters') {
         if (typeof Mautic.reportPrototypeFilterOptions != 'undefined') {
             // Update the column options if applicable
@@ -193,6 +192,9 @@ Mautic.updateReportSourceData = function (context) {
             mQuery('#report_columns').html(response.columns);
             mQuery('#report_columns').multiSelect('refresh');
 
+            mQuery('#report_groupBy').html(response.columns);
+            mQuery('#report_groupBy').multiSelect('refresh');
+
             // Remove any filters, they're no longer valid with different column lists
             mQuery('#report_filters').find('div').remove().end();
 
@@ -207,6 +209,9 @@ Mautic.updateReportSourceData = function (context) {
 
             // Reset index
             mQuery('#report_tableOrder').data('index', 0);
+            mQuery('#report_aggregators').find('div').remove().end();
+            // Reset index
+            mQuery('#report_aggregators').data('index', 0);
 
             // Update filter list
             Mautic.reportPrototypeFilterDefinitions = response.filterDefinitions;
@@ -244,3 +249,17 @@ Mautic.checkReportCondition = function (selector) {
         mQuery('#' + valueInput).prop('disabled', false);
     }
 };
+
+Mautic.checkSelectedGroupBy = function () {
+    var selectedOption = mQuery("select[name='report[groupBy][]'] option:selected").length;
+    var existingAggregators = mQuery("select[name*='report[aggregators]']");
+    if (selectedOption > 0) {
+        mQuery('#aggregators-button').prop('disabled', false);
+    } else {
+        existingAggregators.each(function() {
+            var containerId = mQuery(this).attr('id').replace('_column', '');
+            Mautic.removeReportRow(containerId + '_container');
+        });
+        mQuery('#aggregators-button').prop('disabled', true);
+    }
+};
diff --git a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
index 86c17c48c76..4441343ab09 100644
--- a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
+++ b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
@@ -212,7 +212,16 @@ protected function configureBuilder(array $options)
         }
 
         // Build GROUP BY
-        if (!empty($options['groupby'])) {
+        if ($groupByOptions = $this->entity->getGroupBy()) {
+            foreach ($groupByOptions as $groupBy) {
+                if (isset($options['columns'][$groupBy])) {
+                    $fieldOptions = $options['columns'][$groupBy];
+                    $columns[]    = (isset($fieldOptions['formula'])) ? $fieldOptions['formula'] : $groupBy;
+                }
+            }
+            $groupByColumns = implode(',', $columns);
+            $queryBuilder->addGroupBy($groupByColumns);
+        } elseif (!empty($options['groupby']) && empty($groupByOptions)) {
             if (is_array($options['groupby'])) {
                 foreach ($options['groupby'] as $groupBy) {
                     $queryBuilder->addGroupBy($groupBy);
@@ -221,7 +230,6 @@ protected function configureBuilder(array $options)
                 $queryBuilder->groupBy($options['groupby']);
             }
         }
-
         // Build LIMIT clause
         if (!empty($options['limit'])) {
             $queryBuilder->setFirstResult($options['start'])
@@ -271,6 +279,25 @@ protected function configureBuilder(array $options)
         }
 
         $queryBuilder->addSelect(implode(', ', $selectColumns));
+        // Add Aggregators
+        $aggregators = $this->entity->getAggregators();
+        if ($aggregators && $groupByOptions) {
+            foreach ($aggregators as $aggregator) {
+                $column = '';
+                if (isset($options['columns'][$aggregator['column']])) {
+                    $fieldOptions = $options['columns'][$aggregator['column']];
+                    if ($aggregator['function'] == 'AVG') {
+                        $field = (isset($fieldOptions['formula'])) ? 'ROUND('.$aggregator['function'].'(DISTINCT '.$fieldOptions['formula'].'))' : 'ROUND('.$aggregator['function'].'(DISTINCT '.$aggregator['column'].'))';
+                    } else {
+                        $field = (isset($fieldOptions['formula'])) ? $aggregator['function'].'(DISTINCT '.$fieldOptions['formula'].')' : $aggregator['function'].'(DISTINCT '.$aggregator['column'].')';
+                    }
+                    $column .= $field;
+                }
+
+                $formula = $column." as '".$aggregator['function'].' '.$aggregator['column']."'";
+                $queryBuilder->addSelect($formula);
+            }
+        }
 
         return $queryBuilder;
     }
@@ -335,7 +362,12 @@ private function applyFilters(array $filters, QueryBuilder $queryBuilder, array
                         }
 
                         $columnValue = ":$paramName";
-                        switch ($filterDefinitions[$filter['column']]['type']) {
+                        $type        = $filterDefinitions[$filter['column']]['type'];
+                        if (isset($filterDefinitions[$filter['column']]['formula'])) {
+                            $filter['column'] = $filterDefinitions[$filter['column']]['formula'];
+                        }
+
+                        switch ($type) {
                             case 'bool':
                             case 'boolean':
                                 if ((int) $filter['value'] > 1) {
@@ -359,9 +391,9 @@ private function applyFilters(array $filters, QueryBuilder $queryBuilder, array
                                 $queryBuilder->setParameter($paramName, $filter['value']);
                         }
 
-                        $filterExpr->add(
-                            $expr->{$exprFunction}($filter['column'], $columnValue)
-                        );
+                    $filterExpr->add(
+                        $expr->{$exprFunction}($filter['column'], $columnValue)
+                    );
                 }
             }
         }
diff --git a/app/bundles/ReportBundle/Config/config.php b/app/bundles/ReportBundle/Config/config.php
index 06f61930431..ebd051d346b 100644
--- a/app/bundles/ReportBundle/Config/config.php
+++ b/app/bundles/ReportBundle/Config/config.php
@@ -118,6 +118,17 @@
                 'alias'     => 'report_widget',
                 'arguments' => 'mautic.report.model.report',
             ],
+            'mautic.form.type.aggregator' => [
+                'class'     => 'Mautic\ReportBundle\Form\Type\AggregatorType',
+                'alias'     => 'aggregator',
+                'arguments' => 'translator',
+            ],
+        ],
+        'helpers' => [
+            'mautic.report.helper.report' => [
+                'class' => \Mautic\ReportBundle\Helper\ReportHelper::class,
+                'alias' => 'report',
+            ],
         ],
         'models' => [
             'mautic.report.model.report' => [
@@ -127,6 +138,8 @@
                     'mautic.helper.template.formatter',
                     'mautic.helper.templating',
                     'mautic.channel.helper.channel_list',
+                    'mautic.lead.model.field',
+                    'mautic.report.helper.report',
                 ],
             ],
         ],
diff --git a/app/bundles/ReportBundle/Controller/ReportController.php b/app/bundles/ReportBundle/Controller/ReportController.php
index e9d4b1d2114..2a4178e8608 100644
--- a/app/bundles/ReportBundle/Controller/ReportController.php
+++ b/app/bundles/ReportBundle/Controller/ReportController.php
@@ -12,6 +12,8 @@
 namespace Mautic\ReportBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
+use Mautic\CoreBundle\Helper\DateTimeHelper;
+use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\ReportBundle\Entity\Report;
 use Symfony\Component\HttpFoundation;
 
@@ -783,11 +785,42 @@ public function exportAction($objectId, $format = 'csv')
         $fromDate = $session->get('mautic.report.date.from', (new \DateTime('-30 days'))->format('Y-m-d'));
         $toDate   = $session->get('mautic.report.date.to', (new \DateTime())->format('Y-m-d'));
 
-        $reportData = $model->getReportData($entity, null, [
-            'dateFrom' => new \DateTime($fromDate),
-            'dateTo'   => new \DateTime($toDate),
-        ]);
+        $date    = (new DateTimeHelper())->toLocalString();
+        $name    = str_replace(' ', '_', $date).'_'.InputHelper::alphanum($entity->getName(), false, '-');
+        $options = ['dateFrom' => new \DateTime($fromDate), 'dateTo' => new \DateTime($toDate)];
+
+        if ($format === 'csv') {
+            $response = new HttpFoundation\StreamedResponse(
+                function () use ($model, $fromDate, $toDate, $entity, $format, $name, $options) {
+                    $options['paginate'] = true;
+                    $options['ignoreGraphData'] = true;
+                    $options['limit'] =
+                    $reportData['totalResults'] = 10000;
+                    $options['page'] = 1;
+                    $handle = fopen('php://output', 'r+');
+                    while ($reportData['totalResults'] >= ($options['page'] - 1) * $options['limit']) {
+                        $reportData = $model->getReportData($entity, null, $options);
+                        $model->exportResults($format, $entity, $reportData, $handle, $options['page']);
+                        ++$options['page'];
+                    }
+                    fclose($handle);
+                }
+            );
+
+            $response->headers->set('Content-Type', 'application/force-download');
+            $response->headers->set('Content-Type', 'application/octet-stream');
+            $response->headers->set('Content-Disposition', 'attachment; filename="'.$name.'.'.$format.'"');
+            $response->headers->set('Expires', 0);
+            $response->headers->set('Cache-Control', 'must-revalidate');
+            $response->headers->set('Pragma', 'public');
+        } else {
+            if ($format === 'xlsx') {
+                $options['ignoreGraphData'] = true;
+            }
+            $reportData = $model->getReportData($entity, null, $options);
+            $response   = $model->exportResults($format, $entity, $reportData);
+        }
 
-        return $model->exportResults($format, $entity, $reportData);
+        return $response;
     }
 }
diff --git a/app/bundles/ReportBundle/Entity/Report.php b/app/bundles/ReportBundle/Entity/Report.php
index 5b60bf6d7af..c4c2ebabcbc 100644
--- a/app/bundles/ReportBundle/Entity/Report.php
+++ b/app/bundles/ReportBundle/Entity/Report.php
@@ -68,6 +68,16 @@ class Report extends FormEntity
      */
     private $graphs = [];
 
+    /**
+     * @var array
+     */
+    private $groupBy = [];
+
+    /**
+     * @var array
+     */
+    private $aggregators = [];
+
     public function __clone()
     {
         $this->id = null;
@@ -107,6 +117,16 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
         $builder->createField('graphs', 'array')
             ->nullable()
             ->build();
+
+        $builder->createField('groupBy', 'array')
+            ->columnName('group_by')
+            ->nullable()
+            ->build();
+
+        $builder->createField('aggregators', 'array')
+            ->columnName('aggregators')
+            ->nullable()
+            ->build();
     }
 
     /**
@@ -142,6 +162,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'filters',
                     'tableOrder',
                     'graphs',
+                    'groupBy',
                 ]
             )
             ->build();
@@ -329,4 +350,36 @@ public function setGraphs(array $graphs)
     {
         $this->graphs = $graphs;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getGroupBy()
+    {
+        return $this->groupBy;
+    }
+
+    /**
+     * @param array $graphs
+     */
+    public function setGroupBy(array $groupBy)
+    {
+        $this->groupBy = $groupBy;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAggregators()
+    {
+        return $this->aggregators;
+    }
+
+    /**
+     * @param array $aggregator
+     */
+    public function setAggregators(array $aggregators)
+    {
+        $this->aggregators = $aggregators;
+    }
 }
diff --git a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
index c2e57246f83..9f7e7f07ab7 100644
--- a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
@@ -13,6 +13,7 @@
 
 use Mautic\ChannelBundle\Helper\ChannelListHelper;
 use Mautic\ReportBundle\Builder\MauticReportBuilder;
+use Mautic\ReportBundle\Helper\ReportHelper;
 use Mautic\ReportBundle\Model\ReportModel;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -57,6 +58,15 @@ class ReportBuilderEvent extends AbstractReportEvent
      */
     private $graphArray = [];
 
+    /**
+     * List of published array of lead fields.
+     *
+     * @var array
+     */
+    private $leadFields = [];
+
+    private $reportHelper;
+
     /**
      * ReportBuilderEvent constructor.
      *
@@ -64,11 +74,13 @@ class ReportBuilderEvent extends AbstractReportEvent
      * @param ChannelListHelper   $channelListHelper
      * @param string              $context
      */
-    public function __construct(TranslatorInterface $translator, ChannelListHelper $channelListHelper, $context = '')
+    public function __construct(TranslatorInterface $translator, ChannelListHelper $channelListHelper, $context, $leadFields, ReportHelper $reportHelper)
     {
         $this->context           = $context;
         $this->translator        = $translator;
         $this->channelListHelper = $channelListHelper;
+        $this->leadFields        = $leadFields;
+        $this->reportHelper      = $reportHelper;
     }
 
     /**
@@ -230,66 +242,15 @@ public function getStandardColumns($prefix, $removeColumns = [], $idLink = null)
      */
     public function getLeadColumns($prefix = 'l.')
     {
-        return [
-            $prefix.'id' => [
-                'label' => 'mautic.report.field.lead.id',
-                'type'  => 'int',
-                'alias' => 'contact_id',
-            ],
-            $prefix.'title' => [
-                'label' => 'mautic.report.field.lead.title',
-                'type'  => 'string',
-                'alias' => 'contact_title',
-            ],
-            $prefix.'firstname' => [
-                'label' => 'mautic.report.field.lead.firstname',
-                'type'  => 'string',
-            ],
-            $prefix.'lastname' => [
-                'label' => 'mautic.report.field.lead.lastname',
-                'type'  => 'string',
-            ],
-            $prefix.'email' => [
-                'label' => 'mautic.report.field.lead.email',
-                'type'  => 'string',
-            ],
-            $prefix.'company' => [
-                'label' => 'mautic.report.field.lead.company',
-                'type'  => 'string',
-            ],
-            $prefix.'position' => [
-                'label' => 'mautic.report.field.lead.position',
-                'type'  => 'string',
-            ],
-            $prefix.'phone' => [
-                'label' => 'mautic.report.field.lead.phone',
-                'type'  => 'string',
-            ],
-            $prefix.'mobile' => [
-                'label' => 'mautic.report.field.lead.mobile',
-                'type'  => 'string',
-            ],
-            $prefix.'address1' => [
-                'label' => 'mautic.report.field.lead.address1',
-                'type'  => 'string',
-            ],
-            $prefix.'address2' => [
-                'label' => 'mautic.report.field.lead.address2',
-                'type'  => 'string',
-            ],
-            $prefix.'country' => [
-                'label' => 'mautic.report.field.lead.country',
-                'type'  => 'string',
-            ],
-            $prefix.'city' => [
-                'label' => 'mautic.report.field.lead.city',
-                'type'  => 'string',
-            ],
-            $prefix.'state' => [
-                'label' => 'mautic.report.field.lead.zipcode',
-                'type'  => 'string',
-            ],
-        ];
+        foreach ($this->leadFields as $fieldArray) {
+            $fields[$prefix.$fieldArray['alias']] = [
+                'label' => $this->translator->trans('mautic.report.field.lead.label', ['%field%' => $fieldArray['label']]),
+                'type'  => $this->reportHelper->getReportBuilderFieldType($fieldArray['type']),
+                'alias' => $fieldArray['alias'],
+            ];
+        }
+
+        return $fields;
     }
 
     /**
@@ -332,6 +293,25 @@ public function getCategoryColumns($prefix = 'c.')
         ];
     }
 
+    /**
+     * Add campaign columns joined by the campaign lead event log table.
+     *
+     * @return array
+     */
+    public function getCampaignByChannelColumns()
+    {
+        return [
+            'clel.campaign_id' => [
+                'label' => 'mautic.campaign.campaign.id',
+                'type'  => 'string',
+            ],
+            'cmp.name' => [
+                'label' => 'mautic.campaign.campaign',
+                'type'  => 'string',
+            ],
+        ];
+    }
+
     public function getChannelColumns()
     {
         $channelColumns = [
diff --git a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
index 18c01155dd6..67debbdd80b 100644
--- a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
@@ -243,6 +243,35 @@ public function addIpAddressLeftJoin(QueryBuilder $queryBuilder, $prefix, $ipPre
         return $this;
     }
 
+    /**
+     * Add IP left join.
+     *
+     * @param QueryBuilder $queryBuilder
+     * @param              $prefix
+     * @param string       $ipPrefix
+     *
+     * @return $this
+     */
+    public function addCampaignByChannelJoin(QueryBuilder $queryBuilder, $prefix, $channel)
+    {
+        $options = $this->getOptions();
+        $cmpName = 'cmp.name';
+        $cmpId   = 'clel.campaign_id';
+
+        if ($this->hasColumn($cmpName)
+            || $this->hasFilter($cmpName)
+            || $this->hasColumn($cmpId)
+            || $this->hasFilter($cmpId)
+            || (!empty($options['order'][0]
+                    && ($options['order'][0] === $cmpName
+                        || $options['order'][0] === $cmpId)))) {
+            $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', 'clel', $prefix.'.id = clel.channel_id AND clel.channel="'.$channel.'"')
+                    ->leftJoin('clel', MAUTIC_TABLE_PREFIX.'campaigns', 'cmp', 'cmp.id = clel.campaign_id');
+        }
+
+        return $this;
+    }
+
     /**
      * Join channel columns.
      *
@@ -380,6 +409,21 @@ public function hasFilter($column)
         return isset($sorted[$column]);
     }
 
+    /**
+     * Check if the report has a groupBy columns selected.
+     *
+     *
+     * @return bool
+     */
+    public function hasGroupBy()
+    {
+        if (!empty($this->getReport()->getGroupBy())) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * @return string
      */
diff --git a/app/bundles/ReportBundle/Form/Type/AggregatorType.php b/app/bundles/ReportBundle/Form/Type/AggregatorType.php
new file mode 100644
index 00000000000..57c9c509d85
--- /dev/null
+++ b/app/bundles/ReportBundle/Form/Type/AggregatorType.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\ReportBundle\Form\Type;
+
+use Mautic\CoreBundle\Translation\Translator;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Class AggregatorType.
+ */
+class AggregatorType extends AbstractType
+{
+    private $translator;
+
+    public function __construct($translator)
+    {
+        $this->translator = $translator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        // function
+        $builder->add('function', 'choice', [
+            'choices' => [
+                'COUNT' => $this->translator->trans('mautic.report.report.label.aggregators.count'),
+                'AVG'   => $this->translator->trans('mautic.report.report.label.aggregators.avg'),
+                'SUM'   => $this->translator->trans('mautic.report.report.label.aggregators.sum'),
+                'MIN'   => $this->translator->trans('mautic.report.report.label.aggregators.min'),
+                'MAX'   => $this->translator->trans('mautic.report.report.label.aggregators.max'),
+            ],
+            'expanded'    => false,
+            'multiple'    => false,
+            'label'       => 'mautic.report.function',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
+                'class' => 'form-control not-chosen',
+            ],
+        ]);
+
+        // Build a list of columns
+        $builder->add('column', 'choice', [
+            'choices'     => $options['columnList'],
+            'expanded'    => false,
+            'multiple'    => false,
+            'label'       => 'mautic.report.report.label.filtercolumn',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
+                'class' => 'form-control filter-columns',
+            ],
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars = array_replace($view->vars, [
+            'columnList' => $options['columnList'],
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'aggregator';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'columnList' => [],
+        ]);
+    }
+}
diff --git a/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php b/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
index 9987cc0b425..67e4bfcf358 100644
--- a/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
+++ b/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
@@ -47,9 +47,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $args['choices_as_values'] = true;
                     $args['choices']           = [
                         [
-                            'mautic.core.form.no'    => false,
-                            'mautic.core.form.yes'   => true,
-                            'mautic.core.form.reset' => '',
+                            'mautic.core.form.no'      => false,
+                            'mautic.core.form.yes'     => true,
+                            'mautic.core.filter.clear' => '',
                         ],
                     ];
 
diff --git a/app/bundles/ReportBundle/Form/Type/ReportType.php b/app/bundles/ReportBundle/Form/Type/ReportType.php
index 7d544f6ca79..799a160c9da 100644
--- a/app/bundles/ReportBundle/Form/Type/ReportType.php
+++ b/app/bundles/ReportBundle/Form/Type/ReportType.php
@@ -133,6 +133,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
 
                 $columns           = $model->getColumnList($source);
+                $groupByColumns    = $model->getColumnList($source, true);
                 $filters           = $model->getFilterList($source);
                 $filterDefinitions = htmlspecialchars(json_encode($filters->definitions), ENT_QUOTES, 'UTF-8');
                 $operatorHtml      = htmlspecialchars(json_encode($filters->operatorHtml), ENT_QUOTES, 'UTF-8');
@@ -163,6 +164,25 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ]
                 );
 
+                // Build the columns selector
+                $form->add(
+                    'groupBy',
+                    'choice',
+                    [
+                        'choices'    => $groupByColumns->choices,
+                        'label'      => false,
+                        'label_attr' => ['class' => 'control-label'],
+                        'required'   => false,
+                        'multiple'   => true,
+                        'expanded'   => false,
+                        'attr'       => [
+                            'class'         => 'form-control multiselect',
+                            'data-sortable' => 'true',
+                            'onchange'      => 'Mautic.checkSelectedGroupBy()',
+                        ],
+                    ]
+                );
+
                 // Build the filter selector
                 $form->add(
                     'filters',
@@ -188,6 +208,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ]
                 );
 
+                // Build the filter selector
+                $form->add(
+                    'aggregators',
+                    'collection',
+                    [
+                        'type'    => 'aggregator',
+                        'label'   => false,
+                        'options' => [
+                            'columnList' => $groupByColumns->choices,
+                            'required'   => false,
+                        ],
+                        'allow_add'    => true,
+                        'allow_delete' => true,
+                        'prototype'    => true,
+                        'required'     => false,
+                    ]
+                );
+
                 $form->add(
                     'tableOrder',
                     'collection',
diff --git a/app/bundles/ReportBundle/Helper/ReportHelper.php b/app/bundles/ReportBundle/Helper/ReportHelper.php
new file mode 100644
index 00000000000..3bc44d1f3ce
--- /dev/null
+++ b/app/bundles/ReportBundle/Helper/ReportHelper.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * @copyright   2017 Mautic Contributors. All rights reserved
+ * @author      Mautic, Inc.
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\ReportBundle\Helper;
+
+use Symfony\Component\Templating\Helper\Helper;
+
+/**
+ * Class ReportHelper.
+ */
+class ReportHelper extends Helper
+{
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'report';
+    }
+
+    public function getReportBuilderFieldType($type)
+    {
+        switch ($type) {
+            case 'number': return 'int';
+                break;
+            case 'lookup':
+            case 'text':
+            case 'url':
+            case 'email':
+            case 'tel':
+            case 'region':
+            case 'country':
+            case 'locale': return 'string';
+                break;
+            case 'datetime': return 'datetime';
+                break;
+            case 'date': return 'date';
+                break;
+        }
+    }
+}
diff --git a/app/bundles/ReportBundle/Model/ReportModel.php b/app/bundles/ReportBundle/Model/ReportModel.php
index c4ab87eced1..758d36b230c 100644
--- a/app/bundles/ReportBundle/Model/ReportModel.php
+++ b/app/bundles/ReportBundle/Model/ReportModel.php
@@ -19,6 +19,7 @@
 use Mautic\CoreBundle\Helper\TemplatingHelper;
 use Mautic\CoreBundle\Model\FormModel;
 use Mautic\CoreBundle\Templating\Helper\FormatterHelper;
+use Mautic\LeadBundle\Model\FieldModel;
 use Mautic\ReportBundle\Builder\MauticReportBuilder;
 use Mautic\ReportBundle\Entity\Report;
 use Mautic\ReportBundle\Event\ReportBuilderEvent;
@@ -26,6 +27,7 @@
 use Mautic\ReportBundle\Event\ReportEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\Generator\ReportGenerator;
+use Mautic\ReportBundle\Helper\ReportHelper;
 use Mautic\ReportBundle\ReportEvents;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Response;
@@ -65,6 +67,16 @@ class ReportModel extends FormModel
      */
     protected $session;
 
+    /**
+     * @var FieldModel
+     */
+    protected $fieldModel;
+
+    /**
+     * @var ReportHelper
+     */
+    protected $reportHelper;
+
     /**
      * ReportModel constructor.
      *
@@ -77,12 +89,16 @@ public function __construct(
         CoreParametersHelper $coreParametersHelper,
         FormatterHelper $formatterHelper,
         TemplatingHelper $templatingHelper,
-        ChannelListHelper $channelListHelper
+        ChannelListHelper $channelListHelper,
+        FieldModel $fieldModel,
+        ReportHelper $reportHelper
     ) {
         $this->defaultPageLimit  = $coreParametersHelper->getParameter('default_pagelimit');
         $this->formatterHelper   = $formatterHelper;
         $this->templatingHelper  = $templatingHelper;
         $this->channelListHelper = $channelListHelper;
+        $this->fieldModel        = $fieldModel;
+        $this->reportHelper      = $reportHelper;
     }
 
     /**
@@ -209,7 +225,8 @@ public function buildAvailableReports($context)
             } else {
                 //build them
                 $eventContext = ($context == 'all') ? '' : $context;
-                $event        = new ReportBuilderEvent($this->translator, $this->channelListHelper, $eventContext);
+
+                $event = new ReportBuilderEvent($this->translator, $this->channelListHelper, $eventContext, $this->fieldModel->getPublishedFieldArrays(), $this->reportHelper);
                 $this->dispatcher->dispatch(ReportEvents::REPORT_ON_BUILD, $event);
 
                 $tables = $event->getTables();
@@ -268,7 +285,7 @@ public function getGraphData($context = 'all')
      *
      * @return \stdClass ['choices' => [], 'choiceHtml' => '', definitions => []]
      */
-    public function getColumnList($context)
+    public function getColumnList($context, $isGroupBy = false)
     {
         $tableData           = $this->getTableData($context);
         $columns             = isset($tableData['columns']) ? $tableData['columns'] : [];
@@ -278,6 +295,9 @@ public function getColumnList($context)
         $return->definitions = [];
 
         foreach ($columns as $column => $data) {
+            if ($isGroupBy && ($column == 'unsubscribed' || $column == 'unsubscribed_ratio' || $column == 'unique_ratio')) {
+                continue;
+            }
             if (isset($data['label'])) {
                 $return->choiceHtml .= "<option value=\"$column\">{$data['label']}</option>\n";
                 $return->choices[$column]     = $data['label'];
@@ -363,7 +383,7 @@ public function getGraphList($context = 'all')
      *
      * @throws \Exception
      */
-    public function exportResults($format, $report, $reportData)
+    public function exportResults($format, $report, $reportData, $handle = null, $page = null)
     {
         $formatter = $this->formatterHelper;
         $date      = (new DateTimeHelper())->toLocalString();
@@ -371,46 +391,28 @@ public function exportResults($format, $report, $reportData)
 
         switch ($format) {
             case 'csv':
-                $response = new StreamedResponse(
-                    function () use ($reportData, $report, $formatter) {
-                        $handle = fopen('php://output', 'r+');
-                        $header = [];
-
-                        //build the data rows
-                        foreach ($reportData['data'] as $count => $data) {
-                            $row = [];
-                            foreach ($data as $k => $v) {
-                                if ($count === 0) {
-                                    //set the header
-                                    $header[] = $k;
-                                }
-
-                                $row[] = $formatter->_($v, $reportData['columns'][$reportData['dataColumns'][$k]]['type'], true);
-                            }
-
-                            if ($count === 0) {
-                                //write the row
-                                fputcsv($handle, $header);
-                            }
-
-                            fputcsv($handle, $row);
-
-                            //free memory
-                            unset($row, $reportData['data'][$count]);
+                //build the data rows
+                if (is_null($handle)) {
+                    $response = new StreamedResponse(
+                        function () use ($reportData, $formatter) {
+                            $handle = fopen('php://output', 'r+');
+                            $this->exportCSV($formatter, $reportData, $handle, 0);
+                            fclose($handle);
                         }
+                    );
+                    $response->headers->set('Content-Type', 'application/force-download');
+                    $response->headers->set('Content-Type', 'application/octet-stream');
+                    $response->headers->set('Content-Disposition', 'attachment; filename="'.$name.'.csv"');
+                    $response->headers->set('Expires', 0);
+                    $response->headers->set('Cache-Control', 'must-revalidate');
+                    $response->headers->set('Pragma', 'public');
 
-                        fclose($handle);
-                    }
-                );
-
-                $response->headers->set('Content-Type', 'application/force-download');
-                $response->headers->set('Content-Type', 'application/octet-stream');
-                $response->headers->set('Content-Disposition', 'attachment; filename="'.$name.'.csv"');
-                $response->headers->set('Expires', 0);
-                $response->headers->set('Cache-Control', 'must-revalidate');
-                $response->headers->set('Pragma', 'public');
+                    return $response;
+                } else {
+                    $this->exportCSV($formatter, $reportData, $handle, $page);
 
-                return $response;
+                    return;
+                }
             case 'html':
                 $content = $this->templatingHelper->getTemplating()->renderResponse(
                     'MauticReportBundle:Report:export.html.php',
@@ -426,6 +428,7 @@ function () use ($reportData, $report, $formatter) {
                 )->getContent();
 
                 return new Response($content);
+
             case 'xlsx':
                 if (class_exists('PHPExcel')) {
                     $response = new StreamedResponse(
@@ -447,14 +450,13 @@ function () use ($formatter, $reportData, $report, $name) {
                                     $row[] = $formatter->_($v, $reportData['columns'][$reportData['dataColumns'][$k]]['type'], true);
                                 }
 
-                                //write the row
                                 if ($count === 0) {
+                                    //write the column names row
                                     $objPHPExcel->getActiveSheet()->fromArray($header, null, 'A1');
-                                } else {
-                                    $rowCount = $count + 1;
-                                    $objPHPExcel->getActiveSheet()->fromArray($row, null, "A{$rowCount}");
                                 }
-
+                                //write the row
+                                $rowCount = $count + 2;
+                                $objPHPExcel->getActiveSheet()->fromArray($row, null, "A{$rowCount}");
                                 //free memory
                                 unset($row, $reportData['data'][$count]);
                             }
@@ -476,6 +478,7 @@ function () use ($formatter, $reportData, $report, $name) {
                     return $response;
                 }
                 throw new \Exception('PHPExcel is required to export to Excel spreadsheets');
+
             default:
                 return new Response();
         }
@@ -533,6 +536,11 @@ public function getReportData($entity, $formFactory = null, $options = [])
         // Prepare the query builder
         $tableDetails = $this->getTableData($entity->getSource());
 
+        $aggregatorColumns = ($aggregators = $entity->getAggregators()) ? $aggregators : [];
+
+        foreach ($aggregatorColumns as $aggregatorColumn) {
+            $selectedColumns[] = $aggregatorColumn['column'];
+        }
         // Build a reference for column to data column (without table prefix)
         $dataColumns = [];
         foreach ($tableDetails['columns'] as $dbColumn => &$columnData) {
@@ -602,9 +610,13 @@ public function getReportData($entity, $formFactory = null, $options = [])
         }
 
         if (empty($options['ignoreTableData']) && !empty($selectedColumns)) {
-            if ($paginate) {
+            if ($paginate && !$entity->getGroupBy()) {
                 // Build the options array to pass into the query
                 $limit = $this->session->get('mautic.report.'.$entity->getId().'.limit', $this->defaultPageLimit);
+                if (!empty($options['limit'])) {
+                    $limit      = $options['limit'];
+                    $reportPage = $options['page'];
+                }
                 $start = ($reportPage === 1) ? 0 : (($reportPage - 1) * $limit);
                 if ($start < 0) {
                     $start = 0;
@@ -641,7 +653,7 @@ public function getReportData($entity, $formFactory = null, $options = [])
                 $queryTime .= 'ms';
             }
 
-            if (!$paginate) {
+            if (!$paginate || $entity->getGroupBy()) {
                 $totalResults = count($data);
             }
 
@@ -714,4 +726,25 @@ private function getOperatorOptions(array $data)
 
         return $options;
     }
+
+    private function exportCSV($formatter, $reportData, $handle, $page)
+    {
+        foreach ($reportData['data'] as $count => $data) {
+            $row = [];
+            foreach ($data as $k => $v) {
+                if ($count == 0) {
+                    //set the header
+                    $header[] = $k;
+                }
+
+                $row[] = $formatter->_($v, $reportData['columns'][$reportData['dataColumns'][$k]]['type'], true);
+            }
+
+            if ($page === 1 && $count === 0) {
+                fputcsv($handle, $header);
+            }
+            fputcsv($handle, $row);
+            unset($row, $reportData['data'][$count]);
+        }
+    }
 }
diff --git a/app/bundles/ReportBundle/Translations/en_US/messages.ini b/app/bundles/ReportBundle/Translations/en_US/messages.ini
index b9af0b5d421..9eb6c5b3ef8 100644
--- a/app/bundles/ReportBundle/Translations/en_US/messages.ini
+++ b/app/bundles/ReportBundle/Translations/en_US/messages.ini
@@ -5,6 +5,7 @@ mautic.report.field.category_name="Category name"
 mautic.report.field.date_added="Date created"
 mautic.report.field.date_modified="Date last modified"
 mautic.report.field.is_published="Is published"
+mautic.report.field.lead.label="Contact %field%"
 mautic.report.field.lead.address1="Contact address 1"
 mautic.report.field.lead.address2="Contact address 2"
 mautic.report.field.lead.city="Contact city"
@@ -69,4 +70,14 @@ mautic.report.campaign.channel.created_by="Channel Item: Created by"
 mautic.report.campaign.channel.created_by_user="Channel Item: Created by name"
 mautic.report.campaign.channel.date_added="Channel Item: Date added"
 mautic.report.campaign.channel.description="Channel Item: Description"
-mautic.report.campaign.channel.name="Channel Item: Name"
\ No newline at end of file
+mautic.report.campaign.channel.name="Channel Item: Name"
+mautic.report.form.groupby="Group by"
+mautic.core.calculated.fields="Calculated columns"
+mautic.report.report.label.function="Add function"
+mautic.report.report.label.aggregators.count="COUNT"
+mautic.report.report.label.aggregators.avg="AVG"
+mautic.report.report.label.aggregators.sum="SUM"
+mautic.report.report.label.aggregators.min="MIN"
+mautic.report.report.label.aggregators.max="MAX"
+mautic.report.function="Function"
+mautic.report.report.groupby.totals="Totals"
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_column_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_column_row.html.php
new file mode 100644
index 00000000000..0b4bfb59969
--- /dev/null
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_column_row.html.php
@@ -0,0 +1,8 @@
+<div class="choice-wrapper col-xs-6">
+<label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
+<select id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>">
+    <?php foreach ($form->vars['choices'] as $column):?>
+        <option value="<?php echo $column->value; ?>"<?php echo ($column->value == $form->vars['data']) ? ' selected' : ''; ?>><?php echo $column->label; ?></option>
+    <?php endforeach; ?>
+</select>
+</div>
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_function_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_function_row.html.php
new file mode 100644
index 00000000000..a79b8bef5c6
--- /dev/null
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_entry_function_row.html.php
@@ -0,0 +1,11 @@
+<div class="choice-wrapper col-xs-4">
+    <label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
+    <select id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>" onchange="Mautic.checkReportCondition('<?php echo $form->vars['id']; ?>')">
+        <?php foreach ($form->vars['choices'] as $function) {
+    ?>
+            <option value="<?php echo $function->value; ?>"<?php echo ($function->value == $form->vars['data']) ? ' selected' : '' ?>><?php echo $function->label; ?></option>
+            <?php
+
+} ?>
+    </select>
+</div>
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_row.html.php
new file mode 100644
index 00000000000..436d9233d24
--- /dev/null
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_aggregators_row.html.php
@@ -0,0 +1,13 @@
+<?php
+$hasErrors     = count($form->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
+?>
+<div id="aggregatorsContainer" class="row">
+    <div class="form-group col-md-12<?php echo $feedbackClass; ?>">
+        <?php echo $view['form']->widget($form) ?>
+        <?php echo $view['form']->errors($form) ?>
+    </div>
+    <div class="col-xs-12">
+        <button id="aggregators-button" disabled type="button" class="btn btn-primary" onclick="Mautic.addReportRow('report_aggregators');"><?php echo $view['translator']->trans('mautic.report.report.label.function'); ?></button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/aggregator_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/aggregator_row.html.php
new file mode 100644
index 00000000000..4ca591a6a7c
--- /dev/null
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/aggregator_row.html.php
@@ -0,0 +1,10 @@
+<?php
+$labelClass = (empty($form->vars['label_attr']['class'])) ? 'control-label' : $form->vars['label_attr']['class'];
+?>
+<div id="<?php echo $form->vars['id']; ?>_container" class="row mb-sm">
+    <?php echo $view['form']->row($form->vars['form']->children['function']); ?>
+    <?php echo $view['form']->row($form->vars['form']->children['column']); ?>
+    <div class="col-xs-1 mt-lg">
+        <button type="button" class="btn btn-danger" onclick="Mautic.removeReportRow('<?php echo $form->vars['id']; ?>_container');" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.report.report.label.removefilter'); ?>"><i class="fa fa-minus-square-o"></i></button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/Report/details_data.html.php b/app/bundles/ReportBundle/Views/Report/details_data.html.php
index 2365e07135e..3f1ec0d26f2 100644
--- a/app/bundles/ReportBundle/Views/Report/details_data.html.php
+++ b/app/bundles/ReportBundle/Views/Report/details_data.html.php
@@ -12,13 +12,33 @@
     $view->extend('MauticReportBundle:Report:details.html.php');
 }
 
-$dataCount   = count($data);
-$columnOrder = $report->getColumns();
-$graphOrder  = $report->getGraphs();
-$startCount  = ($dataCount > $limit) ? ($reportPage * $limit) - ($dataCount - 1) : 1;
+$dataCount       = count($data);
+$columnOrder     = $report->getColumns();
+$graphOrder      = $report->getGraphs();
+$aggregatorOrder = $report->getAggregators();
+$aggregatorCount = count($aggregatorOrder);
+$groupBy         = $report->getGroupBy();
+$groupByCount    = count($groupBy);
+$startCount      = ($totalResults > $limit) ? ($reportPage * $limit) - $limit + 1 : 1;
+function getTotal($a, $f, $t, $allrows, $ac)
+{
+    switch ($f) {
+        case 'COUNT':
+        case 'SUM':
+            return (int) $t + (int) $a;
+        case 'AVG':
+            return ($ac == $allrows) ? round(((int) $t + (int) $a) / (int) $allrows, 2) : (int) $t + (int) $a;
+        case 'MAX':
+            return ((int) $a >= (int) $t) ? (int) $a : (int) $t;
+        case 'MIN':
+            return ((int) $a <= (int) $t) ? (int) $a : (int) $t;
+        default:
+            return (int) $t;
+    }
+}
 ?>
 
-<?php if (!empty($columnOrder)): ?>
+<?php if (!empty($columnOrder) || !empty($aggregatorOrder)): ?>
 <!-- table section -->
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <div class="page-list">
@@ -27,6 +47,7 @@
                 <thead>
                 <tr>
                     <th class="col-report-count"></th>
+
                     <?php foreach ($columnOrder as $key): ?>
                         <?php
                         if (isset($columns[$key])):
@@ -43,18 +64,40 @@
                         endif;
                         ?>
                     <?php endforeach; ?>
+                    <?php
+                    if ($aggregatorCount) :
+                        $index = 0;
+                        foreach ($aggregatorOrder as $aggregator): ?>
+                            <?php
+                            $columnName = isset($columns[$aggregator['column']]['alias']) ? $columns[$aggregator['column']]['label'] : '';
+                            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
+                                'sessionVar' => 'report.'.$report->getId(),
+                                'orderBy'    => $aggregator['function'],
+                                'text'       => $aggregator['function'].' '.$columnName,
+                                'dataToggle' => '',
+                                'target'     => '.report-content',
+                            ]);
+                            ?>
+                            <?php
+                            $total[$index] = 0;
+                            ++$index;
+                        endforeach;
+                    endif;
+                    ?>
                 </tr>
                 </thead>
                 <tbody>
-                <?php if ($dataCount): ?>
+                <?php if ($dataCount):
+                    $avgCounter = 0;
+                    ?>
                     <?php foreach ($data as $row): ?>
                         <tr>
                             <td><?php echo $startCount; ?></td>
                             <?php foreach ($columnOrder as $key): ?>
                                 <?php if (isset($columns[$key])): ?>
-                                <td>
-                                    <?php $closeLink = false; ?>
-                                    <?php if (isset($columns[$key]['link']) && !empty($row[$columns[$key]['alias']])): ?>
+                                    <td>
+                                        <?php $closeLink = false; ?>
+                                        <?php if (isset($columns[$key]['link']) && !empty($row[$columns[$key]['alias']])): ?>
                                     <?php $closeLink = true;
                                     if (array_key_exists('comp.id', $columns)) {
                                         $objectAction = 'edit';
@@ -62,13 +105,32 @@
                                         $objectAction = 'view';
                                     }
                                     ?>
-                                    <a href="<?php echo $view['router']->path($columns[$key]['link'], ['objectAction' => $objectAction, 'objectId' => $row[$columns[$key]['alias']]]); ?>" class="label label-success">
-                                    <?php endif; ?>
-                                    <?php echo $view['formatter']->_($row[$columns[$key]['alias']], $columns[$key]['type']); ?>
-                                    <?php if ($closeLink): ?></a><?php endif; ?>
-                                </td>
+                                        <a href="<?php echo $view['router']->path($columns[$key]['link'], ['objectAction' => $objectAction, 'objectId' => $row[$columns[$key]['alias']]]); ?>" class="label label-success">
+                                            <?php endif; ?>
+                                            <?php echo $view['formatter']->_($row[$columns[$key]['alias']], $columns[$key]['type']); ?>
+                                            <?php if ($closeLink): ?></a><?php endif; ?>
+                                    </td>
                                 <?php endif; ?>
                             <?php endforeach; ?>
+                            <?php
+                            if ($aggregatorCount) :
+                                $index = 0;
+                                ++$avgCounter;
+                                foreach ($aggregatorOrder as $aggregator): ?>
+                                        <td>
+                                            <?php
+                                                if (isset($row[$aggregator['function'].' '.$aggregator['column']])) {
+                                                    echo $view['formatter']->_($row[$aggregator['function'].' '.$aggregator['column']], 'text');
+                                                    $total[$index] = getTotal($row[$aggregator['function'].' '.$aggregator['column']], $aggregator['function'], (isset($total[$index])) ? $total[$index] : 0, $dataCount, $avgCounter);
+                                                }
+                                            ?>
+                                        </td>
+                            <?php
+                                ++$index;
+                                endforeach;
+                            endif;
+                            ?>
+
                         </tr>
                         <?php ++$startCount; ?>
                     <?php endforeach; ?>
@@ -80,6 +142,27 @@
                         <?php endforeach; ?>
                     </tr>
                 <?php endif; ?>
+                <tr class="cm-strong">
+                <td><?php echo $view['translator']->trans('mautic.report.report.groupby.totals'); ?></td>
+                <?php
+                $index = 0;
+                foreach ($columnOrder as $key): ?>
+                    <td>&nbsp;</td>
+                <?php endforeach;
+                if ($aggregatorCount) :
+                    foreach ($aggregatorOrder as $aggregator): ?>
+                        <td>
+                            <?php
+                            if (isset($total[$index])) :
+                                echo $view['formatter']->_($total[$index], 'text');
+                            endif;
+                            ?>
+
+                        </td>
+                        <?php
+                        ++$index;
+                    endforeach;
+                endif; ?>
                 </tbody>
             </table>
         </div>
diff --git a/app/bundles/ReportBundle/Views/Report/form.html.php b/app/bundles/ReportBundle/Views/Report/form.html.php
index f2fee786354..79aa977ee72 100644
--- a/app/bundles/ReportBundle/Views/Report/form.html.php
+++ b/app/bundles/ReportBundle/Views/Report/form.html.php
@@ -34,9 +34,7 @@
                     <li class="">
                         <a href="#data-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.report.tab.data'); ?></a>
                     </li>
-                    <li class="<?php if (!$showGraphTab) {
-    echo 'hide';
-} ?>" id="graphs-tab">
+                    <li class="<?php if (!$showGraphTab): echo 'hide'; endif; ?>" id="graphs-tab">
                         <a href="#graphs-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.report.tab.graphs'); ?></a>
                     </li>
                 </ul>
@@ -74,7 +72,7 @@
                                 </div>
                             </div>
                             <div class="col-md-6">
-                                <div class="pa-md">
+                                <div class="ml-md">
                                     <h4><strong><?php echo $view['translator']->trans('mautic.core.order'); ?></strong></h4>
                                     <?php echo $view['form']->row($form['tableOrder']); ?>
                                 </div>
@@ -93,11 +91,22 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="pa-md">
+                                    <h4><strong><?php echo $view['translator']->trans('mautic.report.form.groupby'); ?></strong></h4>
+                                    <?php echo $view['form']->row($form['groupBy']); ?>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="pa-md">
+                                    <h4><strong><?php echo $view['translator']->trans('mautic.core.calculated.fields'); ?></strong></h4>
+                                    <?php echo $view['form']->row($form['aggregators']); ?>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-
-                    <div class="tab-pane fade bdr-w-0<?php if (!$showGraphTab) {
-    echo 'hide';
-} ?>" id="graphs-container">
+                    <div class="tab-pane fade bdr-w-0<?php if (!$showGraphTab): echo 'hide'; endif; ?>" id="graphs-container">
                         <div class="row">
                             <div class="col-md-6">
                                 <div class="pa-md">
diff --git a/app/bundles/SmsBundle/Api/TwilioApi.php b/app/bundles/SmsBundle/Api/TwilioApi.php
index b23aa58a76d..513746cb303 100644
--- a/app/bundles/SmsBundle/Api/TwilioApi.php
+++ b/app/bundles/SmsBundle/Api/TwilioApi.php
@@ -16,6 +16,7 @@
 use libphonenumber\PhoneNumberUtil;
 use Mautic\CoreBundle\Helper\PhoneNumberHelper;
 use Mautic\PageBundle\Model\TrackableModel;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Monolog\Logger;
 
 class TwilioApi extends AbstractSmsApi
@@ -39,18 +40,22 @@ class TwilioApi extends AbstractSmsApi
      * TwilioApi constructor.
      *
      * @param TrackableModel    $pageTrackableModel
-     * @param \Services_Twilio  $client
      * @param PhoneNumberHelper $phoneNumberHelper
-     * @param                   $sendingPhoneNumber
+     * @param IntegrationHelper $integrationHelper
      * @param Logger            $logger
      */
-    public function __construct(TrackableModel $pageTrackableModel, \Services_Twilio $client, PhoneNumberHelper $phoneNumberHelper, $sendingPhoneNumber, Logger $logger)
+    public function __construct(TrackableModel $pageTrackableModel, PhoneNumberHelper $phoneNumberHelper, IntegrationHelper $integrationHelper, Logger $logger)
     {
-        $this->client = $client;
         $this->logger = $logger;
 
-        if ($sendingPhoneNumber) {
-            $this->sendingPhoneNumber = $phoneNumberHelper->format($sendingPhoneNumber);
+        $integration = $integrationHelper->getIntegrationObject('Twilio');
+
+        if ($integration && $integration->getIntegrationSettings()->getIsPublished()) {
+            $this->sendingPhoneNumber = $integration->getIntegrationSettings()->getFeatureSettings()['sending_phone_number'];
+
+            $keys = $integration->getDecryptedApiKeys();
+
+            $this->client = new \Services_Twilio($keys['username'], $keys['password']);
         }
 
         parent::__construct($pageTrackableModel);
diff --git a/app/bundles/SmsBundle/Assets/img/Twilio.png b/app/bundles/SmsBundle/Assets/img/Twilio.png
new file mode 100644
index 00000000000..96bdf83a55f
Binary files /dev/null and b/app/bundles/SmsBundle/Assets/img/Twilio.png differ
diff --git a/app/bundles/SmsBundle/Config/config.php b/app/bundles/SmsBundle/Config/config.php
index 13ed1e8884e..61e7ee60c86 100644
--- a/app/bundles/SmsBundle/Config/config.php
+++ b/app/bundles/SmsBundle/Config/config.php
@@ -15,13 +15,10 @@
             'mautic.sms.campaignbundle.subscriber' => [
                 'class'     => 'Mautic\SmsBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
-                    'mautic.helper.core_parameters',
+                    'mautic.helper.integration',
                     'mautic.sms.model.sms',
                 ],
             ],
-            'mautic.sms.configbundle.subscriber' => [
-                'class' => 'Mautic\SmsBundle\EventListener\ConfigSubscriber',
-            ],
             'mautic.sms.smsbundle.subscriber' => [
                 'class'     => 'Mautic\SmsBundle\EventListener\SmsSubscriber',
                 'arguments' => [
@@ -32,7 +29,10 @@
                 ],
             ],
             'mautic.sms.channel.subscriber' => [
-                'class' => \Mautic\SmsBundle\EventListener\ChannelSubscriber::class,
+                'class'     => \Mautic\SmsBundle\EventListener\ChannelSubscriber::class,
+                'arguments' => [
+                    'mautic.helper.integration',
+                ],
             ],
             'mautic.sms.message_queue.subscriber' => [
                 'class'     => \Mautic\SmsBundle\EventListener\MessageQueueSubscriber::class,
@@ -75,7 +75,7 @@
                     'mautic.lead.model.lead',
                     'mautic.helper.phone_number',
                     'mautic.sms.model.sms',
-                    '%mautic.sms_frequency_number%',
+                    'mautic.helper.integration',
                 ],
                 'alias' => 'sms_helper',
             ],
@@ -85,21 +85,12 @@
                 'class'     => 'Mautic\SmsBundle\Api\TwilioApi',
                 'arguments' => [
                     'mautic.page.model.trackable',
-                    'mautic.twilio.service',
                     'mautic.helper.phone_number',
-                    '%mautic.sms_sending_phone_number%',
+                    'mautic.helper.integration',
                     'monolog.logger.mautic',
                 ],
                 'alias' => 'sms_api',
             ],
-            'mautic.twilio.service' => [
-                'class'     => 'Services_Twilio',
-                'arguments' => [
-                    '%mautic.sms_username%',
-                    '%mautic.sms_password%',
-                ],
-                'alias' => 'twilio_service',
-            ],
         ],
         'models' => [
             'mautic.sms.model.sms' => [
@@ -151,8 +142,10 @@
                     'access' => ['sms:smses:viewown', 'sms:smses:viewother'],
                     'parent' => 'mautic.core.channels',
                     'checks' => [
-                        'parameters' => [
-                            'sms_enabled' => true,
+                        'integration' => [
+                            'Twilio' => [
+                                'enabled' => true,
+                            ],
                         ],
                     ],
                     'priority' => 70,
diff --git a/app/bundles/SmsBundle/Controller/SmsController.php b/app/bundles/SmsBundle/Controller/SmsController.php
index db00c20e78c..1f30b60b570 100644
--- a/app/bundles/SmsBundle/Controller/SmsController.php
+++ b/app/bundles/SmsBundle/Controller/SmsController.php
@@ -58,15 +58,6 @@ public function indexAction($page = 1)
 
         $session = $this->get('session');
 
-        $listFilters = [
-            'filters' => [
-                'multiple' => true,
-            ],
-        ];
-
-        // Reset available groups
-        $listFilters['filters']['groups'] = [];
-
         //set limits
         $limit = $session->get('mautic.sms.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
         $start = ($page === 1) ? 0 : (($page - 1) * $limit);
@@ -75,90 +66,17 @@ public function indexAction($page = 1)
         }
 
         $search = $this->request->get('search', $session->get('mautic.sms.filter', ''));
-        $session->set('mautic.email.filter', $search);
+        $session->set('mautic.sms.filter', $search);
 
         $filter = ['string' => $search];
 
         if (!$permissions['sms:smses:viewother']) {
             $filter['force'][] =
-                ['column' => 'e.createdBy', 'expr' => 'eq', 'value' => $this->user->getId()];
-        }
-
-        //retrieve a list of categories
-        $listFilters['filters']['groups']['mautic.core.filter.categories'] = [
-            'options' => $this->getModel('category')->getLookupResults('email', '', 0),
-            'prefix'  => 'category',
-        ];
-
-        //retrieve a list of Lead Lists
-        $listFilters['filters']['groups']['mautic.core.filter.lists'] = [
-            'options' => $this->getModel('lead.list')->getUserLists(),
-            'prefix'  => 'list',
-        ];
-
-        //retrieve a list of themes
-        $listFilters['filters']['groups']['mautic.core.filter.themes'] = [
-            'options' => $this->factory->getInstalledThemes('email'),
-            'prefix'  => 'theme',
-        ];
-
-        $currentFilters = $session->get('mautic.sms.list_filters', []);
-        $updatedFilters = $this->request->get('filters', false);
-
-        if ($updatedFilters) {
-            // Filters have been updated
-
-            // Parse the selected values
-            $newFilters     = [];
-            $updatedFilters = json_decode($updatedFilters, true);
-
-            if ($updatedFilters) {
-                foreach ($updatedFilters as $updatedFilter) {
-                    list($clmn, $fltr) = explode(':', $updatedFilter);
-
-                    $newFilters[$clmn][] = $fltr;
-                }
-
-                $currentFilters = $newFilters;
-            } else {
-                $currentFilters = [];
-            }
-        }
-        $session->set('mautic.sms.list_filters', $currentFilters);
-
-        if (!empty($currentFilters)) {
-            $listIds = $catIds = [];
-            foreach ($currentFilters as $type => $typeFilters) {
-                switch ($type) {
-                    case 'list':
-                        $key = 'lists';
-                        break;
-                    case 'category':
-                        $key = 'categories';
-                        break;
-                }
-
-                $listFilters['filters']['groups']['mautic.core.filter.'.$key]['values'] = $typeFilters;
-
-                foreach ($typeFilters as $fltr) {
-                    switch ($type) {
-                        case 'list':
-                            $listIds[] = (int) $fltr;
-                            break;
-                        case 'category':
-                            $catIds[] = (int) $fltr;
-                            break;
-                    }
-                }
-            }
-
-            if (!empty($listIds)) {
-                $filter['force'][] = ['column' => 'l.id', 'expr' => 'in', 'value' => $listIds];
-            }
-
-            if (!empty($catIds)) {
-                $filter['force'][] = ['column' => 'c.id', 'expr' => 'in', 'value' => $catIds];
-            }
+                [
+                    'column' => 'e.createdBy',
+                    'expr'   => 'eq',
+                    'value'  => $this->user->getId(),
+                ];
         }
 
         $orderBy    = $session->get('mautic.sms.orderby', 'e.name');
@@ -196,10 +114,11 @@ public function indexAction($page = 1)
         }
         $session->set('mautic.sms.page', $page);
 
+        $integration = $this->get('mautic.helper.integration')->getIntegrationObject('Twilio');
+
         return $this->delegateView([
             'viewParameters' => [
                 'searchValue' => $search,
-                'filters'     => $listFilters,
                 'items'       => $smss,
                 'totalItems'  => $count,
                 'page'        => $page,
@@ -208,7 +127,7 @@ public function indexAction($page = 1)
                 'permissions' => $permissions,
                 'model'       => $model,
                 'security'    => $this->get('mautic.security'),
-                'configured'  => $this->coreParametersHelper->getParameter('sms_enabled'),
+                'configured'  => ($integration && $integration->getIntegrationSettings()->getIsPublished()),
             ],
             'contentTemplate' => 'MauticSmsBundle:Sms:list.html.php',
             'passthroughVars' => [
diff --git a/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php b/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
index 8fdd323d57d..bd3e1c6a8e9 100644
--- a/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
@@ -15,7 +15,7 @@
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Helper\CoreParametersHelper;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\SmsBundle\Model\SmsModel;
 use Mautic\SmsBundle\SmsEvents;
 
@@ -25,9 +25,9 @@
 class CampaignSubscriber extends CommonSubscriber
 {
     /**
-     * @var CoreParametersHelper
+     * @var IntegrationHelper
      */
-    protected $coreParametersHelper;
+    protected $integrationHelper;
 
     /**
      * @var SmsModel
@@ -37,15 +37,15 @@ class CampaignSubscriber extends CommonSubscriber
     /**
      * CampaignSubscriber constructor.
      *
-     * @param CoreParametersHelper $coreParametersHelper
-     * @param SmsModel             $smsModel
+     * @param IntegrationHelper $integrationHelper
+     * @param SmsModel          $smsModel
      */
     public function __construct(
-        CoreParametersHelper $coreParametersHelper,
+        IntegrationHelper $integrationHelper,
         SmsModel $smsModel
     ) {
-        $this->coreParametersHelper = $coreParametersHelper;
-        $this->smsModel             = $smsModel;
+        $this->integrationHelper = $integrationHelper;
+        $this->smsModel          = $smsModel;
     }
 
     /**
@@ -64,7 +64,9 @@ public static function getSubscribedEvents()
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
-        if ($this->coreParametersHelper->getParameter('sms_enabled')) {
+        $integration = $this->integrationHelper->getIntegrationObject('Twilio');
+
+        if ($integration && $integration->getIntegrationSettings()->getIsPublished()) {
             $event->addAction(
                 'sms.send_text_sms',
                 [
@@ -84,6 +86,8 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
 
     /**
      * @param CampaignExecutionEvent $event
+     *
+     * @return mixed
      */
     public function onCampaignTriggerAction(CampaignExecutionEvent $event)
     {
diff --git a/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php b/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php
index 3a5e4f1473d..5006b1ce4a0 100644
--- a/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/ChannelSubscriber.php
@@ -16,6 +16,7 @@
 use Mautic\ChannelBundle\Model\MessageModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\ReportBundle\Model\ReportModel;
 
 /**
@@ -23,6 +24,21 @@
  */
 class ChannelSubscriber extends CommonSubscriber
 {
+    /**
+     * @var IntegrationHelper
+     */
+    protected $integrationHelper;
+
+    /**
+     * ChannelSubscriber constructor.
+     *
+     * @param IntegrationHelper $integrationHelper
+     */
+    public function __construct(IntegrationHelper $integrationHelper)
+    {
+        $this->integrationHelper = $integrationHelper;
+    }
+
     /**
      * @return array
      */
@@ -38,7 +54,9 @@ public static function getSubscribedEvents()
      */
     public function onAddChannel(ChannelEvent $event)
     {
-        if (!empty($this->params['sms_enabled'])) {
+        $integration = $this->integrationHelper->getIntegrationObject('Twilio');
+
+        if ($integration && $integration->getIntegrationSettings()->getIsPublished()) {
             $event->addChannel(
                 'sms',
                 [
diff --git a/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php b/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php
deleted file mode 100644
index 5a403c374ad..00000000000
--- a/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * @copyright   2016 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\SmsBundle\EventListener;
-
-use Mautic\ConfigBundle\ConfigEvents;
-use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-
-/**
- * Class ConfigSubscriber.
- */
-class ConfigSubscriber extends CommonSubscriber
-{
-    /**
-     * @return array
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
-        ];
-    }
-
-    public function onConfigGenerate(ConfigBuilderEvent $event)
-    {
-        $event->addForm([
-            'bundle'     => 'SmsBundle',
-            'formAlias'  => 'smsconfig',
-            'formTheme'  => 'MauticSmsBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticSmsBundle'),
-        ]);
-    }
-}
diff --git a/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php b/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php
index 2c08423b9c0..11634feb03c 100644
--- a/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/MessageQueueSubscriber.php
@@ -18,7 +18,7 @@
 use Mautic\SmsBundle\Model\SmsModel;
 
 /**
- * Class CalendarSubscriber.
+ * Class MessageQueueSubscriber.
  */
 class MessageQueueSubscriber extends CommonSubscriber
 {
diff --git a/app/bundles/SmsBundle/Form/Type/ConfigType.php b/app/bundles/SmsBundle/Form/Type/ConfigType.php
deleted file mode 100644
index f2afb149de7..00000000000
--- a/app/bundles/SmsBundle/Form/Type/ConfigType.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * @copyright   2016 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\SmsBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Validator\Constraints\NotBlank;
-
-/**
- * Class ConfigType.
- */
-class ConfigType extends AbstractType
-{
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array                $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add(
-            'sms_enabled',
-            'yesno_button_group',
-            [
-                'label' => 'mautic.sms.config.form.sms.enabled',
-                'data'  => (bool) $options['data']['sms_enabled'],
-                'attr'  => [
-                    'tooltip' => 'mautic.sms.config.form.sms.enabled.tooltip',
-                ],
-            ]
-        );
-
-        $formModifier = function (FormEvent $event) {
-            $form = $event->getForm();
-            $data = $event->getData();
-
-            // Add required restraints if sms is enabled
-            $constraints = (empty($data['sms_enabled'])) ?
-                [] :
-                [
-                    new NotBlank(
-                        [
-                            'message' => 'mautic.core.value.required',
-                        ]
-                    ),
-                ];
-
-            $form->add(
-                'sms_username',
-                'text',
-                [
-                    'label' => 'mautic.sms.config.form.sms.username',
-                    'attr'  => [
-                        'tooltip'      => 'mautic.sms.config.form.sms.username.tooltip',
-                        'class'        => 'form-control',
-                        'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
-                    ],
-                    'constraints' => $constraints,
-                ]
-            );
-
-            $form->add(
-                'sms_password',
-                'text',
-                [
-                    'label' => 'mautic.sms.config.form.sms.password',
-                    'attr'  => [
-                        'tooltip'      => 'mautic.sms.config.form.sms.password.tooltip',
-                        'class'        => 'form-control',
-                        'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
-                    ],
-                    'constraints' => $constraints,
-                ]
-            );
-
-            $form->add(
-                'sms_sending_phone_number',
-                'text',
-                [
-                    'label' => 'mautic.sms.config.form.sms.sending_phone_number',
-                    'attr'  => [
-                        'tooltip'      => 'mautic.sms.config.form.sms.sending_phone_number.tooltip',
-                        'class'        => 'form-control',
-                        'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
-                    ],
-                    'constraints' => $constraints,
-                ]
-            );
-        };
-        $builder->add('sms_frequency_number', 'number',
-            [
-                'precision'  => 0,
-                'label'      => 'mautic.sms.list.frequency.number',
-                'label_attr' => ['class' => 'control-label'],
-                'required'   => false,
-                'attr'       => [
-                    'class' => 'form-control frequency',
-                ],
-            ]);
-        $builder->add('sms_frequency_time', 'choice',
-            [
-                'choices' => [
-                    'DAY'   => 'day',
-                    'WEEK'  => 'week',
-                    'MONTH' => 'month',
-                ],
-                'label'      => 'mautic.lead.list.frequency.times',
-                'label_attr' => ['class' => 'control-label'],
-                'required'   => false,
-                'multiple'   => false,
-                'attr'       => [
-                    'class' => 'form-control frequency',
-                ],
-            ]);
-
-        // Before submit
-        $builder->addEventListener(
-            FormEvents::PRE_SUBMIT,
-            $formModifier
-        );
-
-        // After submit
-        $builder->addEventListener(
-            FormEvents::PRE_SET_DATA,
-            $formModifier
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'smsconfig';
-    }
-}
diff --git a/app/bundles/SmsBundle/Helper/SmsHelper.php b/app/bundles/SmsBundle/Helper/SmsHelper.php
index 49c40cfa370..0bb4cf7d94a 100644
--- a/app/bundles/SmsBundle/Helper/SmsHelper.php
+++ b/app/bundles/SmsBundle/Helper/SmsHelper.php
@@ -15,8 +15,8 @@
 use libphonenumber\PhoneNumberFormat;
 use Mautic\CoreBundle\Helper\PhoneNumberHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\SmsBundle\Model\SmsModel;
 
 class SmsHelper
@@ -42,9 +42,9 @@ class SmsHelper
     protected $smsModel;
 
     /**
-     * @var int
+     * @var IntegrationHelper
      */
-    protected $smsFrequencyNumber;
+    protected $integrationHelper;
 
     /**
      * SmsHelper constructor.
@@ -53,15 +53,18 @@ class SmsHelper
      * @param LeadModel         $leadModel
      * @param PhoneNumberHelper $phoneNumberHelper
      * @param SmsModel          $smsModel
-     * @param int               $smsFrequencyNumber
+     * @param IntegrationHelper $integrationHelper
      */
-    public function __construct(EntityManager $em, LeadModel $leadModel, PhoneNumberHelper $phoneNumberHelper, SmsModel $smsModel, $smsFrequencyNumber)
+    public function __construct(EntityManager $em, LeadModel $leadModel, PhoneNumberHelper $phoneNumberHelper, SmsModel $smsModel, IntegrationHelper $integrationHelper)
     {
         $this->em                 = $em;
         $this->leadModel          = $leadModel;
         $this->phoneNumberHelper  = $phoneNumberHelper;
         $this->smsModel           = $smsModel;
-        $this->smsFrequencyNumber = $smsFrequencyNumber;
+        $this->integrationHelper  = $integrationHelper;
+        $integration              = $integrationHelper->getIntegrationObject('Twilio');
+        $settings                 = $integration->getIntegrationSettings()->getFeatureSettings();
+        $this->smsFrequencyNumber = $settings['frequency_number'];
     }
 
     public function unsubscribe($number)
diff --git a/app/bundles/SmsBundle/Integration/TwilioIntegration.php b/app/bundles/SmsBundle/Integration/TwilioIntegration.php
new file mode 100644
index 00000000000..d34b0b45a75
--- /dev/null
+++ b/app/bundles/SmsBundle/Integration/TwilioIntegration.php
@@ -0,0 +1,127 @@
+<?php
+
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\SmsBundle\Integration;
+
+use Mautic\PluginBundle\Integration\AbstractIntegration;
+
+/**
+ * Class TwilioIntegration.
+ */
+class TwilioIntegration extends AbstractIntegration
+{
+    /**
+     * @var bool
+     */
+    protected $coreIntegration = true;
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Twilio';
+    }
+
+    public function getIcon()
+    {
+        return 'app/bundles/SmsBundle/Assets/img/Twilio.png';
+    }
+
+    public function getSecretKeys()
+    {
+        return ['password'];
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getRequiredKeyFields()
+    {
+        return [
+            'username' => 'mautic.sms.config.form.sms.username',
+            'password' => 'mautic.sms.config.form.sms.password',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFormSettings()
+    {
+        return [
+            'requires_callback'      => false,
+            'requires_authorization' => false,
+        ];
+    }
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getAuthenticationType()
+    {
+        return 'none';
+    }
+
+    /**
+     * @param \Mautic\PluginBundle\Integration\Form|FormBuilder $builder
+     * @param array                                             $data
+     * @param string                                            $formArea
+     */
+    public function appendToForm(&$builder, $data, $formArea)
+    {
+        if ($formArea == 'features') {
+            $builder->add(
+                'sending_phone_number',
+                'text',
+                [
+                    'label'      => 'mautic.sms.config.form.sms.sending_phone_number',
+                    'label_attr' => ['class' => 'control-label'],
+                    'required'   => false,
+                    'attr'       => [
+                        'class' => 'form-control',
+                    ],
+                ]
+            );
+            $builder->add('frequency_number', 'number',
+                [
+                    'precision'  => 0,
+                    'label'      => 'mautic.sms.list.frequency.number',
+                    'label_attr' => ['class' => 'control-label'],
+                    'required'   => false,
+                    'attr'       => [
+                        'class' => 'form-control frequency',
+                    ],
+                ]);
+            $builder->add('frequency_time', 'choice',
+                [
+                    'choices' => [
+                        'DAY'   => 'day',
+                        'WEEK'  => 'week',
+                        'MONTH' => 'month',
+                    ],
+                    'label'      => 'mautic.lead.list.frequency.times',
+                    'label_attr' => ['class' => 'control-label'],
+                    'required'   => false,
+                    'multiple'   => false,
+                    'attr'       => [
+                        'class' => 'form-control frequency',
+                    ],
+                ]);
+        }
+    }
+}
diff --git a/app/bundles/SmsBundle/Translations/en_US/messages.ini b/app/bundles/SmsBundle/Translations/en_US/messages.ini
index a804c1e79bd..6f8b24e2698 100644
--- a/app/bundles/SmsBundle/Translations/en_US/messages.ini
+++ b/app/bundles/SmsBundle/Translations/en_US/messages.ini
@@ -19,12 +19,6 @@ mautic.sms.smses="Text Messages"
 mautic.sms.campaign.send_sms="Send Push Text Message"
 mautic.sms.campaign.send_sms.tooltip="Sends a push sms to the user."
 mautic.sms.choose.smss="Select a text message to send."
-mautic.sms.config.form.sms.app_id="Text Messages Provider App ID"
-mautic.sms.config.form.sms.app_id.tooltip="One Signal App ID"
-mautic.sms.config.form.sms.rest_api_key="Text Messages Provider API Key"
-mautic.sms.config.form.sms.rest_api_key.tooltip="One Signal Rest API Key"
-mautic.sms.config.form.sms.sms_safari_web_id="Text Messages Provider Safari Web ID"
-mautic.sms.config.form.sms.sms_safari_web_id.tooltip="One Signal Safari Web ID for your One Signal App"
 
 mautic.sms.form.action.sendsms.admin="Send sms to user"
 mautic.sms.form.action.sendsms.admin.descr="Send the selected sms to the selected user(s) upon form submission."
diff --git a/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php b/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php
deleted file mode 100644
index 3f6ea3f8690..00000000000
--- a/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * @copyright   2016 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-?>
-
-<div class="panel panel-primary">
-    <div class="panel-heading">
-        <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.config.tab.smsconfig'); ?></h3>
-    </div>
-    <div class="panel-body">
-        <?php foreach ($form->children as $key => $f): ?>
-        <?php if (in_array($key, ['sms_frequency_number', 'sms_frequency_time'])) {
-    continue;
-} ?>
-        <div class="row">
-            <div class="col-md-6">
-                <?php echo $view['form']->row($f); ?>
-            </div>
-        </div>
-        <?php endforeach; ?>
-    </div>
-</div>
-
-<div class="panel panel-primary">
-    <div class="panel-heading">
-        <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.config.tab.frequency_rules'); ?></h3>
-    </div>
-    <div class="panel-body">
-        <div class="row">
-            <div class="col-md-12">
-                <?php echo $view['form']->row($form->children['sms_frequency_number']); ?>
-            </div>
-            <div class="col-md-12">
-                <?php echo $view['form']->row($form->children['sms_frequency_time']); ?>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/app/bundles/UserBundle/Security/Provider/UserProvider.php b/app/bundles/UserBundle/Security/Provider/UserProvider.php
index 44663a4fb52..987617cd3b9 100644
--- a/app/bundles/UserBundle/Security/Provider/UserProvider.php
+++ b/app/bundles/UserBundle/Security/Provider/UserProvider.php
@@ -92,6 +92,8 @@ public function loadUserByUsername($username)
             ->select('u, r')
             ->leftJoin('u.role', 'r')
             ->where('u.username = :username OR u.email = :username')
+            ->andWhere('u.isPublished = :true')
+            ->setParameter('true', true, 'boolean')
             ->setParameter('username', $username);
 
         if (func_num_args() > 1 && $email = func_get_arg(1)) {
diff --git a/app/bundles/WebhookBundle/Config/config.php b/app/bundles/WebhookBundle/Config/config.php
index 56ed433c44a..896c912dab5 100644
--- a/app/bundles/WebhookBundle/Config/config.php
+++ b/app/bundles/WebhookBundle/Config/config.php
@@ -49,18 +49,6 @@
             ],
         ],
         'events' => [
-            'mautic.webhook.lead.subscriber' => [
-                'class' => 'Mautic\WebhookBundle\EventListener\LeadSubscriber',
-            ],
-            'mautic.webhook.form.subscriber' => [
-                'class' => 'Mautic\WebhookBundle\EventListener\FormSubscriber',
-            ],
-            'mautic.webhook.email.subscriber' => [
-                'class' => 'Mautic\WebhookBundle\EventListener\EmailSubscriber',
-            ],
-            'mautic.webhook.page.hit.subscriber' => [
-                'class' => 'Mautic\WebhookBundle\EventListener\PageSubscriber',
-            ],
             'mautic.webhook.config.subscriber' => [
                 'class' => 'Mautic\WebhookBundle\EventListener\ConfigSubscriber',
             ],
diff --git a/app/bundles/WebhookBundle/Entity/EventRepository.php b/app/bundles/WebhookBundle/Entity/EventRepository.php
index bd0837e7701..742daf646d6 100644
--- a/app/bundles/WebhookBundle/Entity/EventRepository.php
+++ b/app/bundles/WebhookBundle/Entity/EventRepository.php
@@ -16,11 +16,9 @@
 class EventRepository extends CommonRepository
 {
     /**
-     * Get a list of events with the webhook.
+     * @param $type
      *
-     * @param array $args
-     *
-     * @return Paginator
+     * @return array
      */
     public function getEntitiesByEventType($type)
     {
diff --git a/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php b/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php
deleted file mode 100644
index 4bdb2cc5b77..00000000000
--- a/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\WebhookBundle\EventListener;
-
-use Mautic\EmailBundle\EmailEvents;
-use Mautic\EmailBundle\Event\EmailOpenEvent;
-
-/**
- * Class EmailSubscriber.
- */
-class EmailSubscriber extends WebhookSubscriberBase
-{
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            EmailEvents::EMAIL_ON_OPEN => ['onEmailOpen', 0],
-        ];
-    }
-
-    public function onEmailOpen(EmailOpenEvent $event)
-    {
-        $types = [EmailEvents::EMAIL_ON_OPEN];
-
-        $groups = ['statDetails', 'leadList', 'emailDetails'];
-        $stat   = ($event->getStat());
-
-        $payload = [
-            'stat' => $stat,
-        ];
-
-        $webhooks = $this->getEventWebooksByType($types);
-        $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
-    }
-}
diff --git a/app/bundles/WebhookBundle/EventListener/FormSubscriber.php b/app/bundles/WebhookBundle/EventListener/FormSubscriber.php
deleted file mode 100644
index 77a57f5e00c..00000000000
--- a/app/bundles/WebhookBundle/EventListener/FormSubscriber.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\WebhookBundle\EventListener;
-
-use Mautic\FormBundle\Event\SubmissionEvent;
-use Mautic\FormBundle\FormEvents;
-
-/**
- * Class FormSubscriber.
- */
-class FormSubscriber extends WebhookSubscriberBase
-{
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            FormEvents::FORM_ON_SUBMIT => ['onFormSubmit', 0],
-        ];
-    }
-
-    /*
-     * Form submit event
-     *
-     * @param SubmissionEvent $event
-     */
-    public function onFormSubmit(SubmissionEvent $event)
-    {
-        $types = [FormEvents::FORM_ON_SUBMIT];
-
-        $groups = ['submissionDetails', 'ipAddress', 'leadList', 'pageList', 'formList'];
-
-        $form = $event->getSubmission();
-
-        $payload = [
-            'submission' => $form,
-        ];
-
-        $webhooks = $this->getEventWebooksByType($types);
-        $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
-    }
-}
diff --git a/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php b/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php
deleted file mode 100644
index 24bda43b727..00000000000
--- a/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\WebhookBundle\EventListener;
-
-use Mautic\LeadBundle\Event\LeadEvent;
-use Mautic\LeadBundle\Event\PointsChangeEvent;
-use Mautic\LeadBundle\LeadEvents;
-
-/**
- * Class LeadSubscriber.
- */
-class LeadSubscriber extends WebhookSubscriberBase
-{
-    /**
-     * @return array
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            LeadEvents::LEAD_POST_SAVE     => ['onLeadNewUpdate', 0],
-            LeadEvents::LEAD_POINTS_CHANGE => ['onLeadPointChange', 0],
-            LeadEvents::LEAD_POST_DELETE   => ['onLeadDelete', 0],
-            //LeadEvents::LEAD_LIST_BATCH_CHANGE  => array('onLeadEvent', 0),
-            //LeadEvents::LEAD_POST_MERGE         => array('onLeadEvent', 0),
-            //LeadEvents::LEAD_IDENTIFIED         => array('onLeadEvent', 0),
-            //LeadEvents::CURRENT_LEAD_CHANGED    => array('onLeadEvent', 0)
-        ];
-    }
-
-    /*
-     * Generic method to execute when a lead does something
-     */
-    public function onLeadNewUpdate(LeadEvent $event)
-    {
-        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
-
-        $entity = $event->getLead();
-
-        $payload = [
-            'lead' => $entity,
-        ];
-
-        // get the leads
-        if ($event->isNew()) {
-            // get our new lead webhook events first
-            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE.'_new');
-            $this->webhookModel->QueueWebhooks($webhookEvents, $payload, $serializerGroups, true);
-        }
-
-        // now deal with webhooks for the update event
-        if (!$event->isNew()) {
-            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE.'_update');
-            $this->webhookModel->QueueWebhooks($webhookEvents, $payload, $serializerGroups, true);
-        }
-    }
-
-    /*
-     * Method to execute when the lead point value changes.abstract
-     * Queues the event payload into the webhook queue so it can be processed
-     */
-    public function onLeadPointChange(PointsChangeEvent $event)
-    {
-        /** @var \Mautic\LeadBundle\Entity\Lead $lead */
-        $lead = $event->getLead();
-
-        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
-
-        $payload = [
-            'lead'   => $lead,
-            'points' => [
-                'old_points' => $event->getOldPoints(),
-                'new_points' => $event->getNewPoints(),
-            ],
-        ];
-
-        $types    = [LeadEvents::LEAD_POINTS_CHANGE];
-        $webhooks = $this->getEventWebooksByType($types);
-        $this->webhookModel->QueueWebhooks($webhooks, $payload, $serializerGroups, true);
-    }
-
-    /*
-     * Delete lead event
-     */
-    public function onLeadDelete(LeadEvent $event)
-    {
-        /** @var \Mautic\LeadBundle\Entity\Lead $lead */
-        $lead = $event->getLead();
-
-        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
-
-        $payload = [
-            'lead' => $lead,
-        ];
-
-        $types    = [LeadEvents::LEAD_POST_DELETE];
-        $webhooks = $this->getEventWebooksByType($types);
-        $this->webhookModel->QueueWebhooks($webhooks, $payload, $serializerGroups, true);
-    }
-}
diff --git a/app/bundles/WebhookBundle/EventListener/PageSubscriber.php b/app/bundles/WebhookBundle/EventListener/PageSubscriber.php
deleted file mode 100644
index 77ff15b3e78..00000000000
--- a/app/bundles/WebhookBundle/EventListener/PageSubscriber.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
-
-namespace Mautic\WebhookBundle\EventListener;
-
-use Mautic\PageBundle\Event\PageHitEvent;
-use Mautic\PageBundle\PageEvents;
-
-/**
- * Class EmailSubscriber.
- */
-class PageSubscriber extends WebhookSubscriberBase
-{
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            PageEvents::PAGE_ON_HIT => ['onPageHit', 0],
-        ];
-    }
-
-    public function onPageHit(PageHitEvent $event)
-    {
-        $types = [PageEvents::PAGE_ON_HIT];
-
-        $groups = ['hitDetails', 'emailDetails', 'pageList', 'leadList'];
-
-        $hit = $event->getHit();
-
-        $payload = [
-            'hit' => $hit,
-        ];
-
-        $webhooks = $this->getEventWebooksByType($types);
-        $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
-    }
-}
diff --git a/app/bundles/WebhookBundle/EventListener/WebhookModelTrait.php b/app/bundles/WebhookBundle/EventListener/WebhookModelTrait.php
new file mode 100644
index 00000000000..462d05fae06
--- /dev/null
+++ b/app/bundles/WebhookBundle/EventListener/WebhookModelTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\WebhookBundle\EventListener;
+
+use Mautic\WebhookBundle\Model\WebhookModel;
+
+/**
+ * Class WebhookModelTrait.
+ */
+trait WebhookModelTrait
+{
+    /**
+     * @var WebhookModel
+     */
+    protected $webhookModel;
+
+    /**
+     * @param WebhookModel $webhookModel
+     */
+    public function setWebhookModel(WebhookModel $webhookModel)
+    {
+        $this->webhookModel = $webhookModel;
+    }
+}
diff --git a/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php b/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
index f8142c34f2d..cdb9b347592 100644
--- a/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
+++ b/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
@@ -12,22 +12,20 @@
 namespace Mautic\WebhookBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\WebhookBundle\Model\WebhookModel;
 
 /**
  * Class WebhookSubscriberBase.
  */
 class WebhookSubscriberBase extends CommonSubscriber
 {
-    /** @var \Mautic\WebhookBundle\Model\WebhookModel $model */
-    protected $webhookModel;
+    use WebhookModelTrait;
 
     /**
-     * @param WebhookModel $webhookModel
+     * WebhookSubscriberBase constructor.
      */
-    public function setWebhookModel(WebhookModel $webhookModel)
+    public function __construct()
     {
-        $this->webhookModel = $webhookModel;
+        @trigger_error(self::class.' has been deprecated as of 2.7.1; use trait '.WebhookModelTrait::class.' instead', E_USER_DEPRECATED);
     }
 
     /**
@@ -39,8 +37,6 @@ public function setWebhookModel(WebhookModel $webhookModel)
      */
     public function getEventWebooksByType($type)
     {
-        $eventWebhooks = $this->webhookModel->getEventWebooksByType($type);
-
-        return $eventWebhooks;
+        return $this->webhookModel->getEventWebooksByType($type);
     }
 }
diff --git a/app/bundles/WebhookBundle/Model/WebhookModel.php b/app/bundles/WebhookBundle/Model/WebhookModel.php
index 7598a8da8e6..06eb8f2be76 100644
--- a/app/bundles/WebhookBundle/Model/WebhookModel.php
+++ b/app/bundles/WebhookBundle/Model/WebhookModel.php
@@ -144,12 +144,26 @@ public function getEventWebooksByType($type)
         return $results;
     }
 
+    /**
+     * @param $type
+     * @param $payload
+     * @param $groups
+     */
+    public function queueWebhooksByType($type, $payload, array $groups = [])
+    {
+        return $this->queueWebhooks(
+            $this->getEventWebooksByType($type),
+            $payload,
+            $groups
+        );
+    }
+
     /**
      * @param       $webhookEvents
      * @param       $payload
      * @param array $serializationGroups
      */
-    public function QueueWebhooks($webhookEvents, $payload, array $serializationGroups = [])
+    public function queueWebhooks($webhookEvents, $payload, array $serializationGroups = [])
     {
         if (!count($webhookEvents) || !is_array($webhookEvents)) {
             return;
diff --git a/app/config/config_prod.php b/app/config/config_prod.php
index 9d57037c29e..b651e891d44 100644
--- a/app/config/config_prod.php
+++ b/app/config/config_prod.php
@@ -60,6 +60,12 @@
     ],
 ]);
 
+//Twig Configuration
+$container->loadFromExtension('twig', [
+    'cache'       => '%mautic.tmp_path%/%kernel.environment%/twig',
+    'auto_reload' => true,
+]);
+
 // Allow overriding config without a requiring a full bundle or hacks
 if (file_exists(__DIR__.'/config_override.php')) {
     $loader->import('config_override.php');
diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/middlewares/VersionCheckMiddleware.php b/app/middlewares/VersionCheckMiddleware.php
index 6b96d96b68e..93f3d07d4c7 100644
--- a/app/middlewares/VersionCheckMiddleware.php
+++ b/app/middlewares/VersionCheckMiddleware.php
@@ -20,7 +20,7 @@ class VersionCheckMiddleware implements HttpKernelInterface, PrioritizedMiddlewa
     const PRIORITY = 10;
 
     const MAUTIC_MINIMUM_PHP = '5.6.19';
-    const MAUTIC_MAXIMUM_PHP = '7.1.999';
+    const MAUTIC_MAXIMUM_PHP = '7.0.999';
 
     /**
      * @var HttpKernelInterface
diff --git a/app/migrations/Version20170323111702.php b/app/migrations/Version20170323111702.php
new file mode 100644
index 00000000000..a298ee34b4d
--- /dev/null
+++ b/app/migrations/Version20170323111702.php
@@ -0,0 +1,267 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170323111702 extends AbstractMauticMigration
+{
+    /**
+     * Holds tweet table name with prefix.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * An array of tweets with md5(tweet_text) as the keys.
+     * Used to match duplicates.
+     *
+     * @var array
+     */
+    protected $tweetCache = [];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        parent::setContainer($container);
+
+        $this->tableName = sprintf('%s%s', $this->prefix, 'tweets');
+    }
+
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        if ($schema->hasTable($this->tableName)) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql("CREATE TABLE {$this->tableName} (id INT AUTO_INCREMENT NOT NULL, category_id INT DEFAULT NULL, page_id INT DEFAULT NULL, asset_id INT DEFAULT NULL, is_published TINYINT(1) NOT NULL, date_added DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime)', created_by INT DEFAULT NULL, created_by_user VARCHAR(255) DEFAULT NULL, date_modified DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime)', modified_by INT DEFAULT NULL, modified_by_user VARCHAR(255) DEFAULT NULL, checked_out DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime)', checked_out_by INT DEFAULT NULL, checked_out_by_user VARCHAR(255) DEFAULT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, media_id VARCHAR(255) DEFAULT NULL, media_path VARCHAR(255) DEFAULT NULL, text VARCHAR(255) NOT NULL, sent_count INT DEFAULT NULL, favorite_count INT DEFAULT NULL, retweet_count INT DEFAULT NULL, lang VARCHAR(255) DEFAULT NULL, INDEX tweet_text_index (text), INDEX favorite_count_index (favorite_count), INDEX sent_count_index (sent_count), INDEX retweet_count_index (retweet_count), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
+
+        $this->addSql("CREATE TABLE {$this->prefix}tweet_stats (id INT AUTO_INCREMENT NOT NULL, tweet_id INT DEFAULT NULL, lead_id INT DEFAULT NULL, twitter_tweet_id VARCHAR(255) DEFAULT NULL, handle VARCHAR(255) NOT NULL, date_sent DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime)', is_failed TINYINT(1) DEFAULT NULL, retry_count INT DEFAULT NULL, source VARCHAR(255) DEFAULT NULL, source_id INT DEFAULT NULL, favorite_count INT DEFAULT NULL, retweet_count INT DEFAULT NULL, response_details LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', INDEX stat_tweet_search (tweet_id, lead_id), INDEX stat_tweet_search2 (lead_id, tweet_id), INDEX stat_tweet_failed_search (is_failed), INDEX stat_tweet_source_search (source, source_id), INDEX favorite_count_index (favorite_count), INDEX retweet_count_index (retweet_count), INDEX tweet_date_sent (date_sent), INDEX twitter_tweet_id_index (twitter_tweet_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
+
+        $this->addSql("ALTER TABLE {$this->tableName} ADD CONSTRAINT ".$this->generatePropertyName('tweets', 'fk', ['category_id'])." FOREIGN KEY (category_id) REFERENCES {$this->prefix}categories (id) ON DELETE SET NULL");
+        $this->addSql("ALTER TABLE {$this->tableName} ADD CONSTRAINT ".$this->generatePropertyName('tweets', 'fk', ['page_id'])." FOREIGN KEY (page_id) REFERENCES {$this->prefix}pages (id) ON DELETE SET NULL");
+        $this->addSql("ALTER TABLE {$this->tableName} ADD CONSTRAINT ".$this->generatePropertyName('tweets', 'fk', ['asset_id'])." FOREIGN KEY (asset_id) REFERENCES {$this->prefix}assets (id) ON DELETE SET NULL");
+
+        $this->addSql("ALTER TABLE {$this->prefix}tweet_stats ADD CONSTRAINT ".$this->generatePropertyName('tweet_stats', 'fk', ['tweet_id'])." FOREIGN KEY (tweet_id) REFERENCES {$this->prefix}tweets (id) ON DELETE SET NULL");
+        $this->addSql("ALTER TABLE {$this->prefix}tweet_stats ADD CONSTRAINT ".$this->generatePropertyName('tweet_stats', 'fk', ['lead_id'])." FOREIGN KEY (lead_id) REFERENCES {$this->prefix}leads (id) ON DELETE SET NULL");
+
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('tweets', 'idx', ['category_id']).' ON '.$this->tableName.' (category_id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('tweets', 'idx', ['page_id']).' ON '.$this->tableName.' (page_id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('tweets', 'idx', ['asset_id']).' ON '.$this->tableName.' (asset_id)');
+    }
+
+    /**
+     * Create tweet entities from the channel properties.
+     *
+     * @param Schema $schema
+     */
+    public function postUp(Schema $schema)
+    {
+        $qb     = $this->connection->createQueryBuilder();
+        $logger = $this->container->get('monolog.logger.mautic');
+        $start  = 0;
+        $batch  = 500;
+
+        // Migrate tweets stored in Marketing Message params
+        $qb->select('mc.id, mc.properties, mc.message_id, m.is_published, m.date_added, m.created_by, m.created_by_user')
+            ->from($this->prefix.'message_channels', 'mc')
+            ->leftJoin('mc', $this->prefix.'messages', 'm', 'm.id = mc.message_id')
+            ->where('mc.channel = :tweet')
+            ->andWhere('mc.properties <> :emptyTweet')
+            ->andWhere('mc.properties <> :emptyProps')
+            ->setParameter('emptyTweet', '{"tweet_text":null,"asset_link":null,"page_link":null}')
+            ->setParameter('emptyProps', '[]')
+            ->setParameter('tweet', 'tweet')
+            ->setMaxResults($batch);
+
+        while ($results = $qb->execute()->fetchAll()) {
+
+            // Start a transaction
+            $this->connection->beginTransaction();
+
+            foreach ($results as $row) {
+                $row['properties']  = json_decode($row['properties'], true);
+                $row['description'] = 'Migrated from marketing message ('.$row['message_id'].') channel ('.$row['id'].')';
+                $tweetData          = $this->buildTweetData($row);
+                if (!$tweetId = $this->getIdFromCache($tweetData['text'])) {
+                    $this->connection->insert($this->tableName, $tweetData);
+
+                    $tweetId = $this->connection->lastInsertId();
+                    $this->addToCache($tweetData['text'], $tweetId);
+                }
+
+                $this->connection->update(
+                    $this->prefix.'message_channels',
+                    [
+                        'channel_id' => $tweetId,
+                    ],
+                    [
+                        'id' => $row['id'],
+                    ]
+                );
+            }
+
+            try {
+                $this->connection->commit();
+            } catch (\Exception $e) {
+                $this->connection->rollBack();
+
+                $logger->addError($e->getMessage(), ['exception' => $e]);
+            }
+
+            // Increase the start
+            $start += $batch;
+            $qb->setFirstResult($start);
+        }
+
+        // Migrate tweets stored in campaign event params
+        $qb    = $this->connection->createQueryBuilder();
+        $start = 0;
+
+        $qb->select('ce.id, ce.properties, ce.campaign_id, c.is_published, c.date_added, c.created_by, c.created_by_user')
+            ->from($this->prefix.'campaign_events', 'ce')
+            ->leftJoin('ce', $this->prefix.'campaigns', 'c', 'c.id = ce.campaign_id')
+            ->andWhere('ce.channel = :tweet')
+            ->setParameter('tweet', 'social.tweet')
+            ->setMaxResults($batch);
+
+        while ($results = $qb->execute()->fetchAll()) {
+
+            // Start a transaction
+            $this->connection->beginTransaction();
+
+            foreach ($results as $row) {
+                $row['properties']  = unserialize($row['properties']);
+                $row['description'] = 'Migrated from campaign ('.$row['campaign_id'].') event ('.$row['id'].')';
+                $tweetData          = $this->buildTweetData($row);
+
+                if (!$tweetId = $this->getIdFromCache($tweetData['text'])) {
+                    $this->connection->insert($this->tableName, $tweetData);
+
+                    $tweetId = $this->connection->lastInsertId();
+                    $this->addToCache($tweetData['text'], $tweetId);
+                }
+
+                $this->connection->update(
+                    $this->prefix.'campaign_events',
+                    [
+                        'channel_id' => $tweetId,
+                    ],
+                    [
+                        'id' => $row['id'],
+                    ]
+                );
+            }
+
+            try {
+                $this->connection->commit();
+            } catch (\Exception $e) {
+                $this->connection->rollBack();
+
+                $logger->addError($e->getMessage(), ['exception' => $e]);
+            }
+
+            // Increase the start
+            $start += $batch;
+            $qb->setFirstResult($start);
+        }
+    }
+
+    /**
+     * Generates tweet name from the tweet text.
+     *
+     * @param array $properties
+     *
+     * @return string
+     */
+    protected function generateTweetName(array $properties)
+    {
+        $name = isset($properties['tweet_text']) ? str_replace(PHP_EOL, '', $properties['tweet_text']) : 'Tweet';
+
+        return (strlen($name) > 53) ? substr($name, 0, 50).'...' : $name;
+    }
+
+    /**
+     * Builds the tweet data to be stored from the channel/event rows.
+     *
+     * @param array $row
+     *
+     * @return array
+     */
+    protected function buildTweetData(array $row)
+    {
+        $now        = (new \DateTime())->format('Y-m-d H:i:s');
+        $properties = $row['properties'];
+
+        return [
+            'text'            => isset($properties['tweet_text']) ? $properties['tweet_text'] : '',
+            'name'            => $this->generateTweetName($properties),
+            'asset_id'        => isset($properties['asset_link']) ? $properties['asset_link'] : null,
+            'page_id'         => isset($properties['page_link']) ? $properties['page_link'] : null,
+            'is_published'    => (bool) $row['is_published'],
+            'date_added'      => !empty($row['date_added']) ? $row['date_added'] : $now,
+            'description'     => !empty($row['description']) ? $row['description'] : 'Created by migration',
+            'created_by'      => (int) $row['created_by'],
+            'created_by_user' => $row['created_by_user'],
+            'lang'            => 'en',
+        ];
+    }
+
+    /**
+     * Builds the tweet cache so we could join duplicated tweets.
+     *
+     * @param string $text
+     * @param int    $id
+     */
+    protected function addToCache($text, $id)
+    {
+        $this->tweetCache[md5($text)] = $id;
+    }
+
+    /**
+     * Check tweetCache if the tweet exists. If so, returns tweet ID, if not false.
+     *
+     * @param string $text
+     *
+     * @return int|false
+     */
+    protected function getIdFromCache($text)
+    {
+        $hash = md5($text);
+
+        if (isset($this->tweetCache[$hash])) {
+            return $this->tweetCache[$hash];
+        }
+
+        return false;
+    }
+}
diff --git a/app/migrations/Version20170324112219.php b/app/migrations/Version20170324112219.php
new file mode 100644
index 00000000000..38da5b9d99f
--- /dev/null
+++ b/app/migrations/Version20170324112219.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+use Mautic\NotificationBundle\Integration\OneSignalIntegration;
+use Mautic\PluginBundle\Entity\Integration;
+use Mautic\SmsBundle\Integration\TwilioIntegration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170324112219 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        $row = $this->connection->createQueryBuilder()
+            ->select('*')
+            ->from($this->prefix.'plugin_integration_settings')
+            ->where('name = "Twilio"')
+            ->execute()
+            ->fetch()
+        ;
+
+        if ($row !== false) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->suppressNoSQLStatementError();
+
+        $integrationRepo      = $this->container->get('doctrine.orm.entity_manager')->getRepository(Integration::class);
+        $coreParametersHelper = $this->container->get('mautic.helper.core_parameters');
+        $twilioKeySettings    = [
+            'username' => $coreParametersHelper->getParameter('sms_username'),
+            'password' => $coreParametersHelper->getParameter('sms_password'),
+        ];
+        $twilioFeatureSettings = [
+            'sending_phone_number' => $coreParametersHelper->getParameter('sms_sending_phone_number'),
+            'frequency_number'     => $coreParametersHelper->getParameter('sms_frequency_number'),
+            'frequency_time'       => $coreParametersHelper->getParameter('sms_frequency_time'),
+        ];
+        $oneSignalKeySettings = [
+            'app_id'        => $coreParametersHelper->getParameter('notification_app_id'),
+            'rest_api_key'  => $coreParametersHelper->getParameter('notification_rest_api_key'),
+            'safari_web_id' => $coreParametersHelper->getParameter('notification_safari_web_id'),
+            'gcm_sender_id' => $coreParametersHelper->getParameter('gcm_sender_id'),
+        ];
+        $osFeatureSettings = [
+            'features' => [],
+        ];
+
+        // Ensure an empty string doesn't get persisted, as a numeric or null is required.
+        if (empty($twilioFeatureSettings['frequency_number'])) {
+            $twilioFeatureSettings['frequency_number'] = null;
+        }
+
+        if ($coreParametersHelper->getParameter('notification_landing_page_enabled')) {
+            $osFeatureSettings['features'][] = 'landing_page_enabled';
+        }
+
+        if ($coreParametersHelper->getParameter('welcomenotification_enabled')) {
+            $osFeatureSettings['features'][] = 'welcome_notification_enabled';
+        }
+
+        if (!empty($twilioKeySettings['username'])) {
+            $twilioIntegration = new Integration();
+            $twilioIntegration->setName('Twilio');
+            $twilioIntegration->setIsPublished($coreParametersHelper->getParameter('sms_enabled'));
+            $twilioIntegration->setApiKeys([]);
+            $twilioIntegration->setFeatureSettings($twilioFeatureSettings);
+            $twilioIntegration->setSupportedFeatures([]);
+
+            $twilInt = new TwilioIntegration($this->container->get('mautic.factory'));
+            $twilInt->encryptAndSetApiKeys($twilioKeySettings, $twilioIntegration);
+
+            $integrationRepo->saveEntities([$twilioIntegration]);
+        }
+
+        if (!empty($oneSignalKeySettings['rest_api_key'])) {
+            $oneSignalIntegration = new Integration();
+            $oneSignalIntegration->setName('OneSignal');
+            $oneSignalIntegration->setIsPublished($coreParametersHelper->getParameter('notification_enabled'));
+            $oneSignalIntegration->setApiKeys([]);
+            $oneSignalIntegration->setFeatureSettings($osFeatureSettings);
+            $oneSignalIntegration->setSupportedFeatures([]);
+
+            $osInt = new OneSignalIntegration($this->container->get('mautic.factory'));
+            $osInt->encryptAndSetApiKeys($oneSignalKeySettings, $oneSignalIntegration);
+
+            $integrationRepo->saveEntities([$oneSignalIntegration]);
+        }
+    }
+}
diff --git a/app/migrations/Version20170330165232.php b/app/migrations/Version20170330165232.php
new file mode 100644
index 00000000000..9ecdf363cc4
--- /dev/null
+++ b/app/migrations/Version20170330165232.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170330165232 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        if ($schema->getTable($this->prefix.'push_ids')->hasColumn('enabled')) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql('ALTER TABLE '.$this->prefix.'push_ids ADD enabled TINYINT(1) NOT NULL;');
+        $this->addSql('ALTER TABLE '.$this->prefix.'push_ids ADD mobile TINYINT(1) NOT NULL;');
+        $this->addSql('ALTER TABLE '.$this->prefix.'push_notifications ADD mobile TINYINT(1) NOT NULL;');
+    }
+}
diff --git a/app/migrations/Version20170404173451.php b/app/migrations/Version20170404173451.php
new file mode 100644
index 00000000000..77ed0db2a49
--- /dev/null
+++ b/app/migrations/Version20170404173451.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170404173451 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        $table = $schema->getTable($this->prefix.'reports');
+        if ($table->hasColumn('group_by')) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql("ALTER TABLE {$this->prefix}reports ADD group_by LONGTEXT DEFAULT NULL COMMENT '(DC2Type:array)';");
+        $this->addSql("ALTER TABLE {$this->prefix}reports ADD aggregators LONGTEXT DEFAULT NULL COMMENT '(DC2Type:array)';");
+    }
+}
diff --git a/app/migrations/Version20170405194627.php b/app/migrations/Version20170405194627.php
new file mode 100644
index 00000000000..44ddf4f3ad9
--- /dev/null
+++ b/app/migrations/Version20170405194627.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170405194627 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        if ($schema->getTable($this->prefix.'push_notifications')->hasColumn('mobileSettings')) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql('ALTER TABLE '.$this->prefix."push_notifications ADD mobileSettings LONGTEXT NOT NULL COMMENT '(DC2Type:array)';");
+    }
+}
diff --git a/app/migrations/Version20170410210055.php b/app/migrations/Version20170410210055.php
new file mode 100644
index 00000000000..828bbc9b4a4
--- /dev/null
+++ b/app/migrations/Version20170410210055.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170410210055 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        if ($schema->getTable($this->prefix.'push_notification_stats')->hasColumn('date_read')) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql('ALTER TABLE '.$this->prefix."push_notification_stats ADD date_read DATETIME NOT NULL COMMENT '(DC2Type:datetime)';");
+    }
+}
diff --git a/app/migrations/Version20170420122443.php b/app/migrations/Version20170420122443.php
new file mode 100644
index 00000000000..1fe380d7379
--- /dev/null
+++ b/app/migrations/Version20170420122443.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * @package     Mautic
+ * @copyright   2017 Mautic Contributors. All rights reserved.
+ * @author      Mautic
+ * @link        http://mautic.org
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20170420122443 extends AbstractMauticMigration
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws SkipMigrationException
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function preUp(Schema $schema)
+    {
+        $table = $schema->getTable($this->prefix.'integration_entity');
+        if ($table->hasIndex(MAUTIC_TABLE_PREFIX.'internal_integration_entity')) {
+            throw new SkipMigrationException('Schema includes this migration');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql('CREATE INDEX '.$this->prefix.'internal_integration_entity ON '.$this->prefix.'integration_entity (internal_entity_id, integration_entity_id, internal_entity, integration_entity)');
+    }
+}
diff --git a/app/version.txt b/app/version.txt
index c708446f793..9e231446465 100644
--- a/app/version.txt
+++ b/app/version.txt
@@ -1 +1 @@
-2.6.1-dev
\ No newline at end of file
+2.8.1-dev
\ No newline at end of file
diff --git a/composer.json b/composer.json
index dc5158a6663..12f5a293552 100644
--- a/composer.json
+++ b/composer.json
@@ -105,7 +105,8 @@
         "doctrine/data-fixtures": "1.2.1",
         "sonata-project/exporter": "^1.7",
         "lightsaml/sp-bundle": "~1.0.3",
-        "symfony/expression-language": "~2.8"
+        "symfony/expression-language": "~2.8",
+        "egeloen/ordered-form-bundle": "^3.0"
     },
     "require-dev": {
         "symfony/web-profiler-bundle": "~2.8",
@@ -133,7 +134,8 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "cp ./build/hooks/pre-commit ./.git/hooks/pre-commit"
-        ]
+        ],
+        "test": "phpunit --bootstrap vendor/autoload.php --configuration app/phpunit.xml.dist app/bundles"
     },
     "config": {
         "bin-dir": "bin"
diff --git a/composer.lock b/composer.lock
index 9d7a6161029..7255a1ec278 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "26bf4bf7322c68ffed988995dea71fae",
+    "hash": "79c9882052953bdc08dcb66f0c206d6b",
+    "content-hash": "84f6f30701b5f4539b3a833c211a5705",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -67,7 +68,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-25T18:03:20+00:00"
+            "time": "2016-07-25 18:03:20"
         },
         {
             "name": "clue/stream-filter",
@@ -116,7 +117,7 @@
                 "stream_filter_append",
                 "stream_filter_register"
             ],
-            "time": "2015-11-08T23:41:30+00:00"
+            "time": "2015-11-08 23:41:30"
         },
         {
             "name": "composer/ca-bundle",
@@ -174,7 +175,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2016-11-02T18:11:27+00:00"
+            "time": "2016-11-02 18:11:27"
         },
         {
             "name": "debril/rss-atom-bundle",
@@ -229,7 +230,7 @@
                 "atom",
                 "rss"
             ],
-            "time": "2016-09-13T11:46:21+00:00"
+            "time": "2016-09-13 11:46:21"
         },
         {
             "name": "doctrine/annotations",
@@ -297,7 +298,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2015-08-31T12:32:49+00:00"
+            "time": "2015-08-31 12:32:49"
         },
         {
             "name": "doctrine/cache",
@@ -367,7 +368,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2015-12-19T05:03:47+00:00"
+            "time": "2015-12-19 05:03:47"
         },
         {
             "name": "doctrine/collections",
@@ -433,7 +434,7 @@
                 "collections",
                 "iterator"
             ],
-            "time": "2015-04-14T22:21:58+00:00"
+            "time": "2015-04-14 22:21:58"
         },
         {
             "name": "doctrine/common",
@@ -506,7 +507,7 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2015-12-25T13:10:16+00:00"
+            "time": "2015-12-25 13:10:16"
         },
         {
             "name": "doctrine/data-fixtures",
@@ -565,7 +566,7 @@
             "keywords": [
                 "database"
             ],
-            "time": "2016-06-20T18:08:26+00:00"
+            "time": "2016-06-20 18:08:26"
         },
         {
             "name": "doctrine/dbal",
@@ -636,7 +637,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2016-09-09T19:13:33+00:00"
+            "time": "2016-09-09 19:13:33"
         },
         {
             "name": "doctrine/doctrine-bundle",
@@ -717,7 +718,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2016-08-10T15:35:22+00:00"
+            "time": "2016-08-10 15:35:22"
         },
         {
             "name": "doctrine/doctrine-cache-bundle",
@@ -805,7 +806,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2016-01-26T17:28:51+00:00"
+            "time": "2016-01-26 17:28:51"
         },
         {
             "name": "doctrine/doctrine-fixtures-bundle",
@@ -862,7 +863,7 @@
                 "Fixture",
                 "persistence"
             ],
-            "time": "2015-11-04T21:23:23+00:00"
+            "time": "2015-11-04 21:23:23"
         },
         {
             "name": "doctrine/doctrine-migrations-bundle",
@@ -920,7 +921,7 @@
                 "migrations",
                 "schema"
             ],
-            "time": "2015-11-04T13:45:30+00:00"
+            "time": "2015-11-04 13:45:30"
         },
         {
             "name": "doctrine/inflector",
@@ -987,7 +988,7 @@
                 "singularize",
                 "string"
             ],
-            "time": "2015-11-06T14:35:42+00:00"
+            "time": "2015-11-06 14:35:42"
         },
         {
             "name": "doctrine/instantiator",
@@ -1041,7 +1042,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2015-06-14 21:17:01"
         },
         {
             "name": "doctrine/lexer",
@@ -1095,7 +1096,7 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2014-09-09T13:34:57+00:00"
+            "time": "2014-09-09 13:34:57"
         },
         {
             "name": "doctrine/migrations",
@@ -1163,7 +1164,7 @@
                 "database",
                 "migrations"
             ],
-            "time": "2016-01-07T21:28:50+00:00"
+            "time": "2016-01-07 21:28:50"
         },
         {
             "name": "doctrine/orm",
@@ -1239,7 +1240,111 @@
                 "database",
                 "orm"
             ],
-            "time": "2016-12-18T15:42:34+00:00"
+            "time": "2016-12-18 15:42:34"
+        },
+        {
+            "name": "egeloen/ordered-form",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egeloen/ivory-ordered-form.git",
+                "reference": "bd2cd20210aa53c036af2bcbafe8d11612e2cea9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egeloen/ivory-ordered-form/zipball/bd2cd20210aa53c036af2bcbafe8d11612e2cea9",
+                "reference": "bd2cd20210aa53c036af2bcbafe8d11612e2cea9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6|^7.0",
+                "symfony/form": "^2.7|^3.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "phpunit/phpunit": "^5.0",
+                "symfony/phpunit-bridge": "^2.7|^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ivory\\OrderedForm\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                }
+            ],
+            "description": "Provides a form ordering support with the Symfony2 form component.",
+            "keywords": [
+                "Symfony2",
+                "form",
+                "order"
+            ],
+            "time": "2017-02-27 21:20:30"
+        },
+        {
+            "name": "egeloen/ordered-form-bundle",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egeloen/IvoryOrderedFormBundle.git",
+                "reference": "e6c2399103be8cffeac96dd48dd0990afa0a54b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egeloen/IvoryOrderedFormBundle/zipball/e6c2399103be8cffeac96dd48dd0990afa0a54b2",
+                "reference": "e6c2399103be8cffeac96dd48dd0990afa0a54b2",
+                "shasum": ""
+            },
+            "require": {
+                "egeloen/ordered-form": "^3.0",
+                "php": "^5.6|^7.0",
+                "symfony/framework-bundle": "^2.7|^3.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "phpunit/phpunit": "^5.0",
+                "symfony/phpunit-bridge": "^2.7|^3.0"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ivory\\OrderedFormBundle\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                }
+            ],
+            "description": "Provides a form ordering support for your Symfony2 project.",
+            "keywords": [
+                "form",
+                "order"
+            ],
+            "time": "2017-02-27 21:30:37"
         },
         {
             "name": "friendsofsymfony/oauth-server-bundle",
@@ -1311,7 +1416,7 @@
                 "oauth2",
                 "server"
             ],
-            "time": "2016-02-22T13:57:55+00:00"
+            "time": "2016-02-22 13:57:55"
         },
         {
             "name": "friendsofsymfony/oauth2-php",
@@ -1365,7 +1470,7 @@
                 "oauth",
                 "oauth2"
             ],
-            "time": "2016-03-31T14:24:17+00:00"
+            "time": "2016-03-31 14:24:17"
         },
         {
             "name": "friendsofsymfony/rest-bundle",
@@ -1453,7 +1558,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2016-06-21T08:42:59+00:00"
+            "time": "2016-06-21 08:42:59"
         },
         {
             "name": "geoip2/geoip2",
@@ -1504,7 +1609,7 @@
                 "geolocation",
                 "maxmind"
             ],
-            "time": "2016-10-11T21:58:42+00:00"
+            "time": "2016-10-11 21:58:42"
         },
         {
             "name": "giggsey/libphonenumber-for-php",
@@ -1566,7 +1671,7 @@
                 "phonenumber",
                 "validation"
             ],
-            "time": "2016-12-12T09:08:42+00:00"
+            "time": "2016-12-12 09:08:42"
         },
         {
             "name": "giggsey/locale",
@@ -1615,7 +1720,7 @@
                 }
             ],
             "description": "Locale functions required by libphonenumber-for-php",
-            "time": "2016-10-24T20:49:55+00:00"
+            "time": "2016-10-24 20:49:55"
         },
         {
             "name": "guzzle/guzzle",
@@ -1711,7 +1816,7 @@
                 "web service"
             ],
             "abandoned": "guzzlehttp/guzzle",
-            "time": "2015-03-18T18:23:50+00:00"
+            "time": "2015-03-18 18:23:50"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -1773,7 +1878,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2016-10-08T15:01:37+00:00"
+            "time": "2016-10-08 15:01:37"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1824,7 +1929,7 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2016-12-20T10:07:11+00:00"
+            "time": "2016-12-20 10:07:11"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -1882,7 +1987,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-06-24T23:00:38+00:00"
+            "time": "2016-06-24 23:00:38"
         },
         {
             "name": "ip2location/ip2location-php",
@@ -1922,7 +2027,7 @@
                 "ip2location",
                 "ip2locationlite"
             ],
-            "time": "2016-06-10T07:21:52+00:00"
+            "time": "2016-06-10 07:21:52"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -1964,7 +2069,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20T16:49:30+00:00"
+            "time": "2014-11-20 16:49:30"
         },
         {
             "name": "jbroadway/urlify",
@@ -2018,7 +2123,7 @@
                 "url",
                 "urlify"
             ],
-            "time": "2017-01-03T20:12:54+00:00"
+            "time": "2017-01-03 20:12:54"
         },
         {
             "name": "jdorn/sql-formatter",
@@ -2068,7 +2173,7 @@
                 "highlight",
                 "sql"
             ],
-            "time": "2014-01-12T16:20:24+00:00"
+            "time": "2014-01-12 16:20:24"
         },
         {
             "name": "jms/metadata",
@@ -2119,7 +2224,7 @@
                 "xml",
                 "yaml"
             ],
-            "time": "2016-12-05T10:18:33+00:00"
+            "time": "2016-12-05 10:18:33"
         },
         {
             "name": "jms/parser-lib",
@@ -2154,7 +2259,7 @@
                 "Apache2"
             ],
             "description": "A library for easily creating recursive-descent parsers.",
-            "time": "2012-11-18T18:08:43+00:00"
+            "time": "2012-11-18 18:08:43"
         },
         {
             "name": "jms/serializer",
@@ -2229,7 +2334,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2016-11-13T10:20:11+00:00"
+            "time": "2016-11-13 10:20:11"
         },
         {
             "name": "jms/serializer-bundle",
@@ -2299,7 +2404,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2015-11-10T12:26:42+00:00"
+            "time": "2015-11-10 12:26:42"
         },
         {
             "name": "joomla/filter",
@@ -2350,7 +2455,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2016-01-08T17:27:47+00:00"
+            "time": "2016-01-08 17:27:47"
         },
         {
             "name": "joomla/http",
@@ -2401,7 +2506,7 @@
                 "http",
                 "joomla"
             ],
-            "time": "2016-03-01T17:48:32+00:00"
+            "time": "2016-03-01 17:48:32"
         },
         {
             "name": "joomla/string",
@@ -2467,7 +2572,7 @@
                 "joomla",
                 "string"
             ],
-            "time": "2016-12-10T18:13:42+00:00"
+            "time": "2016-12-10 18:13:42"
         },
         {
             "name": "joomla/uri",
@@ -2504,7 +2609,7 @@
                 "joomla",
                 "uri"
             ],
-            "time": "2014-02-09T02:57:17+00:00"
+            "time": "2014-02-09 02:57:17"
         },
         {
             "name": "knplabs/gaufrette",
@@ -2588,7 +2693,7 @@
                 "filesystem",
                 "media"
             ],
-            "time": "2015-05-26T08:25:40+00:00"
+            "time": "2015-05-26 08:25:40"
         },
         {
             "name": "knplabs/knp-menu",
@@ -2654,7 +2759,7 @@
                 "menu",
                 "tree"
             ],
-            "time": "2016-09-22T07:36:19+00:00"
+            "time": "2016-09-22 07:36:19"
         },
         {
             "name": "knplabs/knp-menu-bundle",
@@ -2711,7 +2816,7 @@
             "keywords": [
                 "menu"
             ],
-            "time": "2016-09-22T12:24:40+00:00"
+            "time": "2016-09-22 12:24:40"
         },
         {
             "name": "lightsaml/lightsaml",
@@ -2774,7 +2879,7 @@
                 "lightSAML",
                 "php"
             ],
-            "time": "2016-11-18T08:30:01+00:00"
+            "time": "2016-11-18 08:30:01"
         },
         {
             "name": "lightsaml/sp-bundle",
@@ -2823,7 +2928,7 @@
             ],
             "description": "Light SAML2 SP Symfony Bundle",
             "homepage": "http://www.lightsaml.com/SP-Bundle/",
-            "time": "2016-11-04T13:58:13+00:00"
+            "time": "2016-11-04 13:58:13"
         },
         {
             "name": "lightsaml/symfony-bridge",
@@ -2874,7 +2979,7 @@
             ],
             "description": "Light SAML Symfony bridge bundle",
             "homepage": "http://www.lightsaml.com",
-            "time": "2016-11-18T15:11:05+00:00"
+            "time": "2016-11-18 15:11:05"
         },
         {
             "name": "maxmind-db/reader",
@@ -2929,7 +3034,7 @@
                 "geolocation",
                 "maxmind"
             ],
-            "time": "2016-11-21T21:33:24+00:00"
+            "time": "2016-11-21 21:33:24"
         },
         {
             "name": "maxmind/web-service-common",
@@ -2973,7 +3078,7 @@
             ],
             "description": "Internal MaxMind Web Service API",
             "homepage": "https://github.com/maxmind/mm-web-service-api-php",
-            "time": "2016-08-18T16:36:52+00:00"
+            "time": "2016-08-18 16:36:52"
         },
         {
             "name": "misd/phone-number-bundle",
@@ -3040,7 +3145,7 @@
                 "phonenumber",
                 "telephone number"
             ],
-            "time": "2016-12-17T17:15:49+00:00"
+            "time": "2016-12-17 17:15:49"
         },
         {
             "name": "monolog/monolog",
@@ -3118,7 +3223,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-11-26T00:15:39+00:00"
+            "time": "2016-11-26 00:15:39"
         },
         {
             "name": "mrclay/minify",
@@ -3158,7 +3263,7 @@
             ],
             "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
             "homepage": "http://code.google.com/p/minify/",
-            "time": "2014-03-12T12:54:23+00:00"
+            "time": "2014-03-12 12:54:23"
         },
         {
             "name": "mustangostang/spyc",
@@ -3208,7 +3313,7 @@
                 "yaml",
                 "yml"
             ],
-            "time": "2016-10-21T00:03:34+00:00"
+            "time": "2016-10-21 00:03:34"
         },
         {
             "name": "oneup/uploader-bundle",
@@ -3277,7 +3382,7 @@
                 "plupload",
                 "upload"
             ],
-            "time": "2016-12-15T08:33:29+00:00"
+            "time": "2016-12-15 08:33:29"
         },
         {
             "name": "paragonie/random_compat",
@@ -3325,7 +3430,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2016-11-07T23:38:38+00:00"
+            "time": "2016-11-07 23:38:38"
         },
         {
             "name": "php-http/discovery",
@@ -3387,7 +3492,7 @@
                 "message",
                 "psr7"
             ],
-            "time": "2016-11-27T12:21:25+00:00"
+            "time": "2016-11-27 12:21:25"
         },
         {
             "name": "php-http/guzzle6-adapter",
@@ -3447,7 +3552,7 @@
                 "Guzzle",
                 "http"
             ],
-            "time": "2016-05-10T06:13:32+00:00"
+            "time": "2016-05-10 06:13:32"
         },
         {
             "name": "php-http/httplug",
@@ -3503,7 +3608,7 @@
                 "client",
                 "http"
             ],
-            "time": "2016-08-31T08:30:17+00:00"
+            "time": "2016-08-31 08:30:17"
         },
         {
             "name": "php-http/message",
@@ -3572,7 +3677,7 @@
                 "message",
                 "psr-7"
             ],
-            "time": "2016-12-16T21:09:21+00:00"
+            "time": "2016-12-16 21:09:21"
         },
         {
             "name": "php-http/message-factory",
@@ -3622,7 +3727,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2015-12-19T14:08:53+00:00"
+            "time": "2015-12-19 14:08:53"
         },
         {
             "name": "php-http/promise",
@@ -3672,7 +3777,7 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2016-01-26T13:27:02+00:00"
+            "time": "2016-01-26 13:27:02"
         },
         {
             "name": "phpcollection/phpcollection",
@@ -3720,7 +3825,7 @@
                 "sequence",
                 "set"
             ],
-            "time": "2015-05-17T12:39:23+00:00"
+            "time": "2015-05-17 12:39:23"
         },
         {
             "name": "phpoffice/phpexcel",
@@ -3777,7 +3882,7 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2015-05-01T07:00:55+00:00"
+            "time": "2015-05-01 07:00:55"
         },
         {
             "name": "phpoption/phpoption",
@@ -3827,7 +3932,7 @@
                 "php",
                 "type"
             ],
-            "time": "2015-07-25T16:39:46+00:00"
+            "time": "2015-07-25 16:39:46"
         },
         {
             "name": "piwik/device-detector",
@@ -3878,7 +3983,7 @@
                 "parser",
                 "useragent"
             ],
-            "time": "2016-12-06T20:57:53+00:00"
+            "time": "2016-12-06 20:57:53"
         },
         {
             "name": "psr/cache",
@@ -3924,7 +4029,7 @@
                 "psr",
                 "psr-6"
             ],
-            "time": "2016-08-06T20:24:11+00:00"
+            "time": "2016-08-06 20:24:11"
         },
         {
             "name": "psr/http-message",
@@ -3974,7 +4079,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2016-08-06 14:39:51"
         },
         {
             "name": "psr/log",
@@ -4021,7 +4126,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2016-10-10 12:19:37"
         },
         {
             "name": "rackspace/php-opencloud",
@@ -4086,7 +4191,7 @@
                 "rackspace",
                 "swift"
             ],
-            "time": "2015-03-16T23:57:58+00:00"
+            "time": "2015-03-16 23:57:58"
         },
         {
             "name": "robrichards/xmlseclibs",
@@ -4127,7 +4232,7 @@
                 "xml",
                 "xmldsig"
             ],
-            "time": "2016-09-08T13:15:00+00:00"
+            "time": "2016-09-08 13:15:00"
         },
         {
             "name": "sensio/distribution-bundle",
@@ -4179,7 +4284,7 @@
                 "configuration",
                 "distribution"
             ],
-            "time": "2017-01-04T13:35:35+00:00"
+            "time": "2017-01-04 13:35:35"
         },
         {
             "name": "sensiolabs/security-checker",
@@ -4223,7 +4328,7 @@
                 }
             ],
             "description": "A security checker for your composer.lock",
-            "time": "2016-09-23T18:09:57+00:00"
+            "time": "2016-09-23 18:09:57"
         },
         {
             "name": "sonata-project/exporter",
@@ -4292,7 +4397,7 @@
                 "export",
                 "xls"
             ],
-            "time": "2016-08-17T08:25:58+00:00"
+            "time": "2016-08-17 08:25:58"
         },
         {
             "name": "sparkpost/sparkpost",
@@ -4337,7 +4442,7 @@
                 }
             ],
             "description": "Client library for interfacing with the SparkPost API.",
-            "time": "2016-07-29T05:08:27+00:00"
+            "time": "2016-07-29 05:08:27"
         },
         {
             "name": "stack/builder",
@@ -4386,7 +4491,7 @@
             "keywords": [
                 "stack"
             ],
-            "time": "2016-06-02T06:58:42+00:00"
+            "time": "2016-06-02 06:58:42"
         },
         {
             "name": "stack/run",
@@ -4436,7 +4541,7 @@
             "keywords": [
                 "stack"
             ],
-            "time": "2013-10-25T14:31:28+00:00"
+            "time": "2013-10-25 14:31:28"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -4490,7 +4595,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2016-12-29T10:02:40+00:00"
+            "time": "2016-12-29 10:02:40"
         },
         {
             "name": "symfony/asset",
@@ -4545,7 +4650,7 @@
             ],
             "description": "Symfony Asset Component",
             "homepage": "https://symfony.com",
-            "time": "2016-09-24T15:56:40+00:00"
+            "time": "2016-09-24 15:56:40"
         },
         {
             "name": "symfony/browser-kit",
@@ -4602,7 +4707,7 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2016-09-06T10:55:00+00:00"
+            "time": "2016-09-06 10:55:00"
         },
         {
             "name": "symfony/cache",
@@ -4669,7 +4774,7 @@
                 "caching",
                 "psr6"
             ],
-            "time": "2016-12-13T08:24:57+00:00"
+            "time": "2016-12-13 08:24:57"
         },
         {
             "name": "symfony/class-loader",
@@ -4722,7 +4827,7 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-29T08:25:54+00:00"
+            "time": "2016-11-29 08:25:54"
         },
         {
             "name": "symfony/config",
@@ -4778,7 +4883,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-10T08:21:45+00:00"
+            "time": "2016-12-10 08:21:45"
         },
         {
             "name": "symfony/console",
@@ -4839,7 +4944,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-06T11:59:35+00:00"
+            "time": "2016-12-06 11:59:35"
         },
         {
             "name": "symfony/debug",
@@ -4896,7 +5001,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-15T12:53:17+00:00"
+            "time": "2016-11-15 12:53:17"
         },
         {
             "name": "symfony/dependency-injection",
@@ -4959,7 +5064,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-08T14:41:31+00:00"
+            "time": "2016-12-08 14:41:31"
         },
         {
             "name": "symfony/doctrine-bridge",
@@ -5033,7 +5138,7 @@
             ],
             "description": "Symfony Doctrine Bridge",
             "homepage": "https://symfony.com",
-            "time": "2016-11-24T00:43:03+00:00"
+            "time": "2016-11-24 00:43:03"
         },
         {
             "name": "symfony/dom-crawler",
@@ -5089,7 +5194,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-10T14:24:35+00:00"
+            "time": "2016-12-10 14:24:35"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5149,7 +5254,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-13T01:43:15+00:00"
+            "time": "2016-10-13 01:43:15"
         },
         {
             "name": "symfony/expression-language",
@@ -5198,7 +5303,7 @@
             ],
             "description": "Symfony ExpressionLanguage Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-03T07:52:58+00:00"
+            "time": "2016-11-03 07:52:58"
         },
         {
             "name": "symfony/filesystem",
@@ -5247,7 +5352,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-18T04:28:30+00:00"
+            "time": "2016-10-18 04:28:30"
         },
         {
             "name": "symfony/finder",
@@ -5296,7 +5401,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-13T09:38:12+00:00"
+            "time": "2016-12-13 09:38:12"
         },
         {
             "name": "symfony/form",
@@ -5370,7 +5475,7 @@
             ],
             "description": "Symfony Form Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-06T14:06:08+00:00"
+            "time": "2016-12-06 14:06:08"
         },
         {
             "name": "symfony/framework-bundle",
@@ -5462,7 +5567,7 @@
             ],
             "description": "Symfony FrameworkBundle",
             "homepage": "https://symfony.com",
-            "time": "2016-12-13T09:38:12+00:00"
+            "time": "2016-12-13 09:38:12"
         },
         {
             "name": "symfony/http-foundation",
@@ -5517,7 +5622,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-27T04:20:28+00:00"
+            "time": "2016-11-27 04:20:28"
         },
         {
             "name": "symfony/http-kernel",
@@ -5599,7 +5704,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-13T12:16:15+00:00"
+            "time": "2016-12-13 12:16:15"
         },
         {
             "name": "symfony/intl",
@@ -5675,7 +5780,7 @@
                 "l10n",
                 "localization"
             ],
-            "time": "2016-11-18T21:10:01+00:00"
+            "time": "2016-11-18 21:10:01"
         },
         {
             "name": "symfony/monolog-bridge",
@@ -5738,7 +5843,7 @@
             ],
             "description": "Symfony Monolog Bridge",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29T05:29:29+00:00"
+            "time": "2016-06-29 05:29:29"
         },
         {
             "name": "symfony/monolog-bundle",
@@ -5798,7 +5903,7 @@
                 "log",
                 "logging"
             ],
-            "time": "2017-01-02T19:04:26+00:00"
+            "time": "2017-01-02 19:04:26"
         },
         {
             "name": "symfony/options-resolver",
@@ -5852,7 +5957,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2016-10-18T04:28:30+00:00"
+            "time": "2016-10-18 04:28:30"
         },
         {
             "name": "symfony/polyfill-apcu",
@@ -5905,7 +6010,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-intl-icu",
@@ -5963,7 +6068,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -6022,7 +6127,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -6080,7 +6185,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-php55",
@@ -6136,7 +6241,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-php56",
@@ -6192,7 +6297,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -6251,7 +6356,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/polyfill-util",
@@ -6303,7 +6408,7 @@
                 "polyfill",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/process",
@@ -6352,7 +6457,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-24T00:43:03+00:00"
+            "time": "2016-11-24 00:43:03"
         },
         {
             "name": "symfony/property-access",
@@ -6412,7 +6517,7 @@
                 "property path",
                 "reflection"
             ],
-            "time": "2016-07-30T07:20:35+00:00"
+            "time": "2016-07-30 07:20:35"
         },
         {
             "name": "symfony/routing",
@@ -6487,7 +6592,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-11-25T12:26:42+00:00"
+            "time": "2016-11-25 12:26:42"
         },
         {
             "name": "symfony/security",
@@ -6567,7 +6672,7 @@
             ],
             "description": "Symfony Security Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-08T14:41:31+00:00"
+            "time": "2016-12-08 14:41:31"
         },
         {
             "name": "symfony/security-acl",
@@ -6628,7 +6733,7 @@
             ],
             "description": "Symfony Security Component - ACL (Access Control List)",
             "homepage": "https://symfony.com",
-            "time": "2015-12-28T09:39:09+00:00"
+            "time": "2015-12-28 09:39:09"
         },
         {
             "name": "symfony/security-bundle",
@@ -6698,7 +6803,7 @@
             ],
             "description": "Symfony SecurityBundle",
             "homepage": "https://symfony.com",
-            "time": "2016-11-25T12:26:42+00:00"
+            "time": "2016-11-25 12:26:42"
         },
         {
             "name": "symfony/stopwatch",
@@ -6747,7 +6852,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29T05:29:29+00:00"
+            "time": "2016-06-29 05:29:29"
         },
         {
             "name": "symfony/swiftmailer-bundle",
@@ -6806,7 +6911,7 @@
             ],
             "description": "Symfony SwiftmailerBundle",
             "homepage": "http://symfony.com",
-            "time": "2016-12-20T04:44:33+00:00"
+            "time": "2016-12-20 04:44:33"
         },
         {
             "name": "symfony/templating",
@@ -6861,7 +6966,7 @@
             ],
             "description": "Symfony Templating Component",
             "homepage": "https://symfony.com",
-            "time": "2016-09-06T10:55:00+00:00"
+            "time": "2016-09-06 10:55:00"
         },
         {
             "name": "symfony/translation",
@@ -6925,7 +7030,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-09-06T10:55:00+00:00"
+            "time": "2016-09-06 10:55:00"
         },
         {
             "name": "symfony/twig-bridge",
@@ -7006,7 +7111,7 @@
             ],
             "description": "Symfony Twig Bridge",
             "homepage": "https://symfony.com",
-            "time": "2016-07-28T11:13:34+00:00"
+            "time": "2016-07-28 11:13:34"
         },
         {
             "name": "symfony/twig-bundle",
@@ -7072,7 +7177,7 @@
             ],
             "description": "Symfony TwigBundle",
             "homepage": "https://symfony.com",
-            "time": "2016-12-13T09:38:12+00:00"
+            "time": "2016-12-13 09:38:12"
         },
         {
             "name": "symfony/validator",
@@ -7145,7 +7250,7 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-08T15:59:39+00:00"
+            "time": "2016-12-08 15:59:39"
         },
         {
             "name": "symfony/yaml",
@@ -7194,7 +7299,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-14T16:15:57+00:00"
+            "time": "2016-11-14 16:15:57"
         },
         {
             "name": "twig/twig",
@@ -7255,7 +7360,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2016-12-23T11:06:22+00:00"
+            "time": "2016-12-23 11:06:22"
         },
         {
             "name": "twilio/sdk",
@@ -7305,7 +7410,7 @@
                 "sms",
                 "twilio"
             ],
-            "time": "2016-09-01T18:42:52+00:00"
+            "time": "2016-09-01 18:42:52"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -7345,7 +7450,7 @@
                 }
             ],
             "description": "JSONP callback validator.",
-            "time": "2014-01-20T22:35:06+00:00"
+            "time": "2014-01-20 22:35:06"
         },
         {
             "name": "willdurand/negotiation",
@@ -7394,7 +7499,7 @@
                 "header",
                 "negotiation"
             ],
-            "time": "2015-10-01T07:42:40+00:00"
+            "time": "2015-10-01 07:42:40"
         },
         {
             "name": "willdurand/oauth-server-bundle",
@@ -7492,7 +7597,7 @@
                 "php",
                 "transifex"
             ],
-            "time": "2016-06-10T02:57:54+00:00"
+            "time": "2016-06-10 02:57:54"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -7550,7 +7655,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2016-12-01T00:05:05+00:00"
+            "time": "2016-12-01 00:05:05"
         },
         {
             "name": "liip/functional-test-bundle",
@@ -7625,7 +7730,7 @@
             "keywords": [
                 "Symfony2"
             ],
-            "time": "2016-05-10T22:04:27+00:00"
+            "time": "2016-05-10 22:04:27"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -7674,7 +7779,7 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2015-02-03T12:10:50+00:00"
+            "time": "2015-02-03 12:10:50"
         },
         {
             "name": "phpspec/prophecy",
@@ -7733,7 +7838,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2014-11-17T16:23:49+00:00"
+            "time": "2014-11-17 16:23:49"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -7795,7 +7900,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06T15:47:00+00:00"
+            "time": "2015-10-06 15:47:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -7840,7 +7945,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10T15:34:57+00:00"
+            "time": "2013-10-10 15:34:57"
         },
         {
             "name": "phpunit/php-text-template",
@@ -7881,7 +7986,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21T13:50:34+00:00"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
@@ -7925,7 +8030,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12T18:03:57+00:00"
+            "time": "2016-05-12 18:03:57"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -7974,7 +8079,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2016-11-15T14:06:22+00:00"
+            "time": "2016-11-15 14:06:22"
         },
         {
             "name": "phpunit/phpunit",
@@ -8046,7 +8151,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-02-05T15:51:19+00:00"
+            "time": "2015-02-05 15:51:19"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -8102,7 +8207,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02T06:51:40+00:00"
+            "time": "2015-10-02 06:51:40"
         },
         {
             "name": "sebastian/comparator",
@@ -8166,7 +8271,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2016-11-19T09:18:40+00:00"
+            "time": "2016-11-19 09:18:40"
         },
         {
             "name": "sebastian/diff",
@@ -8218,7 +8323,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08T07:14:41+00:00"
+            "time": "2015-12-08 07:14:41"
         },
         {
             "name": "sebastian/environment",
@@ -8268,7 +8373,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-08-18T05:49:44+00:00"
+            "time": "2016-08-18 05:49:44"
         },
         {
             "name": "sebastian/exporter",
@@ -8335,7 +8440,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17T09:04:28+00:00"
+            "time": "2016-06-17 09:04:28"
         },
         {
             "name": "sebastian/global-state",
@@ -8386,7 +8491,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12T03:26:01+00:00"
+            "time": "2015-10-12 03:26:01"
         },
         {
             "name": "sebastian/recursion-context",
@@ -8439,7 +8544,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11T19:50:13+00:00"
+            "time": "2015-11-11 19:50:13"
         },
         {
             "name": "sebastian/version",
@@ -8474,7 +8579,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
+            "time": "2015-06-21 13:59:46"
         },
         {
             "name": "sensio/generator-bundle",
@@ -8526,7 +8631,7 @@
                 }
             ],
             "description": "This bundle generates code for you",
-            "time": "2016-12-05T16:01:19+00:00"
+            "time": "2016-12-05 16:01:19"
         },
         {
             "name": "symfony/var-dumper",
@@ -8589,7 +8694,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-01-03T08:53:57+00:00"
+            "time": "2017-01-03 08:53:57"
         },
         {
             "name": "symfony/web-profiler-bundle",
@@ -8648,7 +8753,7 @@
             ],
             "description": "Symfony WebProfilerBundle",
             "homepage": "https://symfony.com",
-            "time": "2016-12-09T07:40:14+00:00"
+            "time": "2016-12-09 07:40:14"
         },
         {
             "name": "webfactory/exceptions-bundle",
@@ -8696,7 +8801,7 @@
             ],
             "description": "A simple controller to display error pages during development plus some building blocks for more user-friendly error pages.",
             "homepage": "http://inside.webfactory.de/de/blog/symfony2-exception-handling-and-custom-error-pages-explained.html",
-            "time": "2016-01-19T14:46:51+00:00"
+            "time": "2016-01-19 14:46:51"
         }
     ],
     "aliases": [],
diff --git a/media/css/app.css b/media/css/app.css
index c202068de81..90abb41221d 100644
--- a/media/css/app.css
+++ b/media/css/app.css
@@ -439,11 +439,18 @@ solid #ebedf0 !important}.bdr-l{border-left:1px solid #ebedf0 !important}.bdr-r{
 !important}.np{padding:0px
 !important}.pt-20,.pt-lg{padding-top:20px !important}.pt-15,.pt-md{padding-top:15px !important}.pt-10,.pt-sm{padding-top:10px !important}.pt-5,.pt-xs{padding-top:5px !important}.pt-4{padding-top:4px !important}.pt-3{padding-top:3px !important}.pt-2{padding-top:2px !important}.pt-1{padding-top:1px !important}.pt-0{padding-top:0px !important}.pr-20,.pr-lg{padding-right:20px !important}.pr-15,.pr-md{padding-right:15px !important}.pr-10,.pr-sm{padding-right:10px !important}.pr-5,.pr-xs{padding-right:5px !important}.pr-4{padding-right:4px !important}.pr-3{padding-right:3px !important}.pr-2{padding-right:2px !important}.pr-1{padding-right:1px !important}.pr-0{padding-right:0px !important}.pb-20,.pb-lg{padding-bottom:20px !important}.pb-15,.pb-md{padding-bottom:15px !important}.pb-10,.pb-sm{padding-bottom:10px !important}.pb-5,.pb-xs{padding-bottom:5px !important}.pb-4{padding-bottom:4px !important}.pb-3{padding-bottom:3px !important}.pb-2{padding-bottom:2px !important}.pb-1{padding-bottom:1px !important}.pb-0{padding-bottom:0px !important}.pl-20,.pl-lg{padding-left:20px !important}.pl-15,.pl-md{padding-left:15px !important}.pl-10,.pl-sm{padding-left:10px !important}.pl-5,.pl-xs{padding-left:5px !important}.pl-4{padding-left:4px !important}.pl-3{padding-left:3px !important}.pl-2{padding-left:2px !important}.pl-1{padding-left:1px !important}.pl-0{padding-left:0px !important}.w-44{width:44px}.no-focus.form-control,
 .form-control .no-focus{border-color:transparent}.no-focus.form-control:focus,
-.form-control .no-focus:focus{outline:0}.ovf-h{overflow:hidden}.break-word{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}.builder{position:relative}.builder [data-token]{cursor:pointer}.builder .btn-block.ui-draggable-dragging{width:104px;height:68px;margin:6px
-12px;white-space:normal}.builder .builder-panel-top{margin-bottom:10px}.builder .template-dnd-help,
-.builder .custom-dnd-help{display:table-cell;vertical-align:middle;width:100%}.builder-active{background-color:#fff;position:absolute;top:0;bottom:0;right:0;left:0;width:100%;height:100%;z-index:1030}.builder-panel{position:fixed;top:0;bottom:0;right:0;width:525px;height:100%;padding:15px;background-color:#d5d4d4;overflow-y:auto}.builder-panel .btn-close-builder{width:100%}.builder-content{position:fixed;left:0;top:0;right:525px;height:100%}.code-mode .builder-panel{width:50%;position:fixed}.code-mode .builder-content{width:50%}.code-mode .btn-close-builder{width:150px;float:right}.builder-panel .panel
+.form-control .no-focus:focus{outline:0}.ovf-h{overflow:hidden}.break-word{-ms-word-break:break-all;word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto}.builder,.builder-slot{position:relative}.builder [data-token],
+.builder-slot [data-token]{cursor:pointer}.builder .btn-block.ui-draggable-dragging,
+.builder-slot .btn-block.ui-draggable-dragging{width:104px;height:68px;margin:6px
+12px;white-space:normal}.builder .builder-panel-top,
+.builder-slot .builder-panel-top{margin-bottom:10px}.builder .template-dnd-help,
+.builder-slot .template-dnd-help,
+.builder .custom-dnd-help,
+.builder-slot .custom-dnd-help{display:table-cell;vertical-align:middle;width:100%}.builder-active{background-color:#fff;position:absolute;top:0;bottom:0;right:0;left:0;width:100%;height:100%;z-index:1030}.builder-panel{position:fixed;top:0;bottom:0;right:0;width:525px;height:100%;padding:15px;background-color:#d5d4d4;overflow-y:auto}.builder-panel .btn-close-builder{width:100%}.builder-content{position:fixed;left:0;top:0;right:525px;height:100%}.code-mode .builder-panel{width:50%;position:fixed}.code-mode .builder-content{width:50%}.code-mode .btn-close-builder{width:150px;float:right}.builder-panel .panel
+a.btn{white-space:normal}.builder-active-slot{background-color:#fff;z-index:1030}.builder-panel-slot{width:50%;padding:15px;background-color:#d5d4d4;overflow-y:auto}.builder-panel-slot .btn-close-builder{width:100%}.builder-content-slot{left:50%;width:50%}.code-mode .builder-panel-slot{width:50%}.code-mode .builder-content-slot{width:50%}.code-mode .btn-close-builder{width:150px;float:right}.builder-panel-slot .panel
 a.btn{white-space:normal}.ui-draggable-iframeFix{z-index:9999 !important}.CodeMirror{border:1px
-solid #eee;height:auto}.CodeMirror-hints{position:absolute;z-index:9999 !important;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);-moz-box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);border-radius:3px;border:1px
+solid #eee;height:auto}#slot_codemode
+.CodeMirror{height:200px}.CodeMirror-hints{position:absolute;z-index:9999 !important;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);-moz-box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);box-shadow:2px 3px 5px rgba(0, 0, 0, 0.2);border-radius:3px;border:1px
 solid silver;background:white;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0
 4px;border-radius:2px;white-space:pre;color:black;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:white}@media (max-width: 767px){.builder .builder-panel{width:100%;bottom:0;top:auto;height:35%;padding-left:30px !important;padding-right:30px !important;border-top:1px solid #757575;position:fixed}.builder .builder-content{right:0}.builder .builder-panel-top{position:relative;width:100%}.builder .builder-tokens{margin-top:10px}}.mautic-editable{min-height:75px;width:100%;border:dashed 1px #000;margin-top:3px;margin-bottom:3px}.mautic-editable.over-droppable{border:dashed 2px #4e5e9e;-webkit-box-shadow:0px 0px 2px 2px rgba(0, 0, 0, 0.75);-moz-box-shadow:0px 0px 2px 2px rgba(0, 0, 0, 0.75);box-shadow:0px 0px 2px 2px rgba(0,0,0,0.75)}.mautic-editable-placeholder{height:100%;width:100%;text-align:center;margin-top:25px}div[contentEditable=true]:empty:not(:focus):before{content:attr(data-placeholder);padding:5px;display:table-cell}.inline-token-list{max-height:200px;overflow-y:auto;overflow-x:hidden;margin-bottom:20px;padding-left:0;width:240px}.inline-token{position:relative;display:block;padding:5px;margin-bottom:-1px;background-color:#fff;border:1px
 solid #f7f7f7;color:#f7f7f7;font-size:12px}.inline-token:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.inline-token:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.inline-token{color:#000;text-decoration:none;font-family:"Open Sans",Helvetica,Arial,sans-serif;line-height:1.3856}a.inline-token:hover,a.inline-token:focus{background-color:#DBDFEC}a.inline-token .text-muted{color:#8393a2}.sortable-panels
@@ -469,7 +476,7 @@ i{color:#4e5d9d}.col-actions{width:100px}.shuffle-item
 button{height:32px}.theme-selected{border:1px
 solid #4e5e9e;-webkit-box-shadow:0px 0px 40px #f3f3f3;box-shadow:0px 0px 40px #f3f3f3}#app-content.content-only .toolbar-form-buttons.pull-right{padding-right:20px}.fr-toolbar{border-top:2px solid #4e5d9d}.modal-body-content iframe.fr-iframe{min-height:300px}.CodeMirror{border:1px
 solid #d5d5d5;border-radius:3px}table.table>tbody>tr>td.long-text{max-width:500px;min-width:300px;-ms-word-break:break-all;word-break:break-word;overflow-wrap:break-word;word-wrap:break-word;white-space:normal}.dynamicContentFilterContainer .btn-primary:hover{color:#5d6c7c}#dynamicContentContainer .remove-item{display:block}#dynamicContentContainer>.tab-pane>.panel>ul{white-space:nowrap;overflow:auto;overflow-y:hidden;max-width:100%}#dynamicContentContainer > .tab-pane > .panel > ul
-li{display:inline-block;vertical-align:top;float:none}div[data-filter-container] .in-group{margin-left:20px}div[data-filter-container] .panel{margin-bottom:0;margin-top:20px}div[data-filter-container] .panel.in-group{margin-top:0;border-top:0;border-top-left-radius:0;border-top-right-radius:0}td.col-id,th.col-id{width:75px}.col-client-id{width:75px}.thumbnail-preview
+li{display:inline-block;vertical-align:top;float:none}div[data-filter-container] .in-group{margin-left:20px}div[data-filter-container] .panel{margin-bottom:0;margin-top:20px}div[data-filter-container] .panel.in-group{margin-top:0;border-top:0;border-top-left-radius:0;border-top-right-radius:0}td.col-id,th.col-id{width:75px}.badge-wrapper{float:right;vertical-align:middle;margin-right:-10px}span.slot-caption{font-size:12px}.imagecard-caption,figcaption{font-size:16px}.imagecard{background-color:#ddd !important}.imagecard .imagecard-caption{background-color:#bbb !important}.col-client-id{width:75px}.thumbnail-preview
 img{height:100px}.modal-body-content iframe, .preview-detail
 iframe{height:400px}.form-group.preview
 img{max-height:260px}@-webkit-keyframes passing-through{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%,70%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}100%{opacity:0;-webkit-transform:translateY(-40px);-moz-transform:translateY(-40px);-ms-transform:translateY(-40px);-o-transform:translateY(-40px);transform:translateY(-40px)}}@-moz-keyframes passing-through{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%,70%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}100%{opacity:0;-webkit-transform:translateY(-40px);-moz-transform:translateY(-40px);-ms-transform:translateY(-40px);-o-transform:translateY(-40px);transform:translateY(-40px)}}@keyframes passing-through{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%,70%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}100%{opacity:0;-webkit-transform:translateY(-40px);-moz-transform:translateY(-40px);-ms-transform:translateY(-40px);-o-transform:translateY(-40px);transform:translateY(-40px)}}@-webkit-keyframes slide-in{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}}@-moz-keyframes slide-in{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}}@keyframes slide-in{0%{opacity:0;-webkit-transform:translateY(40px);-moz-transform:translateY(40px);-ms-transform:translateY(40px);-o-transform:translateY(40px);transform:translateY(40px)}30%{opacity:1;-webkit-transform:translateY(0px);-moz-transform:translateY(0px);-ms-transform:translateY(0px);-o-transform:translateY(0px);transform:translateY(0px)}}@-webkit-keyframes
@@ -535,7 +542,7 @@ span{display:inline-block;width:14px;height:8px;margin-right:5px;-moz-border-rad
 .widget{width:100% !important}}.col-email-id{width:75px}.email-builder .builder-panel .panel-body{padding:5px
 0}.table-bordered{border-left:0}.table-bordered.email-list>thead>tr>th:first-child,.table-bordered.email-list>tbody>tr>td:first-child,.table-bordered.email-template>thead>tr>th:first-child,.table-bordered.email-template>tbody>tr>td:first-child{border-left:0px}.table-bordered.email-list>thead>tr>th:last-child,.table-bordered.email-list>tbody>tr>td:last-child,.table-bordered.email-template>thead>tr>th:last-child,.table-bordered.email-template>tbody>tr>td:last-child{border-right:0px}.email-filters{}.form-submitaction-group-header{font-size:1.1em;font-weight:bold}.form-field-wrapper{position:relative}.form-field-wrapper
 img{max-width:100%}#mauticforms_fields .mauticform-row, #mauticforms_actions .mauticform-row{padding:10px}#mauticforms_fields .mauticform-row{margin-bottom:0 !important}#mauticforms_actions .mauticform-row .action-label{font-size:1.1em;font-weight:bold;display:block}#mauticforms_actions .mauticform-row .action-descr{font-size:0.9em;display:block}#mauticforms_actions .form-buttons{float:right;margin-top:3px}#mauticforms_fields .form-buttons{position:absolute;right:8px;top:8px}#mauticforms_fields input, #mauticforms_fields textarea, #mauticforms_fields
-select{background-color:#fff;box-shadow:0px 0px 0px #fff inset;padding:0.5em 0.5em;width:50%}.mauticform-row{min-height:60px}#mauticforms_fields .panel-footer{padding:3px
+select{background-color:#fff;box-shadow:0px 0px 0px #fff inset;padding:0.5em 0.5em;width:50%}#mauticforms_fields .chosen-container-single .chosen-search input[type="text"]{width:100%}.mauticform-row{min-height:60px}#mauticforms_fields .panel-footer{padding:3px
 15px}textarea.form-html{height:200px}.col-form-id,.col-formresult-id{width:75px}.col-form-submissions{width:100px}.formresult-list th .input-group{margin-top:10px}.formresult-list th:not(.col-formresult-id):not(.col-actions){min-width:125px}.formresult-list th.col-formresult-id{min-width:125px}.inline-spacer{padding-right:20px}#mauticforms_fields input[type="date"],
 #mauticforms_fields input[type="time"],
 #mauticforms_fields input[type="datetime-local"],
@@ -555,10 +562,12 @@ dt{width:auto;text-align:left;margin-right:10px}#contact-timeline .dl-horizontal
 dd{margin-left:0px}#contact-timeline tr.timeline-row-highlighted{background-color:#fafafa}#contact-timeline tr.timeline-details
 img{max-height:200px}.frequency{width:45px!important}.fa-user:before,.fa-building:before{margin-right:6px}.inline-spacer{text-transform:capitalize}.contact{display:inline !important}.frequency-table, .frequency-table
 td{border-bottom:none!important;border-top:none!important}.frequency-values{padding-left:10px;padding-top:27px;padding-bottom:15px}.frequency-select{width:145px !important;float:right;padding-right:5px}.frequency-label{padding:8px}.frequency-date{width:100px;float:left}.panel-companies
-.primary{color:#fdb933}.col-page-id{width:75px}.page-builder .builder-panel .panel-body{padding:5px
+.primary{color:#fdb933}.building::before{content:"\f1ad";font-family:"FontAwesome";padding-right:3px}.user::before{content:"\f007";font-family:"FontAwesome";padding-right:3px}.col-page-id{width:75px}.page-builder .builder-panel .panel-body{padding:5px
 0}.symbol-hashtag:before{content:'#'}.shuffle-item.integration{width:100px}.integration-disabled
-img{filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");filter:gray;-webkit-filter:grayscale(100%);-webkit-transition:all .6s ease;-webkit-backface-visibility:hidden}.integration-disabled img:hover{filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'1 0 0 0 0, 0 1 0 0 0, 0 0 1 0 0, 0 0 0 1 0\'/></filter></svg>#grayscale");-webkit-filter:grayscale(0%)}.col-point-id,.col-pointtrigger-id{width:75px}.trigger-event-group-header{font-size:1.1em;font-weight:bold}#triggerEvents .trigger-event-row{padding:20px;margin-bottom:0 !important;border:1px
-solid #ecf0f1}#triggerEvents .trigger-event-row .event-label{font-size:1.1em;font-weight:bold;display:block}#triggerEvents .trigger-event-row .event-descr{font-size:0.9em;display:block}#triggerEvents .trigger-event-row:hover{background-color:#ecf0f1}#triggerEvents .trigger-event-row.bg-danger:hover{background-color:#f2d4d2}#triggerEvents .form-buttons{float:right}.col-pointtrigger-color{width:50px}.col-report-actions,.col-report-count{width:25px}#reportTable th:not(.col-report-count){min-width:125px}.columnSelectorButtons{padding-top:40px}.columnSelectorButtons div:not(:last-child){margin-bottom:10px}#report_columns_chosen{width:100% !important}.profile-details{margin-bottom:20px}.col-user-id,.col-role-id{width:75px}.col-user-avatar{width:75px}.mautic-logo{width:150px;margin:0
+img{filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");filter:gray;-webkit-filter:grayscale(100%);-webkit-transition:all .6s ease;-webkit-backface-visibility:hidden}.integration-disabled img:hover{filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'1 0 0 0 0, 0 1 0 0 0, 0 0 1 0 0, 0 0 0 1 0\'/></filter></svg>#grayscale");-webkit-filter:grayscale(0%)}.field-selector{width:500px}.col-centered{margin:0
+auto;float:none}.placeholder{position:relative}.placeholder::after{position:absolute;right:3px;top:19px;content:attr(data-placeholder);pointer-events:none;opacity:0.3;font-size:9px}.integration-fields{font-size:12px;padding-left:7px}.col-point-id,.col-pointtrigger-id{width:75px}.trigger-event-group-header{font-size:1.1em;font-weight:bold}#triggerEvents .trigger-event-row{padding:20px;margin-bottom:0 !important;border:1px
+solid #ecf0f1}#triggerEvents .trigger-event-row .event-label{font-size:1.1em;font-weight:bold;display:block}#triggerEvents .trigger-event-row .event-descr{font-size:0.9em;display:block}#triggerEvents .trigger-event-row:hover{background-color:#ecf0f1}#triggerEvents .trigger-event-row.bg-danger:hover{background-color:#f2d4d2}#triggerEvents .form-buttons{float:right}.col-pointtrigger-color{width:50px}.col-report-actions,.col-report-count{width:25px}#reportTable th:not(.col-report-count){min-width:125px}.columnSelectorButtons{padding-top:40px}.columnSelectorButtons div:not(:last-child){margin-bottom:10px}#report_columns_chosen{width:100% !important}#ms-report_groupBy
+ul{height:115px}.profile-details{margin-bottom:20px}.col-user-id,.col-role-id{width:75px}.col-user-avatar{width:75px}.mautic-logo{width:150px;margin:0
 auto;background:#fff}.mautic-logo > svg.mautic-logo-figure
 .circle{fill:#4e5e9e}.mautic-logo > svg.mautic-logo-figure .m,
 .mautic-logo > svg.mautic-logo-figure .m-arrow{fill:#fdb933}input:-webkit-autofill{-webkit-box-shadow:0 0 0px 1000px white inset}span.input-group-addon
diff --git a/media/css/libraries.css b/media/css/libraries.css
index f73c7f6c8bd..11aad5760e4 100644
--- a/media/css/libraries.css
+++ b/media/css/libraries.css
@@ -1,11 +1,11 @@
 
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}:focus{outline:0}.fr-element,.fr-element:focus{outline:0px
-solid transparent}.fr-box.fr-basic .fr-element{text-align:initial;color:#000;padding:10px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow-x:auto;min-height:40px}.fr-element{background:transparent;position:relative;z-index:2;-webkit-user-select:auto}.fr-element
+solid transparent}.fr-box.fr-basic .fr-element{color:#000;padding:10px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow-x:auto;min-height:40px}.fr-element{background:transparent;position:relative;z-index:2;-webkit-user-select:auto}.fr-element
 a{user-select:auto;-o-user-select:auto;-moz-user-select:auto;-khtml-user-select:auto;-webkit-user-select:auto;-ms-user-select:auto}.fr-element.fr-disabled{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element [contenteditable="false"]{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element [contenteditable="true"]{outline:0px
 solid transparent}.fr-box a.fr-floating-btn{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);border-radius:100%;-moz-border-radius:100%;-webkit-border-radius:100%;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;height:32px;width:32px;background:#fff;color:#1e88e5;-webkit-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-moz-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-ms-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-o-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;outline:none;left:0;top:0;line-height:32px;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);text-align:center;display:block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:none}.fr-box a.fr-floating-btn
 svg{-webkit-transition:transform 0.2s ease 0s;-moz-transition:transform 0.2s ease 0s;-ms-transition:transform 0.2s ease 0s;-o-transition:transform 0.2s ease 0s;fill:#1e88e5}.fr-box a.fr-floating-btn
@@ -78,7 +78,7 @@ textarea{width:100%;margin:0px
 0 1px 0;border:none;border-bottom:solid 1px #bdbdbd;color:#222;font-size:14px;padding:6px
 0 2px;background:rgba(0, 0, 0, 0);position:relative;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-popup .fr-input-line input[type="text"]:focus,
 .fr-popup .fr-input-line textarea:focus{border-bottom:solid 2px #1e88e5;margin-bottom:0px}.fr-popup .fr-input-line input + label,
-.fr-popup .fr-input-line textarea+label{position:absolute;top:0;left:0;font-size:12px;color:rgba(0, 0, 0, 0);-webkit-transition:color 0.2s ease 0s;-moz-transition:color 0.2s ease 0s;-ms-transition:color 0.2s ease 0s;-o-transition:color 0.2s ease 0s;z-index:1}.fr-popup .fr-input-line input.fr-not-empty:focus + label,
+.fr-popup .fr-input-line textarea+label{position:absolute;top:0;left:0;font-size:12px;color:rgba(0, 0, 0, 0);-webkit-transition:color 0.2s ease 0s;-moz-transition:color 0.2s ease 0s;-ms-transition:color 0.2s ease 0s;-o-transition:color 0.2s ease 0s;z-index:3;width:100%;display:block;background:#fff}.fr-popup .fr-input-line input.fr-not-empty:focus + label,
 .fr-popup .fr-input-line textarea.fr-not-empty:focus+label{color:#1e88e5}.fr-popup .fr-input-line input.fr-not-empty + label,
 .fr-popup .fr-input-line textarea.fr-not-empty+label{color:#808080}.fr-popup input,
 .fr-popup
@@ -98,40 +98,47 @@ label{cursor:pointer;margin:0
 2px;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);text-align:left;border:0px;border-top:5px solid #222;text-rendering:optimizelegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fr-toolbar::after{clear:both;display:block;content:"";height:0}.fr-toolbar.fr-rtl{text-align:right}.fr-toolbar.fr-inline{display:none;white-space:nowrap;position:absolute;margin-top:10px}.fr-toolbar.fr-inline .fr-arrow{width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #222;position:absolute;top:-9px;left:50%;margin-left:-5px;display:inline-block}.fr-toolbar.fr-inline.fr-above{margin-top:-10px;-webkit-box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);border-bottom:5px solid #222;border-top:0}.fr-toolbar.fr-inline.fr-above .fr-arrow{top:auto;bottom:-9px;border-bottom:0;border-top-color:inherit;border-top-style:solid;border-top-width:5px}.fr-toolbar.fr-top{top:0;border-radius:2px 2px 0 0;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0,0,0,0.16)}.fr-toolbar.fr-bottom{bottom:0;border-radius:0 0 2px 2px;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0,0,0,0.16)}.fr-separator{background:#ebebeb;display:block;vertical-align:top;float:left}.fr-separator+.fr-separator{display:none}.fr-separator.fr-vs{height:34px;width:1px;margin:2px}.fr-separator.fr-hs{clear:both;height:1px;width:calc(96%);margin:0
 2px}.fr-separator.fr-hidden{display:none !important}.fr-rtl .fr-separator{float:right}.fr-toolbar.fr-inline .fr-separator.fr-hs{float:none}.fr-toolbar.fr-inline .fr-separator.fr-vs{float:none;display:inline-block}.fr-visibility-helper{display:none;margin-left:0px !important}@media (min-width: 768px){.fr-visibility-helper{margin-left:1px !important}}@media (min-width: 992px){.fr-visibility-helper{margin-left:2px !important}}@media (min-width: 1200px){.fr-visibility-helper{margin-left:3px !important}}.fr-opacity-0{-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}.fr-box{position:relative}.fr-sticky{position:-webkit-sticky;position:-moz-sticky;position:-ms-sticky;position:-o-sticky;position:sticky}.fr-sticky-off{position:relative}.fr-sticky-on{position:fixed}.fr-sticky-on.fr-sticky-ios{position:absolute;left:0;right:0;width:auto !important}.fr-sticky-dummy{display:none}.fr-sticky-on+.fr-sticky-dummy,.fr-sticky-box>.fr-sticky-dummy{display:block}span.fr-sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-box .fr-counter{position:absolute;bottom:0px;padding:5px;right:0px;color:#ccc;content:attr(data-chars);font-size:15px;font-family:"Times New Roman",Georgia,Serif;z-index:1;background:#fff;border-top:solid 1px #ebebeb;border-left:solid 1px #ebebeb;border-radius:2px 0 0 0;-moz-border-radius:2px 0 0 0;-webkit-border-radius:2px 0 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box}.fr-box.fr-rtl .fr-counter{left:0px;right:auto;border-left:none;border-right:solid 1px #ebebeb;border-radius:0 2px 0 0;-moz-border-radius:0 2px 0 0;-webkit-border-radius:0 2px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box}.fr-box.fr-code-view .fr-counter{display:none}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-drag-helper{background:#1e88e5;height:2px;margin-top:-1px;-webkit-opacity:0.2;-moz-opacity:0.2;opacity:0.2;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";position:absolute;z-index:9999;display:none}.fr-drag-helper.fr-visible{display:block}.fr-dragging{-webkit-opacity:0.4;-moz-opacity:0.4;opacity:0.4;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box.fr-fullscreen{margin:0
 !important;position:fixed;top:0;left:0;bottom:0;right:0;z-index:9990 !important;width:auto !important}.fr-box.fr-fullscreen .fr-toolbar.fr-top{top:0 !important}.fr-box.fr-fullscreen .fr-toolbar.fr-bottom{bottom:0 !important}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-line-breaker{cursor:text;border-top:1px solid #1e88e5;position:fixed;z-index:2;display:none}.fr-line-breaker.fr-visible{display:block}.fr-line-breaker a.fr-floating-btn{position:absolute;left:calc(34%);top:-16px}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
-.clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element .fr-video{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element .fr-video::after{position:absolute;content:'';z-index:1;top:0;left:0;right:0;bottom:0;cursor:pointer;display:block;background:rgba(0, 0, 0, 0)}.fr-element .fr-video.fr-active>*{z-index:2;position:relative}.fr-element .fr-video>*{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}.fr-box .fr-video-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box .fr-video-resizer.fr-active{display:block}.fr-box .fr-video-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-box .fr-video-resizer .fr-handler.fr-hnw{cursor:nw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hne{cursor:ne-resize}.fr-box .fr-video-resizer .fr-handler.fr-hsw{cursor:sw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hse{cursor:se-resize}.fr-box .fr-video-resizer .fr-handler{width:12px;height:12px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){.fr-box .fr-video-resizer .fr-handler{width:10px;height:10px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}.fr-video-size-layer .fr-video-group .fr-input-line{width:calc(45%);display:inline-block}.fr-video-size-layer .fr-video-group .fr-input-line+.fr-input-line{margin-left:10px}.fr-video-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}
+.clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element .fr-video{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element .fr-video::after{position:absolute;content:'';z-index:1;top:0;left:0;right:0;bottom:0;cursor:pointer;display:block;background:rgba(0, 0, 0, 0)}.fr-element .fr-video.fr-active>*{z-index:2;position:relative}.fr-element .fr-video>*{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}.fr-box .fr-video-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box .fr-video-resizer.fr-active{display:block}.fr-box .fr-video-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-box .fr-video-resizer .fr-handler.fr-hnw{cursor:nw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hne{cursor:ne-resize}.fr-box .fr-video-resizer .fr-handler.fr-hsw{cursor:sw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hse{cursor:se-resize}.fr-box .fr-video-resizer .fr-handler{width:12px;height:12px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){.fr-box .fr-video-resizer .fr-handler{width:10px;height:10px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}.fr-video-size-layer .fr-video-group .fr-input-line{width:calc(45%);display:inline-block}.fr-video-size-layer .fr-video-group .fr-input-line+.fr-input-line{margin-left:10px}.fr-video-upload-layer{border:dashed 2px #bdbdbd;padding:25px
+0;position:relative;font-size:14px;letter-spacing:1px;line-height:140%;text-align:center}.fr-video-upload-layer:hover{background:#ebebeb}.fr-video-upload-layer.fr-drop{background:#ebebeb;border-color:#1e88e5}.fr-video-upload-layer .fr-form{-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";position:absolute;top:0;bottom:0;left:0;right:0;z-index:9999;overflow:hidden;margin:0
+!important;padding:0
+!important;width:100% !important}.fr-video-upload-layer .fr-form
+input{cursor:pointer;position:absolute;right:0px;top:0px;bottom:0px;width:500%;height:100%;margin:0px;font-size:400px}.fr-video-progress-bar-layer>h3{font-size:16px;margin:10px
+0;font-weight:normal}.fr-video-progress-bar-layer>div.fr-action-buttons{display:none}.fr-video-progress-bar-layer>div.fr-loader{background:#bcdbf7;height:10px;width:100%;margin-top:20px;overflow:hidden;position:relative}.fr-video-progress-bar-layer > div.fr-loader
+span{display:block;height:100%;width:0%;background:#1e88e5;-webkit-transition:width 0.2s ease 0s;-moz-transition:width 0.2s ease 0s;-ms-transition:width 0.2s ease 0s;-o-transition:width 0.2s ease 0s}.fr-video-progress-bar-layer > div.fr-loader.fr-indeterminate
+span{width:30% !important;position:absolute;top:0;-webkit-animation:loading 2s linear infinite;-moz-animation:loading 2s linear infinite;-o-animation:loading 2s linear infinite;animation:loading 2s linear infinite}.fr-video-progress-bar-layer.fr-error>div.fr-loader{display:none}.fr-video-progress-bar-layer.fr-error>div.fr-action-buttons{display:block}.fr-video-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}textarea.fr-code{display:none;width:100%;resize:none;-moz-resize:none;-webkit-resize:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:none;padding:10px;margin:0px;font-family:"Courier New",monospace;font-size:14px;background:#fff;color:#000;outline:none}.fr-box.fr-rtl textarea.fr-code{direction:rtl}.fr-box
 .CodeMirror{display:none}.fr-box.fr-code-view textarea.fr-code{display:block}.fr-box.fr-code-view.fr-inline{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16)}.fr-box.fr-code-view .fr-element,
@@ -141,16 +148,16 @@ body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box
 12px;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box.fr-inline .fr-command.fr-btn.html-switch
 i{font-size:14px;width:14px;text-align:center}.fr-box.fr-inline .fr-command.fr-btn.html-switch.fr-desktop:hover{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-popup .fr-emoticon{display:inline-block;font-size:20px;width:20px;padding:5px;line-height:1;cursor:default;font-weight:normal;font-family:"Apple Color Emoji","Segoe UI Emoji","NotoColorEmoji","Segoe UI Symbol","Android Emoji","EmojiSymbols";-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-popup .fr-emoticon
 img{height:20px}.fr-popup .fr-link:focus{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element
 img{cursor:pointer}.fr-image-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-image-resizer.fr-active{display:block}.fr-image-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-image-resizer .fr-handler.fr-hnw{cursor:nw-resize}.fr-image-resizer .fr-handler.fr-hne{cursor:ne-resize}.fr-image-resizer .fr-handler.fr-hsw{cursor:sw-resize}.fr-image-resizer .fr-handler.fr-hse{cursor:se-resize}.fr-image-resizer .fr-handler{width:12px;height:12px}.fr-image-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}.fr-image-resizer .fr-handler.fr-hne{right:-6px;top:-6px}.fr-image-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}.fr-image-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){.fr-image-resizer .fr-handler{width:10px;height:10px}.fr-image-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}.fr-image-resizer .fr-handler.fr-hne{right:-5px;top:-5px}.fr-image-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}.fr-image-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}.fr-image-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}.fr-image-upload-layer{border:dashed 2px #bdbdbd;padding:25px
@@ -166,16 +173,16 @@ loading{from{left:-25%}to{left:100%}}@-moz-keyframes
 loading{from{left:-25%}to{left:100%}}@-o-keyframes
 loading{from{left:-25%}to{left:100%}}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-quick-insert{position:absolute;z-index:9998;white-space:nowrap;padding-right:5px;margin-left:-5px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-quick-insert.fr-on a.fr-floating-btn
 svg{-webkit-transform:rotate(135deg);-moz-transform:rotate(135deg);-ms-transform:rotate(135deg);-o-transform:rotate(135deg)}.fr-quick-insert.fr-hidden{display:none}.fr-qi-helper{position:absolute;z-index:3;padding-left:10px;white-space:nowrap}.fr-qi-helper a.fr-btn.fr-floating-btn{text-align:center;display:inline-block;color:#222;-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0)}.fr-qi-helper a.fr-btn.fr-floating-btn.fr-size-1{-webkit-opacity:1;-moz-opacity:1;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1)}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-modal-head .fr-modal-head-line::after{clear:both;display:block;content:"";height:0}.fr-modal-head .fr-modal-head-line i.fr-modal-more{float:left;opacity:1;-webkit-transition:padding 0.2s ease 0s, width 0.2s ease 0s, opacity 0.2s ease 0s;-moz-transition:padding 0.2s ease 0s, width 0.2s ease 0s, opacity 0.2s ease 0s;-ms-transition:padding 0.2s ease 0s, width 0.2s ease 0s, opacity 0.2s ease 0s;-o-transition:padding 0.2s ease 0s, width 0.2s ease 0s, opacity 0.2s ease 0s}.fr-modal-head .fr-modal-head-line i.fr-modal-more.fr-not-available{opacity:0;width:0;padding:12px
 0}.fr-modal-head .fr-modal-tags{display:none}.fr-modal-head .fr-modal-tags
@@ -191,9 +198,9 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img{displa
 img{-webkit-opacity:0.75;-moz-opacity:0.75;opacity:0.75;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container:hover .fr-delete-img,
 .fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container:hover .fr-insert-img{display:inline-block}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container .fr-delete-img:hover{background:#bf4644;color:#fff}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img:hover{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-popup .fr-colors-tabs{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);margin-bottom:5px;line-height:16px;margin-left:-2px;margin-right:-2px}.fr-popup .fr-colors-tabs .fr-colors-tab{display:inline-block;width:50%;cursor:pointer;text-align:center;color:#222;font-size:13px;padding:8px
 0;position:relative}.fr-popup .fr-colors-tabs .fr-colors-tab:hover,
@@ -201,9 +208,9 @@ img{-webkit-opacity:0.75;-moz-opacity:0.75;opacity:0.75;-ms-filter:"progid:DXIma
 .fr-popup .fr-color-set>span:focus{outline:1px
 solid #222;z-index:2}.fr-rtl .fr-popup .fr-colors-tabs .fr-colors-tab.fr-selected-tab[data-param1="text"]~[data-param1="background"]::after{-webkit-transform:translate3d(100%, 0, 0);-moz-transform:translate3d(100%, 0, 0);-ms-transform:translate3d(100%, 0, 0);-o-transform:translate3d(100%, 0, 0)}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-file-upload-layer{border:dashed 2px #bdbdbd;padding:25px
 0;position:relative;font-size:14px;letter-spacing:1px;line-height:140%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-align:center}.fr-file-upload-layer:hover{background:#ebebeb}.fr-file-upload-layer.fr-drop{background:#ebebeb;border-color:#1e88e5}.fr-file-upload-layer .fr-form{-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";position:absolute;top:0;bottom:0;left:0;right:0;z-index:9999;overflow:hidden;margin:0
@@ -218,9 +225,9 @@ loading{from{left:-25%}to{left:100%}}@-moz-keyframes
 loading{from{left:-25%}to{left:100%}}@-o-keyframes
 loading{from{left:-25%}to{left:100%}}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element table td.fr-selected-cell,
 .fr-element table th.fr-selected-cell{border:1px
@@ -262,13 +269,13 @@ li{display:block;padding:5px
 10px;border-bottom:1px solid #DDD;cursor:pointer}.atwho-view
 small{font-size:smaller;color:#777;font-weight:normal}.fr-popup{z-index:9999 !important}div[data-slot-focus]{top:-1px;right:-1px;bottom:-1px;left:-1px;content:'';margin:0;padding:0;position:absolute;border:1px
 solid #4e5e9e;z-index:1}div[data-section-focus]{content:'';position:absolute;border:1px
-solid #fdb933}div[data-section-focus="top"]{left:0px;right:0px;top:0px}div[data-section-focus="right"]{bottom:0px;right:0px;top:0px}div[data-section-focus="bottom"]{bottom:0px;right:0px;left:0px}div[data-section-focus="left"]{bottom:0px;top:0px;left:0px}div[data-slot-toolbar]{position:absolute;top:-24px;left:-1px;right:-1px;height:25px;width:100%;z-index:10;cursor:pointer;cursor:move;background-color:#4e5e9e;border-left:1px solid #4e5e9e;border-right:1px solid #4e5e9e}div[data-slot-toolbar] .btn{width:20px;height:20px;padding:0;display:inline-block;margin-bottom:0;font-weight:600;text-align:center;vertical-align:middle;cursor:pointer;border:1px
-solid transparent;white-space:nowrap;line-height:1.3856;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:11px;line-height:1.456;float:right;margin-right:5px;color:#fff}div[data-slot-toolbar] .btn
-.fa{padding-top:4px}div[data-slot],[data-section-wrapper]{position:relative}div[data-slot="image"]{padding-top:1px;padding-bottom:1px}div[data-slot="image"] img{z-index:2;position:relative}div[data-slot].ui-sortable-helper{border:1px
+solid #fdb933}div[data-section-focus="top"]{left:0px;right:0px;top:0px}div[data-section-focus="right"]{bottom:0px;right:0px;top:0px}div[data-section-focus="bottom"]{bottom:0px;right:0px;left:0px}div[data-section-focus="left"]{bottom:0px;top:0px;left:0px}div[data-section-focus="handle"]{width:25px;height:25px;bottom:10px;left:10px;background:#4e5e9e;color:#fff;text-align:center;border:0;line-height:25px}div[data-section-focus="delete"]{width:25px;height:25px;bottom:36px;left:10px;background:#4e5e9e;color:#fff;text-align:center;border:0;line-height:25px}div[data-slot-toolbar]{position:absolute;top:-24px;left:-1px;right:-1px;height:25px;width:100%;z-index:10;cursor:pointer;cursor:move;background-color:#4e5e9e;border-left:1px solid #4e5e9e;border-right:1px solid #4e5e9e;padding-top:2px}div[data-slot-toolbar] .btn{width:20px;height:20px;padding:0;display:inline-block;margin-bottom:0;font-weight:600;text-align:center;vertical-align:middle;cursor:pointer;border:1px
+solid transparent;white-space:nowrap;line-height:1.3856;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:11px;line-height:1.456;float:right;margin-right:2px;color:#fff}div[data-slot-toolbar] .btn
+.fa{padding-top:4px}div[data-slot],[data-section-wrapper]{position:relative}div[data-slot^="image"]{padding-top:1px;padding-bottom:1px}div[data-slot^="image"] img{z-index:2;position:relative}div[data-slot].ui-sortable-helper{border:1px
 solid #4e5e9e}.slot-placeholder{border:2px
 dotted #4e5e9e}[data-slot="text"].fr-box{padding:initial}[data-slot="text"].fr-box .fr-toolbar{border-top:2px solid #4e5e9e;position:absolute;left:-15px;bottom:initial !important;min-width:385px}[data-slot="text"].fr-box .fr-toolbar.fr-top{top:-78px !important;bottom:initial !important}[data-slot="text"].fr-box .fr-toolbar.fr-bottom{bottom:-78px !important;top:initial !important}[data-slot="text"].fr-box .fr-wrapper{border-radius:0 0 0px 0px;-moz-border-radius:0 0 0px 0px;-webkit-border-radius:0 0 0px 0px;-webkit-box-shadow:none  !important;-moz-box-shadow:none  !important;box-shadow:none  !important;background:transparent !important}[data-slot="text"].fr-box .fr-wrapper .fr-element{text-align:inherit !important;padding:0
-!important;overflow-x:initial !important;color:inherit !important;min-height:inherit !important}.slot-type-handle.btn{float:left;width:111px;margin:2px;height:62px}.slot-type-handle.ui-draggable-dragging{color:#5d6c7c;background-color:#f5f5f5;border-color:#d3d3d3;padding:10px
-16px;font-size:16px;line-height:1.25;border-radius:4px;margin:2px;text-align:center}.theme-list .panel-body{height:350px}.theme-list .select-theme-link{margin-top:5px}
+!important;overflow-x:initial !important;color:inherit !important;min-height:inherit !important}.slot-type-handle.btn,.section-type-handle.btn{float:left;width:111px;margin:2px;height:75px;padding-left:5px;padding-right:5px;text-align:center;word-wrap:break-word}.slot-type-handle.ui-draggable-dragging,.section-type-handle.ui-draggable-dragging{color:#5d6c7c;background-color:#f5f5f5;border-color:#d3d3d3;padding:10px
+16px;font-size:16px;line-height:1.25;border-radius:4px;margin:2px;text-align:center}.theme-list .panel-body{height:350px}.theme-list .select-theme-link{margin-top:5px}.theme-list .select-theme-selected{margin-top:5px}[data-slot="dynamicContent"]{z-index:50}
 /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em
 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,
@@ -1110,9 +1117,9 @@ pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z
 span{*vertical-align:text-bottom}.cm-force-border{padding-right: .1px}@media
 print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:none}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1120,7 +1127,7 @@ print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:af
 .container-fluid::after,
 .row::after,
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}:focus{outline:0}.fr-element,.fr-element:focus{outline:0px
-solid transparent}.fr-box.fr-basic .fr-element{text-align:initial;color:#000;padding:10px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow-x:auto;min-height:40px}.fr-element{background:transparent;position:relative;z-index:2;-webkit-user-select:auto}.fr-element
+solid transparent}.fr-box.fr-basic .fr-element{color:#000;padding:10px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow-x:auto;min-height:40px}.fr-element{background:transparent;position:relative;z-index:2;-webkit-user-select:auto}.fr-element
 a{user-select:auto;-o-user-select:auto;-moz-user-select:auto;-khtml-user-select:auto;-webkit-user-select:auto;-ms-user-select:auto}.fr-element.fr-disabled{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element [contenteditable="false"]{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element [contenteditable="true"]{outline:0px
 solid transparent}.fr-box a.fr-floating-btn{-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);border-radius:100%;-moz-border-radius:100%;-webkit-border-radius:100%;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;height:32px;width:32px;background:#fff;color:#1e88e5;-webkit-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-moz-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-ms-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;-o-transition:background 0.2s ease 0s, color 0.2s ease 0s, transform 0.2s ease 0s;outline:none;left:0;top:0;line-height:32px;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);text-align:center;display:block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:none}.fr-box a.fr-floating-btn
 svg{-webkit-transition:transform 0.2s ease 0s;-moz-transition:transform 0.2s ease 0s;-ms-transition:transform 0.2s ease 0s;-o-transition:transform 0.2s ease 0s;fill:#1e88e5}.fr-box a.fr-floating-btn
@@ -1193,7 +1200,7 @@ textarea{width:100%;margin:0px
 0 1px 0;border:none;border-bottom:solid 1px #bdbdbd;color:#222;font-size:14px;padding:6px
 0 2px;background:rgba(0, 0, 0, 0);position:relative;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-popup .fr-input-line input[type="text"]:focus,
 .fr-popup .fr-input-line textarea:focus{border-bottom:solid 2px #1e88e5;margin-bottom:0px}.fr-popup .fr-input-line input + label,
-.fr-popup .fr-input-line textarea+label{position:absolute;top:0;left:0;font-size:12px;color:rgba(0, 0, 0, 0);-webkit-transition:color 0.2s ease 0s;-moz-transition:color 0.2s ease 0s;-ms-transition:color 0.2s ease 0s;-o-transition:color 0.2s ease 0s;z-index:1}.fr-popup .fr-input-line input.fr-not-empty:focus + label,
+.fr-popup .fr-input-line textarea+label{position:absolute;top:0;left:0;font-size:12px;color:rgba(0, 0, 0, 0);-webkit-transition:color 0.2s ease 0s;-moz-transition:color 0.2s ease 0s;-ms-transition:color 0.2s ease 0s;-o-transition:color 0.2s ease 0s;z-index:3;width:100%;display:block;background:#fff}.fr-popup .fr-input-line input.fr-not-empty:focus + label,
 .fr-popup .fr-input-line textarea.fr-not-empty:focus+label{color:#1e88e5}.fr-popup .fr-input-line input.fr-not-empty + label,
 .fr-popup .fr-input-line textarea.fr-not-empty+label{color:#808080}.fr-popup input,
 .fr-popup
@@ -1213,9 +1220,9 @@ label{cursor:pointer;margin:0
 2px;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);text-align:left;border:0px;border-top:5px solid #222;text-rendering:optimizelegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fr-toolbar::after{clear:both;display:block;content:"";height:0}.fr-toolbar.fr-rtl{text-align:right}.fr-toolbar.fr-inline{display:none;white-space:nowrap;position:absolute;margin-top:10px}.fr-toolbar.fr-inline .fr-arrow{width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #222;position:absolute;top:-9px;left:50%;margin-left:-5px;display:inline-block}.fr-toolbar.fr-inline.fr-above{margin-top:-10px;-webkit-box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 -1px 3px rgba(0, 0, 0, 0.12), 0 -1px 1px 1px rgba(0, 0, 0, 0.16);border-bottom:5px solid #222;border-top:0}.fr-toolbar.fr-inline.fr-above .fr-arrow{top:auto;bottom:-9px;border-bottom:0;border-top-color:inherit;border-top-style:solid;border-top-width:5px}.fr-toolbar.fr-top{top:0;border-radius:2px 2px 0 0;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0,0,0,0.16)}.fr-toolbar.fr-bottom{bottom:0;border-radius:0 0 2px 2px;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0,0,0,0.16)}.fr-separator{background:#ebebeb;display:block;vertical-align:top;float:left}.fr-separator+.fr-separator{display:none}.fr-separator.fr-vs{height:34px;width:1px;margin:2px}.fr-separator.fr-hs{clear:both;height:1px;width:calc(96%);margin:0
 2px}.fr-separator.fr-hidden{display:none !important}.fr-rtl .fr-separator{float:right}.fr-toolbar.fr-inline .fr-separator.fr-hs{float:none}.fr-toolbar.fr-inline .fr-separator.fr-vs{float:none;display:inline-block}.fr-visibility-helper{display:none;margin-left:0px !important}@media (min-width: 768px){.fr-visibility-helper{margin-left:1px !important}}@media (min-width: 992px){.fr-visibility-helper{margin-left:2px !important}}@media (min-width: 1200px){.fr-visibility-helper{margin-left:3px !important}}.fr-opacity-0{-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}.fr-box{position:relative}.fr-sticky{position:-webkit-sticky;position:-moz-sticky;position:-ms-sticky;position:-o-sticky;position:sticky}.fr-sticky-off{position:relative}.fr-sticky-on{position:fixed}.fr-sticky-on.fr-sticky-ios{position:absolute;left:0;right:0;width:auto !important}.fr-sticky-dummy{display:none}.fr-sticky-on+.fr-sticky-dummy,.fr-sticky-box>.fr-sticky-dummy{display:block}span.fr-sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1224,9 +1231,9 @@ label{cursor:pointer;margin:0
 .row::after,
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-box .fr-counter{position:absolute;bottom:0px;padding:5px;right:0px;color:#ccc;content:attr(data-chars);font-size:15px;font-family:"Times New Roman",Georgia,Serif;z-index:1;background:#fff;border-top:solid 1px #ebebeb;border-left:solid 1px #ebebeb;border-radius:2px 0 0 0;-moz-border-radius:2px 0 0 0;-webkit-border-radius:2px 0 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box}.fr-box.fr-rtl .fr-counter{left:0px;right:auto;border-left:none;border-right:solid 1px #ebebeb;border-radius:0 2px 0 0;-moz-border-radius:0 2px 0 0;-webkit-border-radius:0 2px 0 0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box}.fr-box.fr-code-view .fr-counter{display:none}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1235,16 +1242,16 @@ label{cursor:pointer;margin:0
 .row::after,
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-drag-helper{background:#1e88e5;height:2px;margin-top:-1px;-webkit-opacity:0.2;-moz-opacity:0.2;opacity:0.2;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";position:absolute;z-index:9999;display:none}.fr-drag-helper.fr-visible{display:block}.fr-dragging{-webkit-opacity:0.4;-moz-opacity:0.4;opacity:0.4;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box.fr-fullscreen{margin:0
 !important;position:fixed;top:0;left:0;bottom:0;right:0;z-index:9990 !important;width:auto !important}.fr-box.fr-fullscreen .fr-toolbar.fr-top{top:0 !important}.fr-box.fr-fullscreen .fr-toolbar.fr-bottom{bottom:0 !important}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1253,20 +1260,27 @@ body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box
 .row::after,
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-line-breaker{cursor:text;border-top:1px solid #1e88e5;position:fixed;z-index:2;display:none}.fr-line-breaker.fr-visible{display:block}.fr-line-breaker a.fr-floating-btn{position:absolute;left:calc(34%);top:-16px}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
 .container::after,
 .container-fluid::after,
 .row::after,
-.form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element .fr-video{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element .fr-video::after{position:absolute;content:'';z-index:1;top:0;left:0;right:0;bottom:0;cursor:pointer;display:block;background:rgba(0, 0, 0, 0)}.fr-element .fr-video.fr-active>*{z-index:2;position:relative}.fr-element .fr-video>*{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}.fr-box .fr-video-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box .fr-video-resizer.fr-active{display:block}.fr-box .fr-video-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-box .fr-video-resizer .fr-handler.fr-hnw{cursor:nw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hne{cursor:ne-resize}.fr-box .fr-video-resizer .fr-handler.fr-hsw{cursor:sw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hse{cursor:se-resize}.fr-box .fr-video-resizer .fr-handler{width:12px;height:12px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){.fr-box .fr-video-resizer .fr-handler{width:10px;height:10px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}.fr-video-size-layer .fr-video-group .fr-input-line{width:calc(45%);display:inline-block}.fr-video-size-layer .fr-video-group .fr-input-line+.fr-input-line{margin-left:10px}.fr-video-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}
+.form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-element .fr-video{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-element .fr-video::after{position:absolute;content:'';z-index:1;top:0;left:0;right:0;bottom:0;cursor:pointer;display:block;background:rgba(0, 0, 0, 0)}.fr-element .fr-video.fr-active>*{z-index:2;position:relative}.fr-element .fr-video>*{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}.fr-box .fr-video-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box .fr-video-resizer.fr-active{display:block}.fr-box .fr-video-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fr-box .fr-video-resizer .fr-handler.fr-hnw{cursor:nw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hne{cursor:ne-resize}.fr-box .fr-video-resizer .fr-handler.fr-hsw{cursor:sw-resize}.fr-box .fr-video-resizer .fr-handler.fr-hse{cursor:se-resize}.fr-box .fr-video-resizer .fr-handler{width:12px;height:12px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-6px;top:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){.fr-box .fr-video-resizer .fr-handler{width:10px;height:10px}.fr-box .fr-video-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hne{right:-5px;top:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}.fr-box .fr-video-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}.fr-video-size-layer .fr-video-group .fr-input-line{width:calc(45%);display:inline-block}.fr-video-size-layer .fr-video-group .fr-input-line+.fr-input-line{margin-left:10px}.fr-video-upload-layer{border:dashed 2px #bdbdbd;padding:25px
+0;position:relative;font-size:14px;letter-spacing:1px;line-height:140%;text-align:center}.fr-video-upload-layer:hover{background:#ebebeb}.fr-video-upload-layer.fr-drop{background:#ebebeb;border-color:#1e88e5}.fr-video-upload-layer .fr-form{-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";position:absolute;top:0;bottom:0;left:0;right:0;z-index:9999;overflow:hidden;margin:0
+!important;padding:0
+!important;width:100% !important}.fr-video-upload-layer .fr-form
+input{cursor:pointer;position:absolute;right:0px;top:0px;bottom:0px;width:500%;height:100%;margin:0px;font-size:400px}.fr-video-progress-bar-layer>h3{font-size:16px;margin:10px
+0;font-weight:normal}.fr-video-progress-bar-layer>div.fr-action-buttons{display:none}.fr-video-progress-bar-layer>div.fr-loader{background:#bcdbf7;height:10px;width:100%;margin-top:20px;overflow:hidden;position:relative}.fr-video-progress-bar-layer > div.fr-loader
+span{display:block;height:100%;width:0%;background:#1e88e5;-webkit-transition:width 0.2s ease 0s;-moz-transition:width 0.2s ease 0s;-ms-transition:width 0.2s ease 0s;-o-transition:width 0.2s ease 0s}.fr-video-progress-bar-layer > div.fr-loader.fr-indeterminate
+span{width:30% !important;position:absolute;top:0;-webkit-animation:loading 2s linear infinite;-moz-animation:loading 2s linear infinite;-o-animation:loading 2s linear infinite;animation:loading 2s linear infinite}.fr-video-progress-bar-layer.fr-error>div.fr-loader{display:none}.fr-video-progress-bar-layer.fr-error>div.fr-action-buttons{display:block}.fr-video-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1281,9 +1295,9 @@ body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box
 12px;-webkit-transition:background 0.2s ease 0s;-moz-transition:background 0.2s ease 0s;-ms-transition:background 0.2s ease 0s;-o-transition:background 0.2s ease 0s;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;z-index:2;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;text-decoration:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}.fr-box.fr-inline .fr-command.fr-btn.html-switch
 i{font-size:14px;width:14px;text-align:center}.fr-box.fr-inline .fr-command.fr-btn.html-switch.fr-desktop:hover{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1293,9 +1307,9 @@ i{font-size:14px;width:14px;text-align:center}.fr-box.fr-inline .fr-command.fr-b
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.fr-popup .fr-emoticon{display:inline-block;font-size:20px;width:20px;padding:5px;line-height:1;cursor:default;font-weight:normal;font-family:"Apple Color Emoji","Segoe UI Emoji","NotoColorEmoji","Segoe UI Symbol","Android Emoji","EmojiSymbols";-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-popup .fr-emoticon
 img{height:20px}.fr-popup .fr-link:focus{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1316,9 +1330,9 @@ loading{from{left:-25%}to{left:100%}}@-moz-keyframes
 loading{from{left:-25%}to{left:100%}}@-o-keyframes
 loading{from{left:-25%}to{left:100%}}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1328,9 +1342,9 @@ loading{from{left:-25%}to{left:100%}}
 .form-horizontal .form-group::after,.btn-toolbar::after,.btn-group-vertical>.btn-group::after,.nav::after,.navbar::after,.navbar-header::after,.navbar-collapse::after,.pager::after,.panel-body::after,.modal-footer::after{clear:both;display:block;content:"";height:0}.hide-by-clipping{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.fr-quick-insert{position:absolute;z-index:9998;white-space:nowrap;padding-right:5px;margin-left:-5px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fr-quick-insert.fr-on a.fr-floating-btn
 svg{-webkit-transform:rotate(135deg);-moz-transform:rotate(135deg);-ms-transform:rotate(135deg);-o-transform:rotate(135deg)}.fr-quick-insert.fr-hidden{display:none}.fr-qi-helper{position:absolute;z-index:3;padding-left:10px;white-space:nowrap}.fr-qi-helper a.fr-btn.fr-floating-btn{text-align:center;display:inline-block;color:#222;-webkit-opacity:0;-moz-opacity:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0)}.fr-qi-helper a.fr-btn.fr-floating-btn.fr-size-1{-webkit-opacity:1;-moz-opacity:1;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";-webkit-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1)}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1351,9 +1365,9 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img{displa
 img{-webkit-opacity:0.75;-moz-opacity:0.75;opacity:0.75;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container:hover .fr-delete-img,
 .fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container:hover .fr-insert-img{display:inline-block}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container .fr-delete-img:hover{background:#bf4644;color:#fff}.fr-desktop .fr-modal-wrapper div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img:hover{background:#ebebeb}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1366,9 +1380,9 @@ img{-webkit-opacity:0.75;-moz-opacity:0.75;opacity:0.75;-ms-filter:"progid:DXIma
 .fr-popup .fr-color-set>span:focus{outline:1px
 solid #222;z-index:2}.fr-rtl .fr-popup .fr-colors-tabs .fr-colors-tab.fr-selected-tab[data-param1="text"]~[data-param1="background"]::after{-webkit-transform:translate3d(100%, 0, 0);-moz-transform:translate3d(100%, 0, 0);-ms-transform:translate3d(100%, 0, 0);-o-transform:translate3d(100%, 0, 0)}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
@@ -1388,9 +1402,9 @@ loading{from{left:-25%}to{left:100%}}@-moz-keyframes
 loading{from{left:-25%}to{left:100%}}@-o-keyframes
 loading{from{left:-25%}to{left:100%}}
 /*!
- * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.4.2 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2016 Froala Labs
+ * Copyright 2014-2017 Froala Labs
  */
 .clearfix::after,
 .dl-horizontal dd::after,
diff --git a/media/js/app.js b/media/js/app.js
index 8ad61ff356d..3206d33bdf3 100644
--- a/media/js/app.js
+++ b/media/js/app.js
@@ -16,7 +16,7 @@ return;}
 Mautic.headLoadedAssets[url]=1;mQuery.getScript(url,function(data,textStatus,jqxhr){if(textStatus=='success'){if(onLoadCallback&&typeof Mautic[onLoadCallback]=='function'){Mautic[onLoadCallback]();}else if(typeof Mautic[mauticContent+"OnLoad"]=='function'){if(typeof Mautic.loadedContent[mauticContent]=='undefined'){Mautic.loadedContent[mauticContent]=true;Mautic[mauticContent+"OnLoad"]('#app-content',{});}}}});},loadStylesheet:function(url){if(typeof Mautic.headLoadedAssets=='undefined'){Mautic.headLoadedAssets={};}else if(typeof Mautic.headLoadedAssets[url]!='undefined'){return;}
 Mautic.headLoadedAssets[url]=1;var link=document.createElement("link");link.type="text/css";link.rel="stylesheet";link.href=url;mQuery('head').append(link);},startIconSpinOnEvent:function(target){if(MauticVars.ignoreIconSpin){MauticVars.ignoreIconSpin=false;return;}
 if(typeof target=='object'&&typeof(target.target)!=='undefined'){target=target.target;}
-if(mQuery(target).length){var hasBtn=mQuery(target).hasClass('btn');var hasIcon=mQuery(target).hasClass('fa');var i=(hasBtn&&mQuery(target).find('i.fa').length)?mQuery(target).find('i.fa'):target;if((hasBtn&&mQuery(target).find('i.fa').length)||hasIcon){var el=(hasIcon)?target:mQuery(target).find('i.fa').first();var identifierClass=(new Date).getTime();MauticVars.iconClasses[identifierClass]=mQuery(el).attr('class');var specialClasses=['fa-fw','fa-lg','fa-2x','fa-3x','fa-4x','fa-5x','fa-li','text-white','text-muted'];var appendClasses="";for(var i=0;i<specialClasses.length;i++){if(mQuery(el).hasClass(specialClasses[i])){appendClasses+=" "+specialClasses[i];}}
+if(mQuery(target).length){var hasBtn=mQuery(target).hasClass('btn');var hasIcon=mQuery(target).hasClass('fa');var dontspin=mQuery(target).hasClass('btn-nospin');var i=(hasBtn&&mQuery(target).find('i.fa').length)?mQuery(target).find('i.fa'):target;if(!dontspin&&((hasBtn&&mQuery(target).find('i.fa').length)||hasIcon)){var el=(hasIcon)?target:mQuery(target).find('i.fa').first();var identifierClass=(new Date).getTime();MauticVars.iconClasses[identifierClass]=mQuery(el).attr('class');var specialClasses=['fa-fw','fa-lg','fa-2x','fa-3x','fa-4x','fa-5x','fa-li','text-white','text-muted'];var appendClasses="";for(var i=0;i<specialClasses.length;i++){if(mQuery(el).hasClass(specialClasses[i])){appendClasses+=" "+specialClasses[i];}}
 mQuery(el).removeClass();mQuery(el).addClass('fa fa-spinner fa-spin '+identifierClass+appendClasses);}}},stopIconSpinPostEvent:function(specificId){if(typeof specificId!='undefined'&&specificId in MauticVars.iconClasses){mQuery('.'+specificId).removeClass('fa fa-spinner fa-spin '+specificId).addClass(MauticVars.iconClasses[specificId]);delete MauticVars.iconClasses[specificId];}else{mQuery.each(MauticVars.iconClasses,function(index,value){mQuery('.'+index).removeClass('fa fa-spinner fa-spin '+index).addClass(value);});MauticVars.iconClasses={};}},redirectWithBackdrop:function(url){Mautic.activateBackdrop();setTimeout(function(){window.location=url;},50);},activateBackdrop:function(hideWait){if(!mQuery('#mautic-backdrop').length){var container=mQuery('<div />',{id:'mautic-backdrop'});mQuery('<div />',{'class':'modal-backdrop fade in'}).appendTo(container);if(typeof hideWait=='undefined'){mQuery('<div />',{"class":'mautic-pleasewait'}).html(mauticLang.pleaseWait).appendTo(container);}
 container.appendTo('body');}},deactivateBackgroup:function(){if(mQuery('#mautic-backdrop').length){mQuery('#mautic-backdrop').remove();}},executeAction:function(action,callback){if(typeof Mautic.activeActions=='undefined'){Mautic.activeActions={};}else if(typeof Mautic.activeActions[action]!='undefined'){return;}
 Mautic.activeActions[action]=true;Mautic.dismissConfirmation();if(action.indexOf('batchExport')>=0){Mautic.initiateFileDownload(action);return;}
@@ -62,15 +62,17 @@ event.preventDefault();if(!mQuery(this).hasClass('btn-nospin')){Mautic.startIcon
 mQuery('#'+id).click();});});}}else{mQuery('.toolbar-action-buttons').addClass('hide');if(mQuery('.toolbar-form-buttons').hasClass('hide')){mQuery(container+' .bottom-form-buttons').addClass('hide');var buttons=mQuery(container+" .bottom-form-buttons").html();mQuery(container+' .toolbar-form-buttons .toolbar-standard').html('');mQuery(container+' .toolbar-form-buttons .toolbar-dropdown .drop-menu').html('');var lastIndex=mQuery(buttons).filter("button").length-1;mQuery(buttons).filter("button").each(function(i,v){var id=mQuery(this).attr('id');var buttonClick=function(event){event.preventDefault();if(!mQuery(this).hasClass('btn-dnd')){mQuery(this).parent().find('button').prop('disabled',true);}
 Mautic.startIconSpinOnEvent(event);mQuery('#'+id).click();};mQuery("<button type='button' />").addClass(mQuery(this).attr('class')).addClass('btn-copy').attr('id',mQuery(this).attr('id')+'_toolbar').html(mQuery(this).html()).on('click.ajaxform',buttonClick).appendTo('.toolbar-form-buttons .toolbar-standard');if(i===lastIndex){mQuery(".toolbar-form-buttons .toolbar-dropdown .btn-main").off('.ajaxform').attr('id',mQuery(this).attr('id')+'_toolbar_mobile').html(mQuery(this).html()).on('click.ajaxform',buttonClick);}else{mQuery("<a />").attr('id',mQuery(this).attr('id')+'_toolbar_mobile').html(mQuery(this).html()).on('click.ajaxform',buttonClick).appendTo(mQuery('<li />').prependTo('.toolbar-form-buttons .toolbar-dropdown .dropdown-menu'))}});mQuery('.toolbar-form-buttons').removeClass('hide');}}});Mautic.activateGlobalFroalaOptions();if(mQuery(container+' textarea.editor').length){mQuery(container+' textarea.editor').each(function(){var textarea=mQuery(this);if(textarea.hasClass('editor-builder-tokens')){textarea.on('froalaEditor.initialized',function(e,editor){Mautic.initAtWho(editor.$el,textarea.attr('data-token-callback'),editor);});textarea.on('froalaEditor.focus',function(e,editor){Mautic.initAtWho(editor.$el,textarea.attr('data-token-callback'),editor);});}
 textarea.on('froalaEditor.blur',function(e,editor){editor.popups.hideAll();});var maxButtons=['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'];var minButtons=['undo','redo','|','bold','italic','underline'];if(textarea.hasClass('editor-email')){maxButtons=mQuery.grep(maxButtons,function(value){return value!='insertGatedVideo';});maxButtons.push('dynamicContent');}
-if(textarea.hasClass('editor-dynamic-content')){minButtons=['undo','redo','|','bold','italic','underline','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','insertLink','insertImage'];}
+if(textarea.hasClass('editor-dynamic-content')){minButtons=['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'];}
 if(textarea.hasClass('editor-advanced')||textarea.hasClass('editor-basic-fullpage')){var options={toolbarButtons:maxButtons,toolbarButtonsMD:maxButtons,heightMin:300};if(textarea.hasClass('editor-basic-fullpage')){options.fullPage=true;options.htmlAllowedTags=['.*'];options.htmlAllowedAttrs=['.*'];options.htmlRemoveTags=[];options.lineBreakerTags=[];}
 textarea.on('froalaEditor.focus',function(e,editor){Mautic.showChangeThemeWarning=true;});textarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,options));}else{textarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{toolbarButtons:minButtons,toolbarButtonsMD:minButtons,toolbarButtonsSM:minButtons,toolbarButtonsXS:minButtons,heightMin:100}));}});}
 if(mQuery(container+' .shuffle-grid').length){var grid=mQuery(container+" .shuffle-grid");setTimeout(function(){grid.shuffle({itemSelector:".shuffle",sizer:false});mQuery("html").on("fa.sidebar.minimize",function(){grid.shuffle("update");}).on("fa.sidebar.maximize",function(){grid.shuffle("update");});if(grid.parents('.tab-pane').length){var tabId=grid.parents('.tab-pane').first().attr('id');var tab=mQuery('a[href="#'+tabId+'"]').on('shown.bs.tab',function(){grid.shuffle("update");});}},1000);}
 if(mQuery(container+' .dropdown-menu-form').length){mQuery(container+' .dropdown-menu-form').on('click',function(e){e.stopPropagation();});}
 if(response&&response.updateSelect&&typeof response.id!=='undefined'){Mautic.updateEntitySelect(response);}
 var contentSpecific=false;if(response&&response.mauticContent){contentSpecific=response.mauticContent;}else if(container=='body'){contentSpecific=mauticContent;}
+if(response&&response.sidebar){var sidebarContent=mQuery('.app-sidebar.sidebar-left');var newSidebar=mQuery(response.sidebar);var nav=sidebarContent.find('li');if(nav.length){var openNavIndex;nav.each(function(i,el){var $el=mQuery(el);if($el.hasClass('open')){openNavIndex=i;}});var openNav=mQuery(newSidebar.find('li')[openNavIndex]);openNav.addClass('open');openNav.find('ul').removeClass('collapse');}
+sidebarContent.html(newSidebar);}
 if(container=='#app-content'||container=='body'){Mautic.bindGlobalKeyboardShortcuts();mQuery(".sidebar-left a[data-toggle='ajax']").on('click.ajax',function(event){mQuery("html").removeClass('sidebar-open-ltr');});mQuery('.sidebar-right a[data-toggle="ajax"]').on('click.ajax',function(event){mQuery("html").removeClass('sidebar-open-rtl');});}
-if(contentSpecific&&typeof Mautic[contentSpecific+"OnLoad"]=='function'){if(typeof Mautic[contentSpecific+"OnLoad"]=='function'){if(typeof Mautic.loadedContent[contentSpecific]=='undefined'){Mautic.loadedContent[contentSpecific]=true;Mautic[contentSpecific+"OnLoad"](container,response);}}}
+if(contentSpecific&&typeof Mautic[contentSpecific+"OnLoad"]=='function'){if(typeof Mautic.loadedContent[contentSpecific]=='undefined'){Mautic.loadedContent[contentSpecific]=true;Mautic[contentSpecific+"OnLoad"](container,response);}}
 if(!inModal&&container=='body'){mQuery('#notificationsDropdown').on('click',function(e){if(mQuery(e.target).hasClass('do-not-close')){e.stopPropagation();}});if(mQuery('#globalSearchContainer').length){mQuery('#globalSearchContainer .search-button').click(function(){mQuery('#globalSearchContainer').addClass('active');if(mQuery('#globalSearchInput').val()){mQuery('#globalSearchDropdown').addClass('open');}
 setTimeout(function(){mQuery('#globalSearchInput').focus();},100);mQuery('body').on('click.globalsearch',function(event){var target=event.target;if(!mQuery(target).parents('#globalSearchContainer').length&&!mQuery(target).parents('#globalSearchDropdown').length){Mautic.closeGlobalSearchResults();}});});mQuery("#globalSearchInput").on('change keyup paste',function(){if(mQuery(this).val()){mQuery('#globalSearchDropdown').addClass('open');}else{mQuery('#globalSearchDropdown').removeClass('open');}});Mautic.activateLiveSearch("#globalSearchInput","lastGlobalSearchStr","globalLivecache");}}
 Mautic.renderCharts(container);Mautic.renderMaps(container);Mautic.stopIconSpinPostEvent();if((response&&typeof response.stopPageLoading!='undefined'&&response.stopPageLoading)||container=='#app-content'||container=='.page-list'){Mautic.stopPageLoadingBar();}};Mautic.onPageUnload=function(container,response){if(typeof container!='undefined'){mQuery(container+" *[data-toggle='tooltip']").tooltip('destroy');if(typeof MauticVars.modalsReset=='undefined'){MauticVars.modalsReset={};}
@@ -79,7 +81,7 @@ var contentSpecific=false;if(container=='#app-content'){Mousetrap.reset();conten
 if(typeof Mautic.mapObjects!=='undefined'){mQuery.each(Mautic.mapObjects,function(i,map){Mautic.destroyMap(map);});Mautic.mapObjects=[];}
 if(typeof Mautic.builderTokens!=='undefined'){Mautic.builderTokens={};}}else if(response&&response.mauticContent){contentSpecific=response.mauticContent;}
 if(contentSpecific){if(typeof Mautic[contentSpecific+"OnUnload"]=='function'){Mautic[contentSpecific+"OnUnload"](container,response);}
-if(typeof(Mautic.loadedContent[contentSpecific])){delete Mautic.loadedContent[contentSpecific];}}};Mautic.ajaxifyLink=function(el,event){if(mQuery(el).hasClass('disabled')){return false;}
+if(typeof Mautic.loadedContent[contentSpecific]!=='undefined'){delete Mautic.loadedContent[contentSpecific];}}};Mautic.ajaxifyLink=function(el,event){if(mQuery(el).hasClass('disabled')){return false;}
 var route=mQuery(el).attr('href');if(route.indexOf('javascript')>=0||MauticVars.routeInProgress===route){return false;}
 if(route.indexOf('batchExport')>=0){Mautic.initiateFileDownload(route);return true;}
 if(event.ctrlKey||event.metaKey){route=route.split("?")[0];window.open(route,'_blank');return;}
@@ -88,14 +90,14 @@ var link=mQuery(el).attr('data-menu-link');if(link!==undefined&&link.charAt(0)!=
 var method=mQuery(el).attr('data-method');if(!method){method='GET'}
 MauticVars.routeInProgress=route;var target=mQuery(el).attr('data-target');if(!target){target=null;}
 var showLoadingBar=(mQuery(el).attr('data-hide-loadingbar'))?false:true;if(mQuery('#globalSearchContainer').length&&mQuery('#globalSearchContainer').hasClass('active')){Mautic.closeGlobalSearchResults();}
-Mautic.loadContent(route,link,method,target,showLoadingBar);};Mautic.activateChosenSelect=function(el,ignoreGlobal){if(mQuery(el).parents('.no-chosen').length&&!ignoreGlobal){return;}
+Mautic.loadContent(route,link,method,target,showLoadingBar);};Mautic.activateChosenSelect=function(el,ignoreGlobal,jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;if(mQuery(el).parents('.no-chosen').length&&!ignoreGlobal){return;}
 var noResultsText=mQuery(el).data('no-results-text');if(!noResultsText){noResultsText=mauticLang['chosenNoResults'];}
 var isLookup=mQuery(el).attr('data-chosen-lookup');if(isLookup){if(mQuery(el).attr('data-new-route')){mQuery(el).on('change',function(){var url=mQuery(el).attr('data-new-route');if(mQuery(el).val()=='new'&&(mQuery(el).attr('data-popup')=="true"||mQuery(el).closest('.modal').length>0)){var queryGlue=url.indexOf('?')>=0?'&':'?';mQuery(el).find('option[value="new"]').prop('selected',false);mQuery(el).trigger('chosen:updated');Mautic.loadNewWindow({"windowUrl":url+queryGlue+"contentOnly=1&updateSelect="+mQuery(el).attr('id')});}else{Mautic.loadAjaxModalBySelectValue(this,'new',url,mQuery(el).attr('data-header'));}});}
 var multiPlaceholder=mauticLang['mautic.core.lookup.search_options'],singlePlaceholder=mauticLang['mautic.core.lookup.search_options'];}else{var multiPlaceholder=mauticLang['chosenChooseMore'],singlePlaceholder=mauticLang['chosenChooseOne'];}
 if(typeof mQuery(el).data('chosen-placeholder')!=='undefined'){multiPlaceholder=singlePlaceholder=mQuery(el).data('chosen-placeholder');}
-mQuery(el).chosen({placeholder_text_multiple:multiPlaceholder,placeholder_text_single:singlePlaceholder,no_results_text:noResultsText,width:"100%",allow_single_deselect:true,include_group_label_in_selected:true,search_contains:true});if(isLookup){var searchTerm=mQuery(el).attr('data-model');if(searchTerm){mQuery(el).ajaxChosen({type:'GET',url:mauticAjaxUrl+'?action='+mQuery(el).attr('data-chosen-lookup'),dataType:'json',afterTypeDelay:2,minTermLength:2,jsonTermKey:searchTerm,keepTypingMsg:"Keep typing...",lookingForMsg:"Looking for"});}}};Mautic.activateFieldTypeahead=function(field,target,options,action){if(options){var keys=values=[];options=options.split('||');if(options.length==2){keys=options[1].split('|');values=options[0].split('|');}else{values=options[0].split('|');}
+mQuery(el).chosen({placeholder_text_multiple:multiPlaceholder,placeholder_text_single:singlePlaceholder,no_results_text:noResultsText,width:"100%",allow_single_deselect:true,include_group_label_in_selected:true,search_contains:true});if(isLookup){var searchTerm=mQuery(el).attr('data-model');if(searchTerm){mQuery(el).ajaxChosen({type:'GET',url:mauticAjaxUrl+'?action='+mQuery(el).attr('data-chosen-lookup'),dataType:'json',afterTypeDelay:2,minTermLength:2,jsonTermKey:searchTerm,keepTypingMsg:"Keep typing...",lookingForMsg:"Looking for"});}}};Mautic.activateFieldTypeahead=function(field,target,options,action){if(options&&typeof options==='String'){var keys=values=[];options=options.split('||');if(options.length==2){keys=options[1].split('|');values=options[0].split('|');}else{values=options[0].split('|');}
 var fieldTypeahead=Mautic.activateTypeahead('#'+field,{dataOptions:values,dataOptionKeys:keys,minLength:0});}else{var fieldTypeahead=Mautic.activateTypeahead('#'+field,{prefetch:true,remote:true,action:action+"&field="+target});}
-mQuery(fieldTypeahead).on('typeahead:selected',function(event,datum){if(mQuery("#"+field).length&&datum["value"]){mQuery("#"+field).val(datum["value"]);}}).on('typeahead:autocompleted',function(event,datum){if(mQuery("#"+field).length&&datum["value"]){mQuery("#"+field).val(datum["value"]);}});};Mautic.activateMultiSelect=function(el){var moveOption=function(v,prev){var theOption=mQuery(el).find('option[value="'+v+'"]').first();var lastSelected=mQuery(el).find('option:not(:disabled)').filter(function(){return mQuery(this).prop('selected');}).last();if(typeof prev!=='undefined'){if(prev){var prevOption=mQuery(el).find('option[value="'+prev+'"]').first();theOption.insertAfter(prevOption);return;}}else if(lastSelected.length){theOption.insertAfter(lastSelected);return;}
+var callback=function(event,datum){if(mQuery("#"+field).length&&datum["value"]){mQuery("#"+field).val(datum["value"]);var lookupCallback=mQuery('#'+field).data("lookup-callback");if(lookupCallback&&typeof Mautic[lookupCallback]=='function'){Mautic[lookupCallback](field,datum);}}};mQuery(fieldTypeahead).on('typeahead:selected',callback).on('typeahead:autocompleted',callback);};Mautic.activateMultiSelect=function(el){var moveOption=function(v,prev){var theOption=mQuery(el).find('option[value="'+v+'"]').first();var lastSelected=mQuery(el).find('option:not(:disabled)').filter(function(){return mQuery(this).prop('selected');}).last();if(typeof prev!=='undefined'){if(prev){var prevOption=mQuery(el).find('option[value="'+prev+'"]').first();theOption.insertAfter(prevOption);return;}}else if(lastSelected.length){theOption.insertAfter(lastSelected);return;}
 theOption.prependTo(el);};mQuery(el).multiSelect({afterInit:function(container){var funcName=mQuery(el).data('afterInit');if(funcName){Mautic[funcName]('init',container);}
 var selectThat=this,$selectableSearch=this.$selectableUl.prev(),$selectionSearch=this.$selectionUl.prev(),selectableSearchString='#'+this.$container.attr('id')+' .ms-elem-selectable:not(.ms-selected)',selectionSearchString='#'+this.$container.attr('id')+' .ms-elem-selection.ms-selected';this.qs1=$selectableSearch.quicksearch(selectableSearchString).on('keydown',function(e){if(e.which===40){selectThat.$selectableUl.focus();return false;}});this.qs2=$selectionSearch.quicksearch(selectionSearchString).on('keydown',function(e){if(e.which==40){selectThat.$selectionUl.focus();return false;}});var selectOrder=mQuery(el).data('order');if(selectOrder&&selectOrder.length>1){this.deselect_all();mQuery.each(selectOrder,function(k,v){selectThat.select(v);});}
 var isSortable=mQuery(el).data('sortable');if(isSortable){mQuery(el).parent('.choice-wrapper').find('.ms-selection').first().sortable({items:'.ms-elem-selection',helper:function(e,ui){ui.width(mQuery(el).width());return ui;},axis:'y',scroll:false,update:function(event,ui){var prev=ui.item.prev();var prevValue=(prev.length)?prev.data('ms-value'):'';moveOption(ui.item.data('ms-value'),prevValue);}});}},afterSelect:function(value){var funcName=mQuery(el).data('afterSelect');if(funcName){Mautic[funcName]('select',value);}
@@ -117,7 +119,8 @@ mQuery(el).on('change',function(){var filterVal=mQuery(this).val();if(filterVal=
 if(prefixExceptions){var limited=prefixExceptions.split(',');if(filterVal.length>1){for(var i=0;i<filterVal.length;i++){if(mQuery.inArray(filterVal[i],Mautic.listFilterValues[filterName])==-1){var newOption=mQuery(this).find('option[value="'+filterVal[i]+'"]');var prefix=mQuery(newOption).parent().data('prefix');if(mQuery.inArray(prefix,limited)!=-1){mQuery(newOption).siblings().prop('selected',false);filterVal=mQuery(this).val();mQuery(this).trigger('chosen:updated');}}}}
 Mautic.listFilterValues[filterName]=filterVal;}
 var tmpl=mQuery(this).data('tmpl');if(!tmpl){tmpl='list';}
-var filters=(isMultiple)?JSON.stringify(filterVal):filterVal;var request=window.location.pathname+'?tmpl='+tmpl+'&'+filterName+'='+filters;Mautic.loadContent(request,'','POST',mQuery(this).data('target'));});};Mautic.activateColorPicker=function(el){var pickerOptions=mQuery(el).data('color-options');if(!pickerOptions){pickerOptions={theme:'bootstrap',change:function(hex,opacity){mQuery(el).trigger('change.minicolors',hex);}};}
+var filters=(isMultiple)?JSON.stringify(filterVal):filterVal;var request=window.location.pathname+'?tmpl='+tmpl+'&'+filterName+'='+filters;Mautic.loadContent(request,'','POST',mQuery(this).data('target'));});};Mautic.activateColorPicker=function(el,options){var pickerOptions=mQuery(el).data('color-options');if(!pickerOptions){pickerOptions={theme:'bootstrap',change:function(hex,opacity){mQuery(el).trigger('change.minicolors',hex);}};}
+if(typeof options=='object'){pickerOptions=mQuery.extend(pickerOptions,options);}
 mQuery(el).minicolors(pickerOptions);};Mautic.activateTypeahead=function(el,options){if(typeof options=='undefined'||!mQuery(el).length){return;}
 if(typeof options.remote=='undefined'){options.remote=(options.action)?true:false;}
 if(typeof options.prefetch=='undefined'){options.prefetch=false;}
@@ -137,57 +140,79 @@ matches.push(match);}});cb(matches);};};var lookupOptions=(options.dataOptions)?
 var theName=el.replace(/[^a-z0-9\s]/gi,'').replace(/[-\s]/g,'_');var theTypeahead=mQuery(el).typeahead({hint:true,highlight:true,minLength:options.minLength,multiple:options.multiple},{name:theName,displayKey:options.displayKey,source:(typeof theBloodhound!='undefined')?theBloodhound.ttAdapter():substringMatcher(lookupOptions,lookupKeys)}).on('keypress',function(event){if((event.keyCode||event.which)==13){mQuery(el).typeahead('close');}}).on('focus',function(){if(mQuery(el).typeahead('val')===''&&!options.minLength){mQuery(el).data('ttTypeahead').input.trigger('queryChanged','');}});return theTypeahead;};Mautic.activateSortable=function(el){var prefix=mQuery(el).attr('data-prefix');if(mQuery('#'+prefix+'_additem').length){mQuery('#'+prefix+'_additem').click(function(){var count=mQuery('#'+prefix+'_itemcount').val();var prototype=mQuery('#'+prefix+'_additem').attr('data-prototype');prototype=prototype.replace(/__name__/g,count);mQuery(prototype).appendTo(mQuery('#'+prefix+'_list div.list-sortable'));mQuery('#'+prefix+'_list_'+count).focus();count++;mQuery('#'+prefix+'_itemcount').val(count);return false;});}
 mQuery('#'+prefix+'_list div.list-sortable').sortable({items:'div.sortable',handle:'span.postaddon',axis:'y',containment:'#'+prefix+'_list',stop:function(i){var order=0;mQuery('#'+prefix+'_list div.list-sortable div.input-group input').each(function(){var name=mQuery(this).attr('name');if(mQuery(this).hasClass('sortable-label')){name=name.replace(/(\[list\]\[[0-9]+\]\[label\])$/g,'')+'[list]['+order+'][label]';}else if(mQuery(this).hasClass('sortable-value')){name=name.replace(/(\[list\]\[[0-9]+\]\[value\])$/g,'')+'[list]['+order+'][value]';order++;}else{name=name.replace(/(\[list\]\[[0-9]+\])$/g,'')+'[list]['+order+']';order++;}
 mQuery(this).attr('name',name);});}});};Mautic.closeGlobalSearchResults=function(){mQuery('#globalSearchContainer').removeClass('active');mQuery('#globalSearchDropdown').removeClass('open');mQuery('body').off('click.globalsearch');};Mautic.initiateFileDownload=function(link){var iframe=mQuery("<iframe/>").attr({src:link,style:"visibility:hidden;display:none"}).appendTo(mQuery('body'));};;Mautic.downloadIpLookupDataStore=function(){var ipService=mQuery('#config_coreconfig_ip_lookup_service').val();var ipAuth=mQuery('#config_coreconfig_ip_lookup_auth').val();mQuery('#iplookup_fetch_button_container .fa-spinner').removeClass('hide');Mautic.ajaxActionRequest('downloadIpLookupDataStore',{service:ipService,auth:ipAuth},function(response){mQuery('#iplookup_fetch_button_container .fa-spinner').addClass('hide');if(response.message){mQuery('#iplookup_fetch_button_container').parent().removeClass('has-error').addClass('has-success');mQuery('#iplookup_fetch_button_container').next('.help-block').html(response.message);}else if(response.error){mQuery('#iplookup_fetch_button_container').parent().removeClass('has-success').addClass('has-error');mQuery('#iplookup_fetch_button_container').next('.help-block').html(response.error);}});};Mautic.getIpLookupFormConfig=function(){var ipService=mQuery('#config_coreconfig_ip_lookup_service').val();Mautic.activateLabelLoadingIndicator('config_coreconfig_ip_lookup_service');Mautic.ajaxActionRequest('getIpLookupForm',{service:ipService},function(response){Mautic.removeLabelLoadingIndicator();mQuery('#ip_lookup_config_container').html(response.html);mQuery('#ip_lookup_attribution').html(response.attribution);});};;Mautic.processUpdate=function(container,step,state){var baseUrl=mauticBasePath+'/';switch(step){case 1:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateSetUpdateLayout',dataType:'json',success:function(response){if(response.success){mQuery('div[id='+container+']').html(response.content);Mautic.processUpdate(container,step+1,state);}else if(response.redirect){window.location=response.redirect;}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 2:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateDownloadPackage',dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-downloading-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.success){mQuery('td[id=update-step-downloading-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-check text-success'));mQuery('#updateTable tbody').append('<tr><td>'+response.nextStep+'</td><td id="update-step-extracting-status"><span class="hidden-xs">'+response.nextStepStatus+'</span><i class="pull-right fa fa-spinner fa-spin"></i></td></tr>');Mautic.processUpdate(container,step+1,state);}else{mQuery('td[id=update-step-downloading-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 3:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateExtractPackage',dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-extracting-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.success){mQuery('td[id=update-step-extracting-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-check text-success'));mQuery('#updateTable tbody').append('<tr><td>'+response.nextStep+'</td><td id="update-step-moving-status"><span class="hidden-xs">'+response.nextStepStatus+'</span><i class="pull-right fa fa-spinner fa-spin"></i></td></tr>');Mautic.processUpdate(container,step+1,state);}else{mQuery('td[id=update-step-extracting-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 4:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveBundles&updateState='+state,dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-moving-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.error){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}else if(response.complete){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step+1,response.updateState);}else{mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step,response.updateState);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 5:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveCore&updateState='+state,dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-moving-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.error){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}else if(response.complete){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step+1,response.updateState);}else{mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step,response.updateState);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 6:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveVendors&updateState='+state,dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-moving-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.error){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}else if(response.complete){mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-check text-success'));mQuery('#updateTable tbody').append('<tr><td>'+response.nextStep+'</td><td id="update-step-cache-status"><span class="hidden-xs">'+response.nextStepStatus+'</span><i class="pull-right fa fa-spinner fa-spin"></i></td></tr>');Mautic.processUpdate(container,step+1,response.updateState);}else{mQuery('td[id=update-step-moving-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step,response.updateState);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 7:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=clearCache&updateState='+state,dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-cache-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.error){mQuery('td[id=update-step-cache-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}else if(response.complete){mQuery('td[id=update-step-cache-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-check text-success'));mQuery('#updateTable tbody').append('<tr><td>'+response.nextStep+'</td><td id="update-step-database-status"><span class="hidden-xs">'+response.nextStepStatus+'</span><i class="pull-right fa fa-spinner fa-spin"></i></td></tr>');Mautic.processUpdate(container,step+1,response.updateState);}else{mQuery('td[id=update-step-cache-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-spinner fa-spin'));Mautic.processUpdate(container,step,response.updateState);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 8:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateDatabaseMigration&finalize=1',dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{mQuery('td[id=update-step-database-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');if(response.success){mQuery('td[id=update-step-database-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-check text-success'));mQuery('#updateTable tbody').append('<tr><td>'+response.nextStep+'</td><td id="update-step-finalization-status"><span class="hidden-xs">'+response.nextStepStatus+'</span><i class="pull-right fa fa-spinner fa-spin"></i></td></tr>');Mautic.processUpdate(container,step+1,state);}else{mQuery('td[id=update-step-database-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}}},error:function(request,textStatus,errorThrown){window.location=mauticBaseUrl+'/s/update/schema?update=1';}});break;case 9:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateFinalization',dataType:'json',success:function(response){if(response.redirect){window.location=response.redirect;}else{if(response.success){mQuery('div[id='+container+']').html('<div class="alert alert-mautic">'+response.message+'</div>');if(response.postmessage){mQuery('<div>'+response.postmessage+'</div>').insertAfter('div[id='+container+'] .alert');}}else{mQuery('td[id=update-step-finalization-status]').html('<span class="hidden-xs">'+response.stepStatus+'</span>');mQuery('td[id=update-step-finalization-status]').append(mQuery('<i></i>').addClass('pull-right fa fa-warning text-danger'));mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('<div class="alert alert-danger">'+response.message+'</div>');}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;}
-Mautic.stopPageLoadingBar();};;Mautic.launchBuilder=function(formName,actionName){Mautic.codeMode=mQuery('.builder').hasClass('code-mode');Mautic.showChangeThemeWarning=true;mQuery('body').css('overflow-y','hidden');mQuery('.builder').addClass('builder-active').removeClass('hide');if(typeof actionName=='undefined'){actionName=formName;}
+Mautic.stopPageLoadingBar();};;Mautic.launchBuilder=function(formName,actionName){var builder=mQuery('.builder');Mautic.codeMode=builder.hasClass('code-mode');Mautic.showChangeThemeWarning=true;mQuery('body').css('overflow-y','hidden');builder.addClass('builder-active').removeClass('hide');if(typeof actionName=='undefined'){actionName=formName;}
 var builderCss={margin:"0",padding:"0",border:"none",width:"100%",height:"100%"};var themeHtml=mQuery('textarea.builder-html').val();if(Mautic.codeMode){var rawTokens=mQuery.map(Mautic.builderTokens,function(element,index){return index}).sort();Mautic.builderCodeMirror=CodeMirror(document.getElementById('customHtmlContainer'),{value:themeHtml,lineNumbers:true,mode:'htmlmixed',extraKeys:{"Ctrl-Space":"autocomplete"},lineWrapping:true,hintOptions:{hint:function(editor){var cursor=editor.getCursor();var currentLine=editor.getLine(cursor.line);var start=cursor.ch;var end=start;while(end<currentLine.length&&/[\w|}$]+/.test(currentLine.charAt(end)))++end;while(start&&/[\w|{$]+/.test(currentLine.charAt(start-1)))--start;var curWord=start!=end&&currentLine.slice(start,end);var regex=new RegExp('^'+curWord,'i');var result={list:(!curWord?rawTokens:mQuery(rawTokens).filter(function(idx){return(rawTokens[idx].indexOf(curWord)!==-1);})),from:CodeMirror.Pos(cursor.line,start),to:CodeMirror.Pos(cursor.line,end)};return result;}}});Mautic.keepPreviewAlive('builder-template-content');}
-var panelHeight=(mQuery('.builder-content').css('right')=='0px')?mQuery('.builder-panel').height():0,panelWidth=(mQuery('.builder-content').css('right')=='0px')?0:mQuery('.builder-panel').width(),spinnerLeft=(mQuery(window).width()-panelWidth-60)/2,spinnerTop=(mQuery(window).height()-panelHeight-60)/2;var overlay=mQuery('<div id="builder-overlay" class="modal-backdrop fade in"><div style="position: absolute; top:'+spinnerTop+'px; left:'+spinnerLeft+'px" class="builder-spinner"><i class="fa fa-spinner fa-spin fa-5x"></i></div></div>').css(builderCss).appendTo('.builder-content');mQuery('.btn-close-builder').prop('disabled',true);var assets=Mautic.htmlspecialchars_decode(mQuery('[data-builder-assets]').html());themeHtml=themeHtml.replace('</head>',assets+'</head>');Mautic.buildBuilderIframe(themeHtml,'builder-template-content',function(){mQuery('#builder-overlay').addClass('hide');mQuery('.btn-close-builder').prop('disabled',false);});};Mautic.formatCode=function(){Mautic.builderCodeMirror.autoFormatRange({line:0,ch:0},{line:Mautic.builderCodeMirror.lineCount()});}
+var builderPanel=mQuery('.builder-panel');var builderContent=mQuery('.builder-content');var btnCloseBuilder=mQuery('.btn-close-builder');var panelHeight=(builderContent.css('right')=='0px')?builderPanel.height():0;var panelWidth=(builderContent.css('right')=='0px')?0:builderPanel.width();var spinnerLeft=(mQuery(window).width()-panelWidth-60)/2;var spinnerTop=(mQuery(window).height()-panelHeight-60)/2;builderPanel.on('scroll',function(e){builderPanel.find('input:focus').blur();});var overlay=mQuery('<div id="builder-overlay" class="modal-backdrop fade in"><div style="position: absolute; top:'+spinnerTop+'px; left:'+spinnerLeft+'px" class="builder-spinner"><i class="fa fa-spinner fa-spin fa-5x"></i></div></div>').css(builderCss).appendTo('.builder-content');btnCloseBuilder.prop('disabled',true);var assets=Mautic.htmlspecialchars_decode(mQuery('[data-builder-assets]').html());themeHtml=themeHtml.replace('</head>',assets+'</head>');themeHtml=Mautic.prepareDynamicContentBlocksForBuilder(themeHtml);Mautic.buildBuilderIframe(themeHtml,'builder-template-content',function(){mQuery('#builder-overlay').addClass('hide');btnCloseBuilder.prop('disabled',false);});};Mautic.formatCode=function(){Mautic.builderCodeMirror.autoFormatRange({line:0,ch:0},{line:Mautic.builderCodeMirror.lineCount()});}
 Mautic.openMediaManager=function(){Mautic.openServerBrowser(mauticBasePath+'/'+mauticAssetPrefix+'app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/index.html?type=Images',screen.width*0.7,screen.height*0.7);}
 Mautic.setFileUrl=function(url,width,height,alt){Mautic.insertTextAtCMCursor(url);}
 Mautic.insertTextAtCMCursor=function(text){var doc=Mautic.builderCodeMirror.getDoc();var cursor=doc.getCursor();doc.replaceRange(text,cursor);}
 Mautic.openServerBrowser=function(url,width,height){var iLeft=(screen.width-width)/2;var iTop=(screen.height-height)/2;var sOptions="toolbar=no,status=no,resizable=yes,dependent=yes";sOptions+=",width="+width;sOptions+=",height="+height;sOptions+=",left="+iLeft;sOptions+=",top="+iTop;var oWindow=window.open(url,"BrowseWindow",sOptions);}
-Mautic.keepPreviewAlive=function(iframeId){var codeChanged=false;Mautic.builderCodeMirror.on('change',function(cm,change){codeChanged=true;});window.setInterval(function(){if(codeChanged){Mautic.livePreviewInterval=Mautic.updateIframeContent(iframeId,Mautic.builderCodeMirror.getValue());codeChanged=false;}},2000);};Mautic.killLivePreview=function(){window.clearInterval(Mautic.livePreviewInterval);};Mautic.destroyCodeMirror=function(){delete Mautic.builderCodeMirror;mQuery('#customHtmlContainer').empty();};Mautic.buildBuilderIframe=function(themeHtml,id,onLoadCallback){if(mQuery('iframe#'+id).length){var builder=mQuery('iframe#'+id);}else{var builder=mQuery("<iframe />",{css:{margin:"0",padding:"0",border:"none",width:"100%",height:"100%"},id:id}).appendTo('.builder-content');}
+Mautic.keepPreviewAlive=function(iframeId,slot){var codeChanged=false;Mautic.builderCodeMirror.on('change',function(cm,change){codeChanged=true;});window.setInterval(function(){if(codeChanged){var value=(Mautic.builderCodeMirror)?Mautic.builderCodeMirror.getValue():'';Mautic.livePreviewInterval=Mautic.updateIframeContent(iframeId,value,slot);codeChanged=false;}},2000);};Mautic.killLivePreview=function(){window.clearInterval(Mautic.livePreviewInterval);};Mautic.destroyCodeMirror=function(){delete Mautic.builderCodeMirror;mQuery('#customHtmlContainer').empty();};Mautic.buildBuilderIframe=function(themeHtml,id,onLoadCallback){if(mQuery('iframe#'+id).length){var builder=mQuery('iframe#'+id);}else{var builder=mQuery("<iframe />",{css:{margin:"0",padding:"0",border:"none",width:"100%",height:"100%"},id:id}).appendTo('.builder-content');}
 builder.on('load',function(){if(typeof onLoadCallback==='function'){onLoadCallback();}});Mautic.updateIframeContent(id,themeHtml);};Mautic.htmlspecialchars_decode=function(encodedHtml){encodedHtml=encodedHtml.replace(/&quot;/g,'"');encodedHtml=encodedHtml.replace(/&#039;/g,"'");encodedHtml=encodedHtml.replace(/&amp;/g,'&');encodedHtml=encodedHtml.replace(/&lt;/g,'<');encodedHtml=encodedHtml.replace(/&gt;/g,'>');return encodedHtml;};Mautic.initSelectTheme=function(themeField){var customHtml=mQuery('textarea.builder-html');var isNew=Mautic.isNewEntity('#page_sessionId, #emailform_sessionId');Mautic.showChangeThemeWarning=true;Mautic.builderTheme=themeField.val();if(isNew){Mautic.showChangeThemeWarning=false;if(!customHtml.length||!customHtml.val().length){Mautic.setThemeHtml(Mautic.builderTheme);}}
 if(customHtml.length){mQuery('[data-theme]').click(function(e){e.preventDefault();var currentLink=mQuery(this);var theme=currentLink.attr('data-theme');var isCodeMode=(theme==='mautic_code_mode');Mautic.builderTheme=theme;if(Mautic.showChangeThemeWarning&&customHtml.val().length){if(!isCodeMode){if(confirm(Mautic.translate('mautic.core.builder.theme_change_warning'))){customHtml.val('');Mautic.showChangeThemeWarning=false;}else{return;}}else{if(confirm(Mautic.translate('mautic.core.builder.code_mode_warning'))){}else{return;}}}
 themeField.val(theme);if(isCodeMode){mQuery('.builder').addClass('code-mode');mQuery('.builder .code-editor').removeClass('hide');mQuery('.builder .code-mode-toolbar').removeClass('hide');mQuery('.builder .builder-toolbar').addClass('hide');}else{mQuery('.builder').removeClass('code-mode');mQuery('.builder .code-editor').addClass('hide');mQuery('.builder .code-mode-toolbar').addClass('hide');mQuery('.builder .builder-toolbar').removeClass('hide');Mautic.setThemeHtml(theme);}
-mQuery('.theme-list .panel').removeClass('theme-selected');currentLink.closest('.panel').addClass('theme-selected');mQuery('.theme-list .select-theme-selected').addClass('hide');mQuery('.theme-list .select-theme-link').removeClass('hide');currentLink.closest('.panel').find('.select-theme-selected').removeClass('hide');currentLink.addClass('hide');});}};Mautic.updateIframeContent=function(iframeId,content){var iframe=document.getElementById(iframeId);var doc=iframe.contentDocument||iframe.contentWindow.document;doc.open();doc.write(content);doc.close();};Mautic.setThemeHtml=function(theme){mQuery.get(mQuery('#builder_url').val()+'?template='+theme,function(themeHtml){var textarea=mQuery('textarea.builder-html');textarea.val(themeHtml);});};Mautic.closeBuilder=function(model){var panelHeight=(mQuery('.builder-content').css('right')=='0px')?mQuery('.builder-panel').height():0,panelWidth=(mQuery('.builder-content').css('right')=='0px')?0:mQuery('.builder-panel').width(),spinnerLeft=(mQuery(window).width()-panelWidth-60)/2,spinnerTop=(mQuery(window).height()-panelHeight-60)/2,customHtml;mQuery('.builder-spinner').css({left:spinnerLeft,top:spinnerTop});mQuery('#builder-overlay').removeClass('hide');mQuery('.btn-close-builder').prop('disabled',true);try{if(Mautic.codeMode){customHtml=Mautic.builderCodeMirror.getValue();Mautic.killLivePreview();Mautic.destroyCodeMirror();delete Mautic.codeMode;}else{document.getElementById('builder-template-content').contentWindow.Mautic.destroySlots();var themeHtml=mQuery('iframe#builder-template-content').contents();themeHtml.find('[data-source="mautic"]').remove();themeHtml.find('.atwho-container').remove();themeHtml.find('.fr-image-overlay, .fr-quick-insert, .fr-tooltip, .fr-toolbar, .fr-popup, .fr-image-resizer').remove();themeHtml.find('[data-slot-focus], [data-section-focus]').remove();mQuery('#slot-form-container, #section-form-container').html('');customHtml=themeHtml.find('html').get(0).outerHTML}
-mQuery('.builder-html').val(customHtml);}catch(error){}
+mQuery('.theme-list .panel').removeClass('theme-selected');currentLink.closest('.panel').addClass('theme-selected');mQuery('.theme-list .select-theme-selected').addClass('hide');mQuery('.theme-list .select-theme-link').removeClass('hide');currentLink.closest('.panel').find('.select-theme-selected').removeClass('hide');currentLink.addClass('hide');});}};Mautic.updateIframeContent=function(iframeId,content,slot){if(iframeId){var iframe=document.getElementById(iframeId);var doc=iframe.contentDocument||iframe.contentWindow.document;doc.open();doc.write(content);doc.close();}else if(slot){slot.html(content);}};Mautic.setThemeHtml=function(theme){mQuery.get(mQuery('#builder_url').val()+'?template='+theme,function(themeHtml){var textarea=mQuery('textarea.builder-html');textarea.val(themeHtml);});};Mautic.closeBuilder=function(model){var panelHeight=(mQuery('.builder-content').css('right')=='0px')?mQuery('.builder-panel').height():0,panelWidth=(mQuery('.builder-content').css('right')=='0px')?0:mQuery('.builder-panel').width(),spinnerLeft=(mQuery(window).width()-panelWidth-60)/2,spinnerTop=(mQuery(window).height()-panelHeight-60)/2,customHtml;mQuery('.builder-spinner').css({left:spinnerLeft,top:spinnerTop});mQuery('#builder-overlay').removeClass('hide');mQuery('.btn-close-builder').prop('disabled',true);try{if(Mautic.codeMode){customHtml=Mautic.builderCodeMirror.getValue();Mautic.killLivePreview();Mautic.destroyCodeMirror();delete Mautic.codeMode;}else{document.getElementById('builder-template-content').contentWindow.Mautic.destroySlots();var themeHtml=mQuery('iframe#builder-template-content').contents();themeHtml.find('[data-source="mautic"]').remove();themeHtml.find('.atwho-container').remove();themeHtml.find('.fr-image-overlay, .fr-quick-insert, .fr-tooltip, .fr-toolbar, .fr-popup, .fr-image-resizer').remove();themeHtml.find('[data-slot-focus], [data-section-focus]').remove();mQuery('#slot-form-container, #section-form-container').html('');customHtml=themeHtml.find('html').get(0).outerHTML}
+customHtml=Mautic.convertDynamicContentSlotsToTokens(customHtml);mQuery('.builder-html').val(customHtml);}catch(error){}
 mQuery('#builder-overlay').remove();mQuery('.builder').removeClass('builder-active').addClass('hide');mQuery('.btn-close-builder').prop('disabled',false);mQuery('body').css('overflow-y','');mQuery('.builder').addClass('hide');Mautic.stopIconSpinPostEvent();mQuery('#builder-template-content').remove();};Mautic.destroySlots=function(){if(typeof Mautic.builderSlots!=='undefined'&&Mautic.builderSlots.length){mQuery.each(Mautic.builderSlots,function(i,slotParams){mQuery(slotParams.slot).trigger('slot:destroy',slotParams);});delete Mautic.builderSlots;}
 Mautic.builderContents.find('[data-slot-container]').sortable('destroy');Mautic.builderContents.find('*[class=""]').removeAttr('class');Mautic.builderContents=Mautic.clearFroalaStyles(Mautic.builderContents);Mautic.builderContents.find('*[style="z-index: 2501;"]').removeAttr('style');Mautic.builderContents.find('.fr-toolbar, .fr-line-breaker').remove();var htmlTags=document.getElementsByTagName('html');htmlTags[0].removeAttribute('class');};Mautic.clearFroalaStyles=function(content){mQuery.each(content.find('td, th, table, [fr-original-class], [fr-original-style]'),function(){var el=mQuery(this);if(el.attr('fr-original-class')){el.attr('class',el.attr('fr-original-class'));el.removeAttr('fr-original-class');}
 if(el.attr('fr-original-style')){el.attr('style',el.attr('fr-original-style'));el.removeAttr('fr-original-style');}
 if(el.css('border')==='1px solid rgb(221, 221, 221)'){el.css('border','');}});content.find('link[href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css"]').remove();content.find('strong[contenteditable="false"]').removeAttr('style');content.find('[data-atwho-at-query]').removeAttr('data-atwho-at-query');return content;}
 Mautic.toggleBuilderButton=function(hide){if(mQuery('.toolbar-form-buttons .toolbar-standard .btn-builder')){if(hide){mQuery('.toolbar-form-buttons .toolbar-standard .btn-builder').addClass('hide btn-standard-toolbar').appendTo('.toolbar-form-buttons')
-mQuery('.toolbar-form-buttons .toolbar-dropdown i.fa-cube').parent().addClass('hide');}else{if(!mQuery('.btn-standard-toolbar.btn-builder').length){mQuery('.toolbar-form-buttons .toolbar-standard .btn-builder').addClass('btn-standard-toolbar')}else{mQuery('.toolbar-form-buttons .btn-standard-toolbar.btn-builder').prependTo('.toolbar-form-buttons .toolbar-standard').removeClass('hide');mQuery('.toolbar-form-buttons .toolbar-dropdown i.fa-cube').parent().removeClass('hide');}}}};Mautic.initSections=function(){var sectionWrappers=Mautic.builderContents.find('[data-section-wrapper]');sectionWrappers.on('click',function(e){var previouslyFocused=Mautic.builderContents.find('[data-section-focus]');var sectionWrapper=mQuery(this);var section=sectionWrapper.find('[data-section]');var focusParts=['top','right','bottom','left'];var sectionForm=mQuery(parent.mQuery('script[data-section-form]').html());var sectionFormContainer=parent.mQuery('#section-form-container');if(previouslyFocused.length){previouslyFocused.remove();sectionFormContainer.find('input[data-toggle="color"]').each(function(){mQuery(this).minicolors('destroy');});}
-Mautic.builderContents.find('[data-slot-focus]').each(function(){if(!mQuery(e.target).attr('data-slot-focus')&&!mQuery(e.target).closest('data-slot').length&&!mQuery(e.target).closest('[data-slot-container]').length){mQuery(this).remove();}});mQuery.each(focusParts,function(index,value){sectionWrapper.append(mQuery('<div/>').attr('data-section-focus',value));});sectionFormContainer.html(sectionForm);if(section.length&&section.css('background-color')!=='rgba(0, 0, 0, 0)'){sectionForm.find('#builder_section_content-background-color').val(Mautic.rgb2hex(section.css('backgroundColor')));}
+mQuery('.toolbar-form-buttons .toolbar-dropdown i.fa-cube').parent().addClass('hide');}else{if(!mQuery('.btn-standard-toolbar.btn-builder').length){mQuery('.toolbar-form-buttons .toolbar-standard .btn-builder').addClass('btn-standard-toolbar')}else{mQuery('.toolbar-form-buttons .btn-standard-toolbar.btn-builder').prependTo('.toolbar-form-buttons .toolbar-standard').removeClass('hide');mQuery('.toolbar-form-buttons .toolbar-dropdown i.fa-cube').parent().removeClass('hide');}}}};Mautic.initSectionListeners=function(){Mautic.activateGlobalFroalaOptions();Mautic.selectedSlot=null;Mautic.builderContents.on('section:init',function(event,section,isNew){section=mQuery(section);if(isNew){Mautic.initSlots(section.find('[data-slot-container]'));}
+section.on('click',function(e){var clickedSection=mQuery(this);var previouslyFocused=Mautic.builderContents.find('[data-section-focus]');var sectionWrapper=mQuery(this);var section=sectionWrapper.find('[data-section]');var focusParts={'top':{},'right':{},'bottom':{},'left':{},'handle':{classes:'fa fa-arrows-v'},'delete':{classes:'fa fa-remove',onClick:function(){if(confirm(parent.Mautic.translate('mautic.core.builder.section_delete_warning'))){var deleteBtn=mQuery(this);var focusSeciton=deleteBtn.closest('[data-section-wrapper]').remove();}}}};var sectionForm=mQuery(parent.mQuery('script[data-section-form]').html());var sectionFormContainer=parent.mQuery('#section-form-container');if(previouslyFocused.length){previouslyFocused.remove();sectionFormContainer.find('input[data-toggle="color"]').each(function(){mQuery(this).minicolors('destroy');});}
+Mautic.builderContents.find('[data-slot-focus]').each(function(){if(!mQuery(e.target).attr('data-slot-focus')&&!mQuery(e.target).closest('data-slot').length&&!mQuery(e.target).closest('[data-slot-container]').length){mQuery(this).remove();}});mQuery.each(focusParts,function(key,config){var focusPart=mQuery('<div/>').attr('data-section-focus',key).addClass(config.classes);if(config.onClick){focusPart.on('click',config.onClick);}
+sectionWrapper.append(focusPart);});sectionFormContainer.html(sectionForm);if(section.length&&section.css('background-color')!=='rgba(0, 0, 0, 0)'){sectionForm.find('#builder_section_content-background-color').val(Mautic.rgb2hex(section.css('backgroundColor')));}
 if(sectionWrapper.css('background-color')!=='rgba(0, 0, 0, 0)'){sectionForm.find('#builder_section_wrapper-background-color').val(Mautic.rgb2hex(sectionWrapper.css('backgroundColor')));}
-sectionFormContainer.find('input[data-toggle="color"]').each(function(){parent.Mautic.activateColorPicker(this);});sectionForm.on('keyup paste change touchmove',function(e){var field=mQuery(e.target);if(section.length&&field.attr('id')==='builder_section_content-background-color'){Mautic.sectionBackgroundChanged(section,field.val());}else if(field.attr('id')==='builder_section_wrapper-background-color'){Mautic.sectionBackgroundChanged(sectionWrapper,field.val());}});parent.mQuery('#section-form-container').on('change.minicolors',function(e,hex){var field=mQuery(e.target);var focusedSectionWrapper=mQuery('[data-section-focus]').parent();var focusedSection=focusedSectionWrapper.find('[data-section]');if(focusedSection.length&&field.attr('id')==='builder_section_content-background-color'){Mautic.sectionBackgroundChanged(focusedSection,field.val());}else if(field.attr('id')==='builder_section_wrapper-background-color'){Mautic.sectionBackgroundChanged(focusedSectionWrapper,field.val());}});});};Mautic.sectionBackgroundChanged=function(element,color){if(color.length){color='#'+color;}else{color='transparent';}
-element.css('background-color',color).attr('bgcolor',color);mQuery(element).find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')=='text'){Mautic.setTextSlotEditorStyle(parent.mQuery('#slot_text_content'),focusedSlot);}});}
-Mautic.rgb2hex=function(orig){var rgb=orig.replace(/\s/g,'').match(/^rgba?\((\d+),(\d+),(\d+)/i);return(rgb&&rgb.length===4)?"#"+
+sectionFormContainer.find('input[data-toggle="color"]').each(function(){parent.Mautic.activateColorPicker(this);});sectionForm.on('keyup paste change touchmove',function(e){var field=mQuery(e.target);if(section.length&&field.attr('id')==='builder_section_content-background-color'){Mautic.sectionBackgroundChanged(section,field.val());}else if(field.attr('id')==='builder_section_wrapper-background-color'){Mautic.sectionBackgroundChanged(sectionWrapper,field.val());}});parent.mQuery('#section-form-container').on('change.minicolors',function(e,hex){var field=mQuery(e.target);var focusedSectionWrapper=mQuery('[data-section-focus]').parent();var focusedSection=focusedSectionWrapper.find('[data-section]');if(focusedSection.length&&field.attr('id')==='builder_section_content-background-color'){Mautic.sectionBackgroundChanged(focusedSection,field.val());}else if(field.attr('id')==='builder_section_wrapper-background-color'){Mautic.sectionBackgroundChanged(focusedSectionWrapper,field.val());}});});});}
+Mautic.initSections=function(){Mautic.initSectionListeners();var sectionWrappers=Mautic.builderContents.find('[data-section-wrapper]');var bodyOverflow={};Mautic.sortActive=false;mQuery('body').sortable({helper:function(e,ui){bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},axis:'y',items:'[data-section-wrapper]',handle:'[data-section-focus="handle"]',placeholder:'slot-placeholder',connectWith:'body',start:function(event,ui){Mautic.sortActive=true;ui.placeholder.height(ui.helper.outerHeight());},stop:function(event,ui){if(ui.item.hasClass('section-type-handle')){mQuery('body',parent.document).css(bodyOverflow);var newSection=mQuery('<div/>').attr('data-section-wrapper',ui.item.attr('data-section-type')).html(ui.item.find('script').html());ui.item.replaceWith(newSection);Mautic.builderContents.trigger('section:init',[newSection,true]);}else{mQuery('body').css(bodyOverflow);}
+Mautic.sortActive=false;},});var iframe=mQuery('#builder-template-content',parent.document).contents();mQuery('#section-type-container .section-type-handle',parent.document).draggable({iframeFix:true,connectToSortable:'body',revert:'invalid',iframeOffset:iframe.offset(),helper:function(e,ui){bodyOverflow.overflowX=mQuery('body',parent.document).css('overflow-x');bodyOverflow.overflowY=mQuery('body',parent.document).css('overflow-y');mQuery('body',parent.document).css({overflowX:'hidden',overflowY:'hidden'});var helper=mQuery(this).clone().css('height',mQuery(this).height()).css('width',mQuery(this).width());return helper;},zIndex:8000,cursorAt:{top:15,left:15},start:function(event,ui){mQuery('#builder-template-content',parent.document).css('overflow','hidden');mQuery('#builder-template-content',parent.document).attr('scrolling','no');},stop:function(event,ui){mQuery('body',parent.document).css(bodyOverflow);mQuery('#builder-template-content',parent.document).css('overflow','visible');mQuery('#builder-template-content',parent.document).attr('scrolling','yes');}}).disableSelection();sectionWrappers.each(function(){mQuery(this).trigger('section:init',this);});};Mautic.sectionBackgroundChanged=function(element,color){if(color.length){color='#'+color;}else{color='transparent';}
+element.css('background-color',color).attr('bgcolor',color);mQuery(element).find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')=='text'){Mautic.setTextSlotEditorStyle(parent.mQuery('#slot_text_content'),focusedSlot);}});};Mautic.rgb2hex=function(orig){var rgb=orig.replace(/\s/g,'').match(/^rgba?\((\d+),(\d+),(\d+)/i);return(rgb&&rgb.length===4)?"#"+
 ("0"+parseInt(rgb[1],10).toString(16)).slice(-2)+
 ("0"+parseInt(rgb[2],10).toString(16)).slice(-2)+
-("0"+parseInt(rgb[3],10).toString(16)).slice(-2):orig;}
-Mautic.initSlots=function(){var slotContainers=Mautic.builderContents.find('[data-slot-container]');Mautic.builderContents.find('a').on('click',function(e){e.preventDefault();});var bodyOverflow={};Mautic.sortActive=false;slotContainers.sortable({helper:function(e,ui){bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},items:'[data-slot]',handle:'[data-slot-toolbar]',placeholder:'slot-placeholder',connectWith:'[data-slot-container]',start:function(event,ui){Mautic.sortActive=true;ui.placeholder.height(ui.helper.outerHeight());Mautic.builderContents.find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')=='image'){focusedSlot.find('img').each(function(){mQuery(this).froalaEditor('popups.hideAll');});Mautic.builderContents.find('.fr-image-resizer.fr-active').removeClass('fr-active');}});Mautic.builderContents.find('[data-slot-focus]').remove();},stop:function(event,ui){if(ui.item.hasClass('slot-type-handle')){mQuery('body',parent.document).css(bodyOverflow);var newSlot=mQuery('<div/>').attr('data-slot',ui.item.attr('data-slot-type')).html(ui.item.find('script').html())
+("0"+parseInt(rgb[3],10).toString(16)).slice(-2):orig;};Mautic.initSlots=function(slotContainers){if(!slotContainers){slotContainers=Mautic.builderContents.find('[data-slot-container]');}
+Mautic.builderContents.find('a').on('click',function(e){e.preventDefault();});var bodyOverflow={};Mautic.sortActive=false;Mautic.parentDocument=parent.document;slotContainers.sortable({helper:function(e,ui){bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},items:'[data-slot]',handle:'[data-slot-toolbar]',placeholder:'slot-placeholder',connectWith:'[data-slot-container]',start:function(event,ui){Mautic.sortActive=true;ui.placeholder.height(ui.helper.outerHeight());Mautic.builderContents.find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')==='image'){focusedSlot.find('img').each(function(){mQuery(this).froalaEditor('popups.hideAll');});Mautic.builderContents.find('.fr-image-resizer.fr-active').removeClass('fr-active');}});Mautic.builderContents.find('[data-slot-focus]').remove();},stop:function(event,ui){if(ui.item.hasClass('slot-type-handle')){mQuery('body',parent.document).css(bodyOverflow);var newSlot=mQuery('<div/>').attr('data-slot',ui.item.attr('data-slot-type')).html(ui.item.find('script').html())
 ui.item.replaceWith(newSlot);Mautic.builderContents.trigger('slot:init',newSlot);}else{mQuery('body').css(bodyOverflow);}
-Mautic.sortActive=false;},});var iframe=mQuery('#builder-template-content',parent.document).contents();mQuery('#slot-type-container .slot-type-handle',parent.document).draggable({iframeFix:true,connectToSortable:slotContainers,revert:'invalid',iframeOffset:iframe.offset(),helper:function(e,ui){bodyOverflow.overflowX=mQuery('body',parent.document).css('overflow-x');bodyOverflow.overflowY=mQuery('body',parent.document).css('overflow-y');mQuery('body',parent.document).css({overflowX:'hidden',overflowY:'hidden'});var helper=mQuery(this).clone().css('height',mQuery(this).height()).css('width',mQuery(this).width());return helper;},zIndex:8000,cursorAt:{top:15,left:15},start:function(event,ui){mQuery('#builder-template-content',parent.document).css('overflow','hidden');mQuery('#builder-template-content',parent.document).attr('scrolling','no');slotContainers.sortable('option','scroll',false);},stop:function(event,ui){mQuery('body',parent.document).css(bodyOverflow);mQuery('#builder-template-content',parent.document).css('overflow','visible');mQuery('#builder-template-content',parent.document).attr('scrolling','yes');slotContainers.sortable('option','scroll',true);},}).disableSelection();iframe.on('scroll',function(){mQuery('#slot-type-container .slot-type-handle',parent.document).draggable("option","cursorAt",{top:-1*iframe.scrollTop()+15});});Mautic.builderContents.find('[data-slot]').each(function(){mQuery(this).trigger('slot:init',this);});}
-Mautic.initSlotListeners=function(){Mautic.activateGlobalFroalaOptions();Mautic.builderSlots=[];Mautic.selectedSlot=null;Mautic.builderContents.on('slot:selected',function(event,slot){slot=mQuery(slot);Mautic.builderContents.find('[data-slot-focus]').remove();var focus=mQuery('<div/>').attr('data-slot-focus',true);slot.append(focus);});Mautic.builderContents.on('slot:init',function(event,slot){slot=mQuery(slot);var type=slot.attr('data-slot');var slotToolbar=mQuery('<div/>').attr('data-slot-toolbar',true);var deleteLink=mQuery('<a><i class="fa fa-lg fa-times"></i></a>').attr('data-slot-action','delete').attr('alt','delete').addClass('btn btn-delete btn-default');deleteLink.appendTo(slotToolbar);Mautic.builderContents.find('[data-slot-focus]').remove();var focus=mQuery('<div/>').attr('data-slot-focus',true);slot.hover(function(){if(Mautic.sortActive){return;}
-slot.append(focus);deleteLink.click(function(e){slot.trigger('slot:destroy',{slot:slot,type:type});mQuery.each(Mautic.builderSlots,function(i,slotParams){if(slotParams.slot.is(slot)){Mautic.builderSlots.splice(i,1);return false;}});slot.remove();focus.remove();});if(mQuery(this).offset().top<25){slotToolbar.css('top','0');}else{slotToolbar.css('top','-24px');}
+Mautic.sortActive=false;}});var iframe=mQuery('#builder-template-content',parent.document).contents();mQuery('#slot-type-container .slot-type-handle',parent.document).draggable({iframeFix:true,connectToSortable:'[data-slot-container]',revert:'invalid',iframeOffset:iframe.offset(),helper:function(e,ui){bodyOverflow.overflowX=mQuery('body',Mautic.parentDocument).css('overflow-x');bodyOverflow.overflowY=mQuery('body',Mautic.parentDocument).css('overflow-y');mQuery('body',Mautic.parentDocument).css({overflowX:'hidden',overflowY:'hidden'});return mQuery(this).clone().css('height',mQuery(this).height()).css('width',mQuery(this).width());},zIndex:8000,cursorAt:{top:15,left:15},start:function(event,ui){mQuery('#builder-template-content',Mautic.parentDocument).css('overflow','hidden');mQuery('#builder-template-content',Mautic.parentDocument).attr('scrolling','no');if(slotContainers.data('sortable'))slotContainers.sortable('option','scroll',false);},stop:function(event,ui){mQuery('body',Mautic.parentDocument).css(bodyOverflow);mQuery('#builder-template-content',Mautic.parentDocument).css('overflow','visible');mQuery('#builder-template-content',Mautic.parentDocument).attr('scrolling','yes');if(slotContainers.data('sortable'))slotContainers.sortable('option','scroll',true);}}).disableSelection();iframe.on('scroll',function(){mQuery('#slot-type-container .slot-type-handle',Mautic.parentDocument).draggable("option","cursorAt",{top:-1*iframe.scrollTop()+15});});slotContainers.find('[data-slot]').each(function(){mQuery(this).trigger('slot:init',this);});};Mautic.getSlotToolbar=function(){Mautic.builderContents.find('[data-slot-toolbar]').remove();var slotToolbar=mQuery('<div/>').attr('data-slot-toolbar',true);var deleteLink=Mautic.getSlotDeleteLink();deleteLink.appendTo(slotToolbar);return slotToolbar;};Mautic.getSlotDeleteLink=function(){if(typeof Mautic.deleteLink=='undefined'){Mautic.deleteLink=mQuery('<a><i class="fa fa-lg fa-times"></i></a>').attr('data-slot-action','delete').attr('alt','delete').addClass('btn btn-delete btn-default');}
+return Mautic.deleteLink;};Mautic.getSlotFocus=function(){Mautic.builderContents.find('[data-slot-focus]').remove();return mQuery('<div/>').attr('data-slot-focus',true);};Mautic.cloneFocusForm=function(decId,removeFroala){if(typeof Mautic.activeDEC!=='undefined'){var element=Mautic.activeDEC.detach();element.hide();Mautic.activeDECParent.append(element);}
+var focusForm=parent.mQuery('#emailform_dynamicContent_'+decId);Mautic.activeDECParent=focusForm.parent();focusForm.removeClass('fade');focusForm.find('.tab-pane:first').find('.remove-item').hide();var element=focusForm.detach();element.show();Mautic.activeDEC=element;return element;};Mautic.initEmailDynamicContentSlotEdit=function(clickedSlot){var decId=clickedSlot.attr('data-param-dec-id');var focusForm;if(decId||decId===0){focusForm=Mautic.cloneFocusForm(decId);}
+var focusFormHeader=parent.mQuery('#customize-slot-panel').find('.panel-heading h4');var newDynConButton=mQuery('<button/>').css('float','right').addClass('btn btn-success btn-xs');newDynConButton.text('Add Variant');newDynConButton.on('click',function(e){e.stopPropagation();Mautic.createNewDynamicContentFilter('#dynamicContentFilterTabs_'+decId,parent.mQuery);var focusForm=Mautic.cloneFocusForm(decId,false);focusForm.insertAfter(parent.mQuery('#slot_dynamiccontent > div.has-error'));});focusFormHeader.append(newDynConButton);return focusForm;};Mautic.removeAddVariantButton=function(){parent.mQuery('#customize-slot-panel').find('.panel-heading button').remove();if(typeof Mautic.activeDEC!=='undefined'){var element=Mautic.activeDEC.detach();element.hide();Mautic.activeDECParent.append(element);}};Mautic.initSlotListeners=function(){Mautic.activateGlobalFroalaOptions();Mautic.builderSlots=[];Mautic.selectedSlot=null;Mautic.builderContents.on('slot:selected',function(event,slot){slot=mQuery(slot);Mautic.builderContents.find('[data-slot-focus]').remove();mQuery(slot).append(Mautic.getSlotFocus());});Mautic.builderContents.on('slot:init',function(event,slot){slot=mQuery(slot);var type=slot.attr('data-slot');var slotToolbar=Mautic.getSlotToolbar();var deleteLink=Mautic.getSlotDeleteLink();var focus=Mautic.getSlotFocus();slot.hover(function(e){e.stopPropagation();slotToolbar=Mautic.getSlotToolbar();focus=Mautic.getSlotFocus();if(Mautic.sortActive){return;}
+slot.append(focus);deleteLink.click(function(e){if(type=='dynamicContent'){var dynConId=slot.attr('data-param-dec-id');dynConId='#emailform_dynamicContent_'+dynConId;var dynConTarget=parent.mQuery(dynConId);dynConTarget.find(dynConId+'_tokenName').val('');}
+slot.trigger('slot:destroy',{slot:slot,type:type});mQuery.each(Mautic.builderSlots,function(i,slotParams){if(slotParams.slot.is(slot)){Mautic.builderSlots.splice(i,1);return false;}});slot.remove();focus.remove();});if(slot.offset().top<25){slotToolbar.css('top','0');}else{slotToolbar.css('top','-24px');}
 slot.append(slotToolbar);},function(){if(Mautic.sortActive){return;}
-slotToolbar.remove();focus.remove();});slot.on('click',function(){var clickedSlot=mQuery(this);clickedSlot.trigger('slot:selected',clickedSlot);var minicolors=parent.mQuery('#slot-form-container .minicolors');if(minicolors.length){parent.mQuery('#slot-form-container input[data-toggle="color"]').each(function(){mQuery(this).minicolors('destroy');});parent.mQuery('#slot-form-container').off('change.minicolors');}
+slotToolbar.remove();focus.remove();});slot.on('click',function(e){e.stopPropagation();Mautic.deleteCodeModeSlot();Mautic.removeAddVariantButton();var clickedSlot=mQuery(this);clickedSlot.trigger('slot:selected',clickedSlot);var minicolors=parent.mQuery('#slot-form-container .minicolors');if(minicolors.length){parent.mQuery('#slot-form-container input[data-toggle="color"]').each(function(){mQuery(this).minicolors('destroy');});parent.mQuery('#slot-form-container').off('change.minicolors');}
 if(parent.mQuery('#slot-form-container').find('textarea.editor')){parent.mQuery('#slot-form-container').find('textarea.editor').each(function(){parent.mQuery(this).froalaEditor('popups.hideAll');});}
-var focusType=clickedSlot.attr('data-slot');var focusForm=mQuery(parent.mQuery('script[data-slot-type-form="'+focusType+'"]').html());parent.mQuery('#slot-form-container').html(focusForm);parent.mQuery.each(clickedSlot.get(0).attributes,function(i,attr){var attrPrefix='data-param-';var regex=/data-param-(.*)/;var match=regex.exec(attr.name);if(match!==null){focusForm.find('input[type="text"][data-slot-param="'+match[1]+'"]').val(attr.value);focusForm.find('input[type="radio"][data-slot-param="'+match[1]+'"][value="'+attr.value+'"]').prop('checked',1);}});focusForm.on('keyup',function(e){var field=mQuery(e.target);clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});});focusForm.find('.btn').on('click',function(e){var field=mQuery(this).find('input:radio');if(field.length){clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});}});focusForm.find('input[data-toggle="color"]').each(function(){parent.Mautic.activateColorPicker(this);});focusForm.find('textarea.editor').each(function(){var theEditor=this;var slotHtml=parent.mQuery('<div/>').html(clickedSlot.html());slotHtml.find('[data-slot-focus]').remove();slotHtml.find('[data-slot-toolbar]').remove();var buttons=['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen']
-var builderEl=parent.mQuery('.builder');if(builderEl.length&&builderEl.hasClass('email-builder')){buttons=parent.mQuery.grep(buttons,function(value){return value!='insertGatedVideo';});}
-var froalaOptions={toolbarButtons:buttons,toolbarButtonsMD:buttons,toolbarButtonsSM:buttons,toolbarButtonsXS:buttons,linkList:[],imageEditButtons:['imageReplace','imageAlign','imageRemove','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove']};parent.mQuery(this).on('froalaEditor.initialized',function(e,editor){parent.Mautic.initAtWho(editor.$el,parent.Mautic.getBuilderTokensMethod(),editor);Mautic.setTextSlotEditorStyle(editor.$el,clickedSlot);});parent.mQuery(this).on('froalaEditor.contentChanged',function(e,editor){var slotHtml=mQuery('<div/>').append(parent.mQuery(theEditor).froalaEditor('html.get'));clickedSlot.html(slotHtml.html());});parent.mQuery(this).val(slotHtml.html());parent.mQuery(this).froalaEditor(parent.mQuery.extend({},Mautic.basicFroalaOptions,froalaOptions));});parent.mQuery('#slot-form-container').on('change.minicolors',function(e,hex){var field=mQuery(e.target);clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});});});if(type==='image'){var image=mQuery(this).find('img');image.removeAttr('data-froala.editor');image.on('froalaEditor.click',function(e,editor){mQuery(this).closest('[data-slot]').trigger('click');});image.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{linkList:[],imageEditButtons:['imageReplace','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove']}));}else if(type==='button'){mQuery(this).find('a').click(function(e){e.preventDefault();});}
-Mautic.builderSlots.push({slot:mQuery(this),type:type});});Mautic.getPredefinedLinks=function(callback){var linkList=[];Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(tokens){if(tokens.length){mQuery.each(tokens,function(token,label){if(token.startsWith('{pagelink=')||token.startsWith('{assetlink=')||token.startsWith('{webview_url')||token.startsWith('{unsubscribe_url')){linkList.push({text:label,href:token});}});}
-return callback(linkList);});}
-Mautic.builderContents.on('slot:change',function(event,params){var fieldParam=params.field.attr('data-slot-param');if(fieldParam==='padding-top'||fieldParam==='padding-bottom'){params.slot.css(fieldParam,params.field.val()+'px');}else if(fieldParam==='href'){params.slot.find('a').attr('href',params.field.val());}else if(fieldParam==='link-text'){params.slot.find('a').text(params.field.val());}else if(fieldParam==='float'){var values=['left','center','right'];params.slot.find('a').parent().attr('align',values[params.field.val()]);}else if(fieldParam==='button-size'){var values=[{padding:'10px 13px',fontSize:'14px'},{padding:'12px 18px',fontSize:'16px'},{padding:'15px 20px',fontSize:'18px'}];params.slot.find('a').css(values[params.field.val()]);}else if(fieldParam==='background-color'){params.slot.find('a').css(fieldParam,'#'+params.field.val());params.slot.find('a').attr('background','#'+params.field.val());}else if(fieldParam==='color'){params.slot.find('a').css(fieldParam,'#'+params.field.val());}
-if(params.type=='text'){Mautic.setTextSlotEditorStyle(parent.mQuery('#slot_text_content'),params.slot);}});Mautic.builderContents.on('slot:destroy',function(event,params){if(params.type==='text'){if(parent.mQuery('#slot_content').length){parent.mQuery('#slot_content').froalaEditor('destroy');parent.mQuery('#slot_content').find('.atwho-inserted').atwho('destroy');}}else if(params.type==='image'){var image=params.slot.find('img');image.removeAttr('data-froala.editor');image.froalaEditor('destroy');}
-Mautic.builderContents.find('.sf-toolbar').remove();});};Mautic.setTextSlotEditorStyle=function(editorEl,slot)
+var focusType=clickedSlot.attr('data-slot');var focusForm=mQuery(parent.mQuery('script[data-slot-type-form="'+focusType+'"]').html());var slotFormContainer=parent.mQuery('#slot-form-container');if(focusType=='dynamicContent'){var nff=Mautic.initEmailDynamicContentSlotEdit(clickedSlot);nff.insertAfter(focusForm.find('#slot_dynamiccontent > div.has-error'));}
+slotFormContainer.html(focusForm);parent.mQuery.each(clickedSlot.get(0).attributes,function(i,attr){var regex=/data-param-(.*)/;var match=regex.exec(attr.name);if(match!==null){focusForm.find('input[type="text"][data-slot-param="'+match[1]+'"]').val(attr.value);var selectField=focusForm.find('select[data-slot-param="'+match[1]+'"]');if(selectField.length){selectField.val(attr.value)}
+var urlField=focusForm.find('input[type="url"][data-slot-param="'+match[1]+'"]');if(urlField.length){urlField.val(attr.value);}
+var numberField=focusForm.find('input[type="number"][data-slot-param="'+match[1]+'"]');if(numberField.length){numberField.val(attr.value);}
+var radioField=focusForm.find('input[type="radio"][data-slot-param="'+match[1]+'"][value="'+attr.value+'"]');if(radioField.length){radioField.parent('.btn').addClass('active');radioField.attr('checked',true);}}});focusForm.on('keyup change',function(e){var field=mQuery(e.target);if(field.attr('data-slot-param')){clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());}
+clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});});focusForm.find('.btn').on('click',function(e){var field=mQuery(this).find('input:radio');if(field.length){clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});}});focusForm.find('input[data-toggle="color"]').each(function(){parent.Mautic.activateColorPicker(this,{change:function(){var field=mQuery(this);clickedSlot.attr('data-param-'+field.attr('data-slot-param'),field.val());clickedSlot.trigger('slot:change',{slot:clickedSlot,field:field,type:focusType});}});});if('codemode'===type){Mautic.codeMode=true;var element=focusForm.find('#slot_codemode_content')[0];if(element){Mautic.builderCodeMirror=CodeMirror.fromTextArea(element,{lineNumbers:true,mode:'htmlmixed',extraKeys:{"Ctrl-Space":"autocomplete"},lineWrapping:true,});Mautic.builderCodeMirror.getDoc().setValue(slot.find('#codemodeHtmlContainer').html());Mautic.keepPreviewAlive(null,slot.find('#codemodeHtmlContainer'));}}
+focusForm.find('textarea.editor').each(function(){var theEditor=this;var slotHtml=parent.mQuery('<div/>').html(clickedSlot.html());slotHtml.find('[data-slot-focus]').remove();slotHtml.find('[data-slot-toolbar]').remove();var buttons=['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','token','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'];var builderEl=parent.mQuery('.builder');if(builderEl.length&&builderEl.hasClass('email-builder')){buttons=parent.mQuery.grep(buttons,function(value){return value!='insertGatedVideo';});}
+var froalaOptions={toolbarButtons:buttons,toolbarButtonsMD:buttons,toolbarButtonsSM:buttons,toolbarButtonsXS:buttons,toolbarSticky:false,linkList:[],imageEditButtons:['imageReplace','imageAlign','imageRemove','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove']};if(focusType!=='dynamicContent'){parent.mQuery(this).on('froalaEditor.initialized',function(e,editor){parent.Mautic.initAtWho(editor.$el,parent.Mautic.getBuilderTokensMethod(),editor);Mautic.setTextSlotEditorStyle(editor.$el,clickedSlot);});}
+parent.mQuery(this).on('froalaEditor.contentChanged',function(e,editor){var slotHtml=mQuery('<div/>').append(editor.html.get());if(!(focusType=='dynamicContent'&&mQuery(this).attr('id').match(/filters/))){clickedSlot.html(slotHtml.html());}});if(!(focusType=='dynamicContent'&&mQuery(this).attr('id').match(/filters/))){parent.mQuery(this).val(slotHtml.html());}
+parent.mQuery(this).froalaEditor(parent.mQuery.extend({},Mautic.basicFroalaOptions,froalaOptions));});});if(type==='image'||type==='imagecaption'||type==='imagecard'){var image=slot.find('img');image.removeAttr('data-froala.editor');image.on('froalaEditor.click',function(e,editor){slot.closest('[data-slot]').trigger('click');});var froalaOptions=mQuery.extend({},Mautic.basicFroalaOptions,{linkList:[],imageEditButtons:['imageReplace','imageAlign','imageAlt','imageSize','|','imageLink','linkOpen','linkEdit','linkRemove'],useClasses:false});image.froalaEditor(froalaOptions);}else if(type==='button'){slot.find('a').click(function(e){e.preventDefault();});}else if(type==='dynamicContent'){if(slot.html().match(/__dynamicContent__/)){var decs=mQuery('[data-slot="dynamicContent"]');var ids=mQuery.map(decs,function(e){return mQuery(e).attr('data-param-dec-id');})
+var maxId=Math.max.apply(Math,ids);if(isNaN(maxId)||Number.NEGATIVE_INFINITY==maxId)maxId=0;slot.attr('data-param-dec-id',maxId+1);slot.html('Dynamic Content');Mautic.createNewDynamicContentItem(parent.mQuery);}}
+Mautic.builderSlots.push({slot:slot,type:type});});Mautic.getPredefinedLinks=function(callback){var linkList=[];Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(tokens){if(tokens.length){mQuery.each(tokens,function(token,label){if(token.startsWith('{pagelink=')||token.startsWith('{assetlink=')||token.startsWith('{webview_url')||token.startsWith('{unsubscribe_url')){linkList.push({text:label,href:token});}});}
+return callback(linkList);});};Mautic.builderContents.on('slot:change',function(event,params){var fieldParam=params.field.attr('data-slot-param');var type=params.type;if(type!=="dynamicContent"){Mautic.removeAddVariantButton();}
+Mautic.clearSlotFormError(fieldParam);if(fieldParam==='padding-top'||fieldParam==='padding-bottom'){params.slot.css(fieldParam,params.field.val()+'px');}else if('glink'===fieldParam||'flink'===fieldParam||'tlink'===fieldParam){params.slot.find('#'+fieldParam).attr('href',params.field.val());}else if(fieldParam==='href'){params.slot.find('a').eq(0).attr('href',params.field.val());}else if(fieldParam==='link-text'){params.slot.find('a').eq(0).text(params.field.val());}else if(fieldParam==='float'){var values=['left','center','right'];params.slot.find('a').parent().attr('align',values[params.field.val()]);}else if(fieldParam==='caption'){params.slot.find('figcaption').text(params.field.val());}else if(fieldParam==='cardcaption'){params.slot.find('td.imagecard-caption').text(params.field.val());}else if(fieldParam==='text-align'){var values=['left','center','right'];if(type==='imagecard'){params.slot.find('.imagecard-caption').css(fieldParam,values[params.field.val()]);}else if(type==='imagecaption'){params.slot.find('figcaption').css(fieldParam,values[params.field.val()]);}}else if(fieldParam==='align'){Mautic.builderContents.find('[data-slot-focus]').each(function(){var focusedSlot=mQuery(this).closest('[data-slot]');if(focusedSlot.attr('data-slot')=='image'){focusedSlot.find('img').each(function(){mQuery(this).froalaEditor('popups.hideAll');});Mautic.builderContents.find('.fr-image-resizer.fr-active').removeClass('fr-active');}});var values=['left','center','right'];if('socialfollow'===type){params.slot.find('div.socialfollow').css('text-align',values[params.field.val()]);}else if('imagecaption'===type){params.slot.find('figure').css('text-align',values[params.field.val()]);}else if('imagecard'===type){params.slot.find('td.imagecard-image').css('text-align',values[params.field.val()]);}else{params.slot.find('img').closest('div').css('text-align',values[params.field.val()]);}}else if(fieldParam==='button-size'){var bg_clr=params.slot.attr('data-param-background-color');var values=[{borderWidth:'10px 20px',padding:'0',fontSize:'14px',borderColor:bg_clr,borderStyle:'solid'},{borderWidth:'20px 23px',padding:'0',fontSize:'20px',borderColor:bg_clr,borderStyle:'solid'},{borderWidth:'25px 40px',padding:'0',fontSize:'30px',borderColor:bg_clr,borderStyle:'solid'}];params.slot.find('a').css(values[params.field.val()]);}else if(fieldParam==='caption-color'){params.slot.find('.imagecard-caption').css('background-color','#'+params.field.val());}else if(fieldParam==='background-color'){if('imagecard'===type){params.slot.find('.imagecard').css(fieldParam,'#'+params.field.val());}else{params.slot.find('a').css(fieldParam,'#'+params.field.val());params.slot.find('a').attr('background','#'+params.field.val());params.slot.find('a').css('border-color','#'+params.field.val());}}else if(fieldParam==='color'){if('imagecard'===type){params.slot.find('.imagecard-caption').css(fieldParam,'#'+params.field.val());}else if('imagecaption'===type){params.slot.find('figcaption').css(fieldParam,'#'+params.field.val());}else{params.slot.find('a').css(fieldParam,'#'+params.field.val());}}else if(/gatedvideo/.test(fieldParam)){var toInsert=fieldParam.split('-')[1];var insertVal=params.field.val();if(toInsert==='url'){var videoProvider=Mautic.getVideoProvider(insertVal);if(videoProvider==null){Mautic.slotFormError(fieldParam,'Please enter a valid YouTube, Vimeo, or MP4 url.');}else{params.slot.find('source').attr('src',insertVal).attr('type',videoProvider);}}else if(toInsert==='gatetime'){params.slot.find('video').attr('data-gate-time',insertVal);}else if(toInsert==='formid'){params.slot.find('video').attr('data-form-id',insertVal);}else if(toInsert==='height'){params.slot.find('video').attr('height',insertVal);}else if(toInsert==='width'){params.slot.find('video').attr('width',insertVal);}}else if(fieldParam==='separator-color'){params.slot.find('hr').css('border-color','#'+params.field.val());}else if(fieldParam==='separator-thickness'){var sep_color=params.slot.attr('data-param-separator-color');params.slot.find('hr').css('border',params.field.val()+'px solid #'+sep_color);}
+if(params.type=='text'){Mautic.setTextSlotEditorStyle(parent.mQuery('#slot_text_content'),params.slot);}});Mautic.builderContents.on('slot:destroy',function(event,params){if(typeof Mautic.activeDEC!=='undefined'){var element=Mautic.activeDEC.detach();Mautic.activeDECParent.append(element);}
+if(params.type==='text'){if(parent.mQuery('#slot_content').length){parent.mQuery('#slot_content').froalaEditor('destroy');parent.mQuery('#slot_content').find('.atwho-inserted').atwho('destroy');}}else if(params.type==='image'){Mautic.deleteCodeModeSlot();var image=params.slot.find('img');if(typeof image!=='undefined'&&image.hasClass('fr-view')){image.froalaEditor('destroy');image.removeAttr('data-froala.editor');image.removeClass('fr-view');}}else if(params.type==='dynamicContent'){Mautic.removeAddVariantButton();var dynConId=params.slot.attr('data-param-dec-id');dynConId='#emailform_dynamicContent_'+dynConId;if(Mautic.activeDEC.attr('id')===dynConId.substr(1)){delete Mautic.activeDEC;delete Mautic.activeDECParent;}
+var dynConTarget=parent.mQuery(dynConId);var dynConName=dynConTarget.find(dynConId+'_tokenName').val();if(dynConName===''){dynConTarget.find('a.remove-item:first').click();parent.mQuery('.dynamicContentFilterContainer').find('a[href='+dynConId+']').parent().remove();params.slot.remove();}}
+Mautic.builderContents.find('.sf-toolbar').remove();});};Mautic.deleteCodeModeSlot=function(){Mautic.killLivePreview();Mautic.destroyCodeMirror();delete Mautic.codeMode;};Mautic.clearSlotFormError=function(field){var customizeSlotField=parent.mQuery('#customize-form-container').find('[data-slot-param="'+field+'"]');if(customizeSlotField.length){customizeSlotField.attr('style','');customizeSlotField.next('[data-error]').remove();}};Mautic.slotFormError=function(field,message){var customizeSlotField=parent.mQuery('#customize-form-container').find('[data-slot-param="'+field+'"]');if(customizeSlotField.length){customizeSlotField.css('border-color','red');if(message.length){var messageContainer=mQuery('<p/>').text(message).attr('data-error','true').css({color:'red',padding:'5px 0'});messageContainer.insertAfter(customizeSlotField);}}};Mautic.getVideoProvider=function(url){var providers=[{test_regex:/^.*((youtu.be)|(youtube.com))\/((v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))?\??v?=?([^#\&\?]*).*/,provider:'video/youtube'},{test_regex:/^.*(vimeo\.com\/)((channels\/[A-z]+\/)|(groups\/[A-z]+\/videos\/))?([0-9]+)/,provider:'video/vimeo'},{test_regex:/mp4/,provider:'video/mp4'}];for(var i=0;i<providers.length;i++){var vp=providers[i];if(vp.test_regex.test(url)){return vp.provider;}}
+return null;};Mautic.setTextSlotEditorStyle=function(editorEl,slot)
 {var wrapper=parent.mQuery(editorEl).closest('.form-group').find('.fr-wrapper .fr-element').first();if(typeof wrapper=='undefined'){return;}
 if(typeof slot.attr('style')!=='undefined'){wrapper.attr('style',slot.attr('style'));}
-mQuery.each(['background-color','color','font-family','font-size','line-height','text-align'],function(key,style){var overrideStyle=Mautic.getSlotStyle(slot,style,false);if(overrideStyle){wrapper.css(style,overrideStyle);}});}
-Mautic.getSlotStyle=function(slot,styleName,fallback){if('background-color'==styleName){var temp=mQuery('<div style="background:none;display:none;"/>').appendTo('body');var transparent=temp.css(styleName);temp.remove();}
+mQuery.each(['background-color','color','font-family','font-size','line-height','text-align'],function(key,style){var overrideStyle=Mautic.getSlotStyle(slot,style,false);if(overrideStyle){wrapper.css(style,overrideStyle);}});};Mautic.getSlotStyle=function(slot,styleName,fallback){if('background-color'==styleName){var temp=mQuery('<div style="background:none;display:none;"/>').appendTo('body');var transparent=temp.css(styleName);temp.remove();}
 var findStyle=function(slot){function test(elem){if('background-color'==styleName){if(typeof elem.attr('bgcolor')!=='undefined'){return elem.attr('bgcolor');}
 if(elem.css(styleName)==transparent){return!elem.is('body')?test(elem.parent()):fallback||transparent;}else{return elem.css(styleName);}}else if(typeof elem.css(styleName)!=='undefined'){return elem.css(styleName);}else{return!elem.is('body')?test(elem.parent()):fallback;}}
 return test(slot);};return findStyle(slot);};Mautic.getBuilderTokensMethod=function(){var method='page:getBuilderTokens';if(parent.mQuery('.builder').hasClass('email-builder')){method='email:getBuilderTokens';}
-return method;};mQuery(function(){if(parent&&parent.mQuery&&parent.mQuery('#builder-template-content').length){Mautic.builderContents=mQuery('body');if(!parent.Mautic.codeMode){Mautic.initSlotListeners();Mautic.initSections();Mautic.initSlots();}}});;Mautic.getAbTestWinnerForm=function(bundle,formName,abKey){if(abKey&&mQuery(abKey).val()&&mQuery(abKey).closest('.form-group').hasClass('has-error')){mQuery(abKey).closest('.form-group').removeClass('has-error');if(mQuery(abKey).next().hasClass('help-block')){mQuery(abKey).next().remove();}}
+return method;};Mautic.prepareDynamicContentBlocksForBuilder=function(builderHtml){for(var token in Mautic.builderTokens){if(Mautic.builderTokens.hasOwnProperty(token)&&/\{dynamic/.test(token)){var defaultContent=Mautic.convertDynamicContentTokenToSlot(token);builderHtml=builderHtml.replace(token,defaultContent);}}
+return builderHtml;};Mautic.convertDynamicContentTokenToSlot=function(token){var dynConData=Mautic.getDynamicContentDataForToken(token);if(dynConData){return'<div data-slot="dynamicContent" contenteditable="false" data-param-dec-id="'+dynConData.id+'">'+dynConData.content+'</div>';}
+return token;};Mautic.getDynamicContentDataForToken=function(token){var dynConName=/\{dynamiccontent="(.*)"}/.exec(token)[1];var dynConTabs=parent.mQuery('#dynamicContentTabs');var dynConTarget=dynConTabs.find('a:contains("'+dynConName+'")').attr('href');var dynConContainer=parent.mQuery(dynConTarget);if(dynConContainer.html()){var dynConContent=dynConContainer.find(dynConTarget+'_content');if(dynConContent.hasClass('editor')){dynConContent=dynConContent.froalaEditor('html.get');}else{dynConContent=dynConContent.html();}
+return{id:parseInt(dynConTarget.replace(/[^0-9]/g,'')),content:dynConContent};}
+return null;};Mautic.convertDynamicContentSlotsToTokens=function(builderHtml){var dynConSlots=mQuery(builderHtml).find('[data-slot="dynamicContent"]');if(dynConSlots.length){dynConSlots.each(function(i){var $this=mQuery(this);var dynConId=$this.attr('data-param-dec-id');dynConId='#emailform_dynamicContent_'+dynConId;var dynConTarget=mQuery(dynConId);var dynConName=dynConTarget.find(dynConId+'_tokenName').val();var dynConToken='{dynamiccontent="'+dynConName+'"}';builderHtml=builderHtml.replace(this.outerHTML,dynConToken);if($this.parent().hasClass('atwho-inserted')){var toReplace=$this.parent('.atwho-inserted').get(0).outerHTML;builderHtml=builderHtml.replace(toReplace,dynConToken);}});}
+return builderHtml;};Mautic.getPredefinedLinks=function(callback){var linkList=[];Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(tokens){if(tokens.length){mQuery.each(tokens,function(token,label){if(token.startsWith('{pagelink=')||token.startsWith('{assetlink=')||token.startsWith('{webview_url')||token.startsWith('{unsubscribe_url')){linkList.push({text:label,href:token});}});}
+return callback(linkList);});};mQuery(function(){if(parent&&parent.mQuery&&parent.mQuery('#builder-template-content').length){Mautic.builderContents=mQuery('body');if(!parent.Mautic.codeMode){Mautic.initSlotListeners();Mautic.initSections();Mautic.initSlots();}}});;Mautic.getAbTestWinnerForm=function(bundle,formName,abKey){if(abKey&&mQuery(abKey).val()&&mQuery(abKey).closest('.form-group').hasClass('has-error')){mQuery(abKey).closest('.form-group').removeClass('has-error');if(mQuery(abKey).next().hasClass('help-block')){mQuery(abKey).next().remove();}}
 Mautic.activateLabelLoadingIndicator(formName+'_variantSettings_winnerCriteria');var id=mQuery('#'+formName+'_sessionId').val();var query="action="+bundle+":getAbTestForm&abKey="+mQuery(abKey).val()+"&id="+id;mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:query,dataType:"json",success:function(response){if(typeof response.html!='undefined'){if(mQuery('#'+formName+'_variantSettings_properties').length){mQuery('#'+formName+'_variantSettings_properties').replaceWith(response.html);}else{mQuery('#'+formName+'_variantSettings').append(response.html);}
 if(response.html!=''){Mautic.onPageLoad('#'+formName+'_variantSettings_properties',response);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};;mQuery(document).on({"chosen:hiding_dropdown":function(){mQuery('#app-wrapper').css('overflow','hidden');},"chosen:showing_dropdown":function(){mQuery('#app-wrapper').css('overflow','visible');}});Mautic.renameFormElements=function(container,oldIdPrefix,oldNamePrefix,newIdPrefix,newNamePrefix){mQuery('*[id^="'+oldIdPrefix+'"]',container).each(function(){var id=mQuery(this).attr('id');id=id.replace(oldIdPrefix,newIdPrefix);mQuery(this).attr('id',id);var name=mQuery(this).attr('name');if(name){name=name.replace(oldNamePrefix,newNamePrefix);mQuery(this).attr('name',name);}});mQuery('label[for^="'+oldIdPrefix+'"]',container).each(function(){var id=mQuery(this).attr('for');id=id.replace(oldIdPrefix,newIdPrefix);mQuery(this).attr('for',id);});};Mautic.ajaxifyForm=function(formName){Mautic.initializeFormFieldVisibilitySwitcher(formName);var form='form[name="'+formName+'"]';mQuery(form+' input, '+form+' select').off('keydown.ajaxform');mQuery(form+' input, '+form+' select').on('keydown.ajaxform',function(e){if(e.keyCode==13&&(e.metaKey||e.ctrlKey)){if(MauticVars.formSubmitInProgress){return false;}
 var saveButton=mQuery(form).find('button.btn-save');var applyButton=mQuery(form).find('button.btn-apply');var modalParent=mQuery(form).closest('.modal');var inMain=mQuery(modalParent).length>0?false:true;if(mQuery(saveButton).length){if(inMain){if(mQuery(form).find('button.btn-save.btn-copy').length){mQuery(mQuery(form).find('button.btn-save.btn-copy')).trigger('click');return;}}else{if(mQuery(modalParent).find('button.btn-save.btn-copy').length){mQuery(mQuery(modalParent).find('button.btn-save.btn-copy')).trigger('click');return;}}
@@ -218,12 +243,13 @@ if(emptyOption){mQueryParent(el).prepend(emptyOption);}
 newOption.prop('selected',true);mQueryParent(el).trigger("chosen:updated");}
 if(window.opener){window.close();}else{mQueryParent('#MauticSharedModal').modal('hide');}};Mautic.toggleYesNoButtonClass=function(changedId){changedId='#'+changedId;var isYesButton=mQuery(changedId).parent().hasClass('btn-yes');var isExtraButton=mQuery(changedId).parent().hasClass('btn-extra');if(isExtraButton){mQuery(changedId).parents('.btn-group').find('.btn').removeClass('btn-success btn-danger').addClass('btn-default');}else{var otherButton=isYesButton?'.btn-no':'.btn-yes';var otherLabel=mQuery(changedId).parent().parent().find(otherButton);if(mQuery(changedId).prop('checked')){var thisRemove='btn-default',otherAdd='btn-default';if(isYesButton){var thisAdd='btn-success',otherRemove='btn-danger';}else{var thisAdd='btn-danger',otherRemove='btn-success';}}else{var thisAdd='btn-default';if(isYesButton){var thisAdd='btn-success',otherRemove='btn-danger';}else{var thisAdd='btn-danger',otherRemove='btn-success';}}
 mQuery(changedId).parent().removeClass(thisRemove).addClass(thisAdd);mQuery(otherLabel).removeClass(otherRemove).addClass(otherAdd);}
-return true;};Mautic.removeFormListOption=function(el){var sortableDiv=mQuery(el).parents('div.sortable');var inputCount=mQuery(sortableDiv).parents('div.form-group').find('input.sortable-itemcount');var count=mQuery(inputCount).val();count--;mQuery(inputCount).val(count);mQuery(sortableDiv).remove();};Mautic.updateFieldOperatorValue=function(field,action){var fieldId=mQuery(field).attr('id');Mautic.activateLabelLoadingIndicator(fieldId);if(fieldId.indexOf('_operator')!==-1){var fieldType='operator';}else if(fieldId.indexOf('_field')!==-1){var fieldType='field';}else{return;}
-var fieldPrefix=fieldId.slice(0,-1*fieldType.length);var fieldAlias=mQuery('#'+fieldPrefix+'field').val();var fieldOperator=mQuery('#'+fieldPrefix+'operator').val();Mautic.ajaxActionRequest(action,{'alias':fieldAlias,'operator':fieldOperator,'changed':fieldType},function(response){if(typeof response.options!='undefined'){var valueField=mQuery('#'+fieldPrefix+'value');var valueFieldAttrs={'class':valueField.attr('class'),'id':valueField.attr('id'),'name':valueField.attr('name'),'autocomplete':valueField.attr('autocomplete'),'value':valueField.attr('value')};if(mQuery('#'+fieldPrefix+'value_chosen').length){mQuery('#'+fieldPrefix+'value').chosen('destroy');}
-if(!mQuery.isEmptyObject(response.options)){var newValueField=mQuery('<select/>').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);mQuery.each(response.options,function(optionKey,optionVal){var option=mQuery("<option/>").attr('value',optionKey).text(optionVal);newValueField.append(option);});valueField.replaceWith(newValueField);Mautic.activateChosenSelect(newValueField);}else{var newValueField=mQuery('<input/>').attr('type','text').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);if(response.disabled){newValueField.prop('disabled',true);}
+return true;};Mautic.removeFormListOption=function(el){var sortableDiv=mQuery(el).parents('div.sortable');var inputCount=mQuery(sortableDiv).parents('div.form-group').find('input.sortable-itemcount');var count=mQuery(inputCount).val();count--;mQuery(inputCount).val(count);mQuery(sortableDiv).remove();};Mautic.createOption=function(value,label){return mQuery('<option/>').attr('value',value).text(label);}
+Mautic.updateFieldOperatorValue=function(field,action){var fieldId=mQuery(field).attr('id');Mautic.activateLabelLoadingIndicator(fieldId);if(fieldId.indexOf('_operator')!==-1){var fieldType='operator';}else if(fieldId.indexOf('_field')!==-1){var fieldType='field';}else{return;}
+var fieldPrefix=fieldId.slice(0,-1*fieldType.length);var fieldAlias=mQuery('#'+fieldPrefix+'field').val();var fieldOperator=mQuery('#'+fieldPrefix+'operator').val();Mautic.ajaxActionRequest(action,{'alias':fieldAlias,'operator':fieldOperator,'changed':fieldType},function(response){if(typeof response.options!='undefined'){var valueField=mQuery('#'+fieldPrefix+'value');var valueFieldAttrs={'class':valueField.attr('class'),'id':valueField.attr('id'),'name':valueField.attr('name'),'autocomplete':valueField.attr('autocomplete'),'value':valueField.val()};if(mQuery('#'+fieldPrefix+'value_chosen').length){valueFieldAttrs['value']='';valueField.chosen('destroy');}
+if(!mQuery.isEmptyObject(response.options)&&response.fieldType!=='number'){var newValueField=mQuery('<select/>').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);mQuery.each(response.options,function(value,optgroup){if(typeof optgroup==='object'){var optgroupEl=mQuery('<optgroup/>').attr('label',value);mQuery.each(optgroup,function(optVal,label){optgroupEl.append(Mautic.createOption(optVal,label))});newValueField.append(optgroupEl);}else{newValueField.append(Mautic.createOption(value,optgroup));}});newValueField.val(valueFieldAttrs['value']);valueField.replaceWith(newValueField);Mautic.activateChosenSelect(newValueField);}else{var newValueField=mQuery('<input/>').attr('type','text').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);if(response.disabled){newValueField.attr('value','');newValueField.prop('disabled',true);}
 valueField.replaceWith(newValueField);if(response.fieldType=='date'||response.fieldType=='datetime'){Mautic.activateDateTimeInputs(newValueField,response.fieldType);}}
-if(!mQuery.isEmptyObject(response.operators)){if(mQuery('#'+fieldPrefix+'operator_chosen').length){mQuery('#'+fieldPrefix+'operator').chosen('destroy');}
-var operatorField=mQuery('#'+fieldPrefix+'operator');var operatorFieldAttrs={'class':operatorField.attr('class'),'id':operatorField.attr('id'),'name':operatorField.attr('name'),'autocomplete':operatorField.attr('autocomplete'),'value':operatorField.attr('value')};var newOperatorField=mQuery('<select/>').attr('class',operatorFieldAttrs['class']).attr('id',operatorFieldAttrs['id']).attr('name',operatorFieldAttrs['name']).attr('autocomplete',operatorFieldAttrs['autocomplete']).attr('value',operatorFieldAttrs['value']).attr('onchange','Mautic.updateLeadFieldValues(this)');mQuery.each(response.operators,function(optionKey,optionVal){var option=mQuery("<option/>").attr('value',optionKey).text(optionVal);newOperatorField.append(option);});operatorField.replaceWith(newOperatorField);Mautic.activateChosenSelect(newOperatorField);}}
+if(!mQuery.isEmptyObject(response.operators)){var operatorField=mQuery('#'+fieldPrefix+'operator');if(mQuery('#'+fieldPrefix+'operator_chosen').length){operatorField.chosen('destroy');}
+var operatorFieldAttrs={'class':operatorField.attr('class'),'id':operatorField.attr('id'),'name':operatorField.attr('name'),'autocomplete':operatorField.attr('autocomplete'),'value':operatorField.val()};var newOperatorField=mQuery('<select/>').attr('class',operatorFieldAttrs['class']).attr('id',operatorFieldAttrs['id']).attr('name',operatorFieldAttrs['name']).attr('autocomplete',operatorFieldAttrs['autocomplete']).attr('value',operatorFieldAttrs['value']).attr('onchange','Mautic.updateLeadFieldValues(this)');mQuery.each(response.operators,function(optionKey,optionVal){newOperatorField.append(Mautic.createOption(optionKey,optionVal));});newOperatorField.val(operatorField.val());operatorField.replaceWith(newOperatorField);Mautic.activateChosenSelect(newOperatorField);}}
 Mautic.removeLabelLoadingIndicator();});};;if(typeof Chart!='undefined'){Chart.defaults.global.elements.line.borderWidth=1;Chart.defaults.global.elements.point.radius=2;Chart.defaults.global.legend.labels.boxWidth=12;Chart.defaults.global.maintainAspectRatio=false;}
 Mautic.renderCharts=function(scope){var charts=[];if(!Mautic.chartObjects)Mautic.chartObjects=[];if(mQuery.type(scope)==='string'){charts=mQuery(scope).find('canvas.chart');}else if(scope){charts=scope.find('canvas.chart');}else{charts=mQuery('canvas.chart');}
 if(charts.length){charts.each(function(index,canvas){canvas=mQuery(canvas);if(!canvas.hasClass('chart-rendered')){if(canvas.hasClass('line-chart')){Mautic.renderLineChart(canvas)}else if(canvas.hasClass('pie-chart')){Mautic.renderPieChart(canvas)}else if(canvas.hasClass('bar-chart')){Mautic.renderBarChart(canvas)}else if(canvas.hasClass('liefechart-bar-chart')){Mautic.renderLifechartBarChart(canvas)}else if(canvas.hasClass('simple-bar-chart')){Mautic.renderSimpleBarChart(canvas)}else if(canvas.hasClass('horizontal-bar-chart')){Mautic.renderHorizontalBarChart(canvas)}}
@@ -249,7 +275,8 @@ Mautic.loadAjaxModal(target,route,method,header,footer,preventDismissal);};Mauti
 if(footer=='false'){mQuery(target+" .modal-footer").addClass('hide');}
 mQuery(target).on('show.bs.modal',function(){if(header){mQuery(target+" .modal-title").html(header);}
 if(footer&&footer!='false'){mQuery(target+" .modal-footer").html(header);}});mQuery(target).on('hidden.bs.modal',function(){if(typeof Mautic.modalContentXhr[target]!='undefined'){Mautic.modalContentXhr[target].abort();delete Mautic.modalContentXhr[target];}
-mQuery('body').removeClass('noscroll');Mautic.onPageUnload(target);Mautic.resetModal(target);});if(typeof mQuery(target).data('bs.modal')!=='undefined'&&typeof mQuery(target).data('bs.modal').options!=='undefined'){if(preventDismissal){mQuery(target).data('bs.modal').options.keyboard=false;mQuery(target).data('bs.modal').options.backdrop='static';}else{mQuery(target).data('bs.modal').options.keyboard=true;mQuery(target).data('bs.modal').options.backdrop=true;}}else{if(preventDismissal){mQuery(target).modal({backdrop:'static',keyboard:false});}else{mQuery(target).modal({backdrop:true,keyboard:true});}}
+mQuery('body').removeClass('noscroll');var response={};if(Mautic.modalMauticContent){response.mauticContent=Mautic.modalMauticContent;delete Mautic.modalMauticContent;}
+Mautic.onPageUnload(target,response);Mautic.resetModal(target);});if(typeof mQuery(target).data('bs.modal')!=='undefined'&&typeof mQuery(target).data('bs.modal').options!=='undefined'){if(preventDismissal){mQuery(target).data('bs.modal').options.keyboard=false;mQuery(target).data('bs.modal').options.backdrop='static';}else{mQuery(target).data('bs.modal').options.keyboard=true;mQuery(target).data('bs.modal').options.backdrop=true;}}else{if(preventDismissal){mQuery(target).modal({backdrop:'static',keyboard:false});}else{mQuery(target).modal({backdrop:true,keyboard:true});}}
 Mautic.showModal(target);if(typeof Mautic.modalContentXhr=='undefined'){Mautic.modalContentXhr={};}else if(typeof Mautic.modalContentXhr[target]!='undefined'){Mautic.modalContentXhr[target].abort();}
 Mautic.modalContentXhr[target]=mQuery.ajax({url:route,type:method,dataType:"json",success:function(response){if(response){Mautic.processModalContent(response,target);}
 Mautic.stopIconSpinPostEvent();},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);Mautic.stopIconSpinPostEvent();},complete:function(){Mautic.stopModalLoadingBar(target);delete Mautic.modalContentXhr[target];}});};Mautic.resetModal=function(target){if(mQuery(target).hasClass('in')){return;}
@@ -262,13 +289,13 @@ if(response.notifications){Mautic.setNotifications(response.notifications);}
 if(response.browserNotifications){Mautic.setBrowserNotifications(response.browserNotifications);}
 if(response.callback){window["Mautic"][response.callback].apply('window',[response]);return;}
 if(response.target){mQuery(response.target).html(response.newContent);Mautic.onPageLoad(response.target,response,true);}else if(response.newContent){if(mQuery(target+' .loading-placeholder').length){mQuery(target+' .loading-placeholder').addClass('hide');mQuery(target+' .modal-body-content').html(response.newContent);mQuery(target+' .modal-body-content').removeClass('hide');}else{mQuery(target+' .modal-body').html(response.newContent);}}
-Mautic.onPageLoad(target,response,true);if(response.closeModal){mQuery('body').removeClass('noscroll');mQuery(target).modal('hide');if(!response.updateModalContent){Mautic.onPageUnload(target,response);}
-if(response.mauticContent){if(typeof Mautic[response.mauticContent+"OnLoad"]=='function'){if(typeof Mautic.loadedContent[response.mauticContent]=='undefined'){Mautic.loadedContent[response.mauticContent]=true;Mautic[response.mauticContent+"OnLoad"](target,response);}}}}}};Mautic.showConfirmation=function(el){var precheck=mQuery(el).data('precheck');if(precheck){if(typeof precheck=='function'){if(!precheck()){return;}}else if(typeof Mautic[precheck]=='function'){if(!Mautic[precheck]()){return;}}}
+Mautic.onPageLoad(target,response,true);Mautic.modalMauticContent=false;if(response.closeModal){mQuery('body').removeClass('noscroll');mQuery(target).modal('hide');if(response.mauticContent){if(typeof Mautic[response.mauticContent+"OnLoad"]=='function'){Mautic[response.mauticContent+"OnLoad"](target,response);}}
+if(!response.updateModalContent){Mautic.onPageUnload(target,response);}}else{Mautic.modalMauticContent=response.mauticContent?response.mauticContent:false;}}};Mautic.showConfirmation=function(el){var precheck=mQuery(el).data('precheck');if(precheck){if(typeof precheck=='function'){if(!precheck()){return;}}else if(typeof Mautic[precheck]=='function'){if(!Mautic[precheck]()){return;}}}
 var message=mQuery(el).data('message');var confirmText=mQuery(el).data('confirm-text');var confirmAction=mQuery(el).attr('href');var confirmCallback=mQuery(el).data('confirm-callback');var cancelText=mQuery(el).data('cancel-text');var cancelCallback=mQuery(el).data('cancel-callback');var confirmContainer=mQuery("<div />").attr({"class":"modal fade confirmation-modal"});var confirmDialogDiv=mQuery("<div />").attr({"class":"modal-dialog"});var confirmContentDiv=mQuery("<div />").attr({"class":"modal-content"});var confirmFooterDiv=mQuery("<div />").attr({"class":"modal-body text-center"});var confirmHeaderDiv=mQuery("<div />").attr({"class":"modal-header"});confirmHeaderDiv.append(mQuery('<h4 />').attr({"class":"modal-title"}).text(message));var confirmButton=mQuery('<button type="button" />').addClass("btn btn-danger").css("marginRight","5px").css("marginLeft","5px").click(function(){if(typeof Mautic[confirmCallback]==="function"){window["Mautic"][confirmCallback].apply('window',[confirmAction,el]);}}).html(confirmText);if(cancelText){var cancelButton=mQuery('<button type="button" />').addClass("btn btn-primary").click(function(){if(cancelCallback&&typeof Mautic[cancelCallback]==="function"){window["Mautic"][cancelCallback].apply('window',[]);}else{Mautic.dismissConfirmation();}}).html(cancelText);}
 if(typeof cancelButton!='undefined'){confirmFooterDiv.append(cancelButton);}
 confirmFooterDiv.append(confirmButton);confirmContentDiv.append(confirmHeaderDiv);confirmContentDiv.append(confirmFooterDiv);confirmContainer.append(confirmDialogDiv.append(confirmContentDiv));mQuery('body').append(confirmContainer);mQuery('.confirmation-modal').on('hidden.bs.modal',function(){mQuery(this).remove();});mQuery('.confirmation-modal').modal('show');};Mautic.dismissConfirmation=function(){if(mQuery('.confirmation-modal').length){mQuery('.confirmation-modal').modal('hide');}};Mautic.closeModalAndRedirect=function(el,url){Mautic.startModalLoadingBar(el);Mautic.loadContent(url);mQuery('body').removeClass('noscroll');};Mautic.loadAjaxModalBySelectValue=function(el,value,route,header){var selectVal=mQuery(el).val();var hasValue=(selectVal==value);if(!hasValue&&mQuery.isArray(selectVal)){hasValue=(mQuery.inArray(value,selectVal)!==-1);}
 if(hasValue){route=route+(route.indexOf('?')>-1?'&':'?')+'modal=1&contentOnly=1&updateSelect='+mQuery(el).attr('id');mQuery(el).find('option[value="'+value+'"]').prop('selected',false);mQuery(el).trigger("chosen:updated");Mautic.loadAjaxModal('#MauticSharedModal',route,'get',header);}};Mautic.showModal=function(target){if(mQuery('.modal.in').length){if(mQuery(target).closest('.modal').length){mQuery('<div />').attr('data-modal-placeholder',target).insertAfter(mQuery(target));mQuery(target).attr('data-modal-moved',1);mQuery(target).appendTo('body');}
-var activeModal=mQuery('.modal.in .modal-dialog:not(:has(.aside))').parents('.modal').last(),targetModal=mQuery(target);if(activeModal.length){targetModal.attr('data-previous-modal','#'+activeModal.attr('id'));activeModal.find('.modal-dialog').addClass('aside');var stackedDialogCount=mQuery('.modal.in .modal-dialog.aside').length;if(stackedDialogCount<=5){activeModal.find('.modal-dialog').addClass('aside-'+stackedDialogCount);}
+var activeModal=mQuery('.modal.in .modal-dialog:not(:has(.aside))').parents('.modal').last(),targetModal=mQuery(target);if(activeModal.length&&activeModal.attr('id')!==targetModal.attr('id')){targetModal.attr('data-previous-modal','#'+activeModal.attr('id'));activeModal.find('.modal-dialog').addClass('aside');var stackedDialogCount=mQuery('.modal.in .modal-dialog.aside').length;if(stackedDialogCount<=5){activeModal.find('.modal-dialog').addClass('aside-'+stackedDialogCount);}
 mQuery(target).on('hide.bs.modal',function(){var modal=mQuery(this);var previous=modal.attr('data-previous-modal');if(previous){mQuery(previous).find('.modal-dialog').removeClass('aside');mQuery(modal).attr('data-previous-modal',undefined);}
 if(mQuery(modal).attr('data-modal-moved')){mQuery('[data-modal-placeholder').replaceWith(mQuery(modal));mQuery(modal).attr('data-modal-moved',undefined);}});}}
 mQuery(target).modal('show');};;MauticVars.liveCache=new Array();MauticVars.lastSearchStr="";MauticVars.globalLivecache=new Array();MauticVars.lastGlobalSearchStr="";Mautic.isNewEntity=function(idInputSelector){id=mQuery(idInputSelector);if(id.length){return id.val().match("^new_");}
@@ -297,7 +324,7 @@ mQuery(el).tooltip('destroy');mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:"a
 var items=Mautic.getCheckedListIds(el,true);var queryGlue=action.indexOf('?')>=0?'&':'?';var action=action+queryGlue+'ids='+items;Mautic.executeAction(action);};Mautic.batchActionPrecheck=function(container){if(typeof container=='undefined'){container='';}
 return mQuery(container+' input[class=list-checkbox]:checked').length;};Mautic.getCheckedListIds=function(el,stringify){var checkboxes='input[class=list-checkbox]:checked';if(typeof el!='undefined'&&el){var target=mQuery(el).data('target');if(target){checkboxes=target+' '+checkboxes;}}
 var items=mQuery(checkboxes).map(function(){return mQuery(this).val();}).get();if(stringify){items=JSON.stringify(items);}
-return items;};;Mautic.builderTokens={};Mautic.dynamicContentTokens={};Mautic.builderTokensRequestInProgress=false;Mautic.activateGlobalFroalaOptions=function(){Mautic.basicFroalaOptions={enter:mQuery.FroalaEditor.ENTER_BR,imageUploadURL:mauticBaseUrl+'s/file/upload',imageManagerLoadURL:mauticBaseUrl+'s/file/list',imageManagerDeleteURL:mauticBaseUrl+'s/file/delete',imageDefaultWidth:0,htmlAllowedTags:['a','abbr','address','area','article','aside','audio','b','base','bdi','bdo','blockquote','br','button','canvas','caption','cite','code','col','colgroup','datalist','dd','del','details','dfn','dialog','div','dl','dt','em','embed','fieldset','figcaption','figure','footer','form','h1','h2','h3','h4','h5','h6','header','hgroup','hr','i','iframe','img','input','ins','kbd','keygen','label','legend','li','link','main','map','mark','menu','menuitem','meter','nav','noscript','object','ol','optgroup','option','output','p','param','pre','progress','queue','rp','rt','ruby','s','samp','script','style','section','select','small','source','span','strike','strong','sub','summary','sup','table','tbody','td','textarea','tfoot','th','thead','time','title','tr','track','u','ul','var','video','wbr','center'],htmlAllowedAttrs:['data-atwho-at-query','data-section','data-section-wrapper','accept','accept-charset','accesskey','action','align','allowfullscreen','alt','async','autocomplete','autofocus','autoplay','autosave','background','bgcolor','border','charset','cellpadding','cellspacing','checked','cite','class','color','cols','colspan','content','contenteditable','contextmenu','controls','coords','data','data-.*','datetime','default','defer','dir','dirname','disabled','download','draggable','dropzone','enctype','for','form','formaction','frameborder','headers','height','hidden','high','href','hreflang','http-equiv','icon','id','ismap','itemprop','keytype','kind','label','lang','language','list','loop','low','max','maxlength','media','method','min','mozallowfullscreen','multiple','name','novalidate','open','optimum','pattern','ping','placeholder','poster','preload','pubdate','radiogroup','readonly','rel','required','reversed','rows','rowspan','sandbox','scope','scoped','scrolling','seamless','selected','shape','size','sizes','span','src','srcdoc','srclang','srcset','start','step','summary','spellcheck','style','tabindex','target','title','type','translate','usemap','value','valign','webkitallowfullscreen','width','wrap']};Mautic.basicFroalaOptions.iframeStyle=mQuery.FroalaEditor.DEFAULTS.iframeStyle+'body .fr-gatedvideo{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;position:relative;display:table;min-height:140px}body .fr-gatedvideo::after{content:"";position:absolute;background-repeat:no-repeat;background-position:50% 40%;height:100%;width:100%;top:0;left:0;display:block;clear:both;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAByCAMAAAC4A3VPAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD64ociAAAAVHRSTlMAAQIDBAUGCAkKCw0PEBEUFxsfICUmKistLjE1Njo8QExNVl9iY2RmZ2hpa2xtb3Bxc3R8gIWGkZedoquwt8XP0dXX2drc4OLm6Ont7/Hz9ff5+/3esbxfAAACIklEQVRo3u3aW1fTQBSG4a9BKIUKVCi0IqCIp3pAjYpQaEGQYlWk5fv/v8WLrkKbJjNNsmeu9nuXrFnruclhJXsATdM0TdNSVihVqrV6itZXl2ZyeLM7Rz1mqN1YyQaWwltmrrUxDfHgUSUYOdztM1fNBav4rE/+fjI8mjtm3q5rFnFvsK46OFo4p0BPpxHZBADMd0jX5ovhor8AEJxSqLpdJAHgQErkddI19JJjZI1yNePFVxwjC5eCJDesIoEtSZGtGPE1I2RLlOTks+9NZAUWZUU2bCKxLUy2I2JjYgVCYZIzFpE4kSaXLCLRkSZXR8S3cQtwI02uW0RCWhx5zr6jb/I9fZNJojvyA32T+/RNGkRHpEl0QxpFJ+RHeiYff6Jv8oLeSSqppJJKKqmkkkoqqWTe9rveyfrDrncSFtPJl5fZdPN9aTQdfUWbTFf/Cgymsz8i5a53Mtl0+HcryZQn7+dQCSb+SJNVWEycSZMVWEwcSpMlWMy7gZtUvQIsJtaEyaPIBGHSRNCTJXdgM4GvouLtLGwmsCxKhjEzr4gJ4Lug2C/FTfbKvyJk8Z8cuRs/vxwzAWBTTDxOmguPmqaBRurO5zCFOTjxRUTsmHYz3JkX5sFNqk7njfsKhubn4YnN3NfQQWDZPVG+Iskf9zduMd+9cmnbrgGgGP5sPx8bby5/y/zsa20VMm74Cdb2Ds/SvbNvOifh9iI0TdM0TZPtP32lY4xP2bT1AAAAAElFTkSuQmCC)}body .fr-gatedvideo video{background-color:rgba(67,83,147,.5)}body .fr-gatedvideo.fr-active > *{z-index:2;position:relative}body .fr-gatedvideo > *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}body .fr-box .fr-gatedvideo-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}body .fr-box .fr-gatedvideo-resizer.fr-active{display:block}body .fr-box .fr-gatedvideo-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{cursor:nw-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{cursor:ne-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{cursor:sw-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{cursor:se-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler{width:12px;height:12px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{right:-6px;top:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){body .fr-box .fr-gatedvideo-resizer .fr-handler{width:10px;height:10px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{right:-5px;top:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}body .fr-gatedvideo-size-layer .fr-gatedvideo-group .fr-input-line{display:inline-block}body .fr-gatedvideo-size-layer .fr-gatedvideo-group .fr-input-line + .fr-input-line{margin-left:10px}body .fr-gatedvideo-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}';mQuery.FroalaEditor.DEFAULTS.key='MCHCPd1XQVZFSHSd1C==';};Mautic.initAtWho=function(element,method,froala){if(Mautic.builderTokensRequestInProgress){var intervalID=setInterval(function(){if(!Mautic.builderTokensRequestInProgress){clearInterval(intervalID);Mautic.configureAtWho(element,method,froala);}},500);}else{Mautic.configureAtWho(element,method,froala);}};Mautic.configureAtWho=function(element,method,froala){Mautic.getTokens(method,function(tokens){element.atwho('destroy');Mautic.configureDynamicContentAtWhoTokens();mQuery.extend(tokens,Mautic.dynamicContentTokens);element.atwho({at:'{',displayTpl:'<li>${name} <small>${id}</small></li>',insertTpl:"${id}",editableAtwhoQueryAttrs:{"data-fr-verified":true},data:mQuery.map(tokens,function(value,i){return{'id':i,'name':value};}),acceptSpaceBar:true});if(froala){froala.events.on('keydown',function(e){if((e.which==mQuery.FroalaEditor.KEYCODE.TAB||e.which==mQuery.FroalaEditor.KEYCODE.ENTER||e.which==mQuery.FroalaEditor.KEYCODE.SPACE)&&froala.$el.atwho('isSelecting')){return false;}},true);}});};Mautic.getTokens=function(method,callback){if(!mQuery.isEmptyObject(Mautic.builderTokens)){return callback(Mautic.builderTokens);}
+return items;};;Mautic.builderTokens={};Mautic.dynamicContentTokens={};Mautic.builderTokensRequestInProgress=false;Mautic.activateGlobalFroalaOptions=function(){Mautic.basicFroalaOptions={enter:mQuery.FroalaEditor.ENTER_BR,imageUploadURL:mauticBaseUrl+'s/file/upload',imageManagerLoadURL:mauticBaseUrl+'s/file/list',imageManagerDeleteURL:mauticBaseUrl+'s/file/delete',imageDefaultWidth:0,pastePlain:true,htmlAllowedTags:['a','abbr','address','area','article','aside','audio','b','base','bdi','bdo','blockquote','br','button','canvas','caption','cite','code','col','colgroup','datalist','dd','del','details','dfn','dialog','div','dl','dt','em','embed','fieldset','figcaption','figure','footer','form','h1','h2','h3','h4','h5','h6','header','hgroup','hr','i','iframe','img','input','ins','kbd','keygen','label','legend','li','link','main','map','mark','menu','menuitem','meter','nav','noscript','object','ol','optgroup','option','output','p','param','pre','progress','queue','rp','rt','ruby','s','samp','script','style','section','select','small','source','span','strike','strong','sub','summary','sup','table','tbody','td','textarea','tfoot','th','thead','time','title','tr','track','u','ul','var','video','wbr','center'],htmlAllowedAttrs:['data-atwho-at-query','data-section','data-section-wrapper','accept','accept-charset','accesskey','action','align','allowfullscreen','alt','async','autocomplete','autofocus','autoplay','autosave','background','bgcolor','border','charset','cellpadding','cellspacing','checked','cite','class','color','cols','colspan','content','contenteditable','contextmenu','controls','coords','data','data-.*','datetime','default','defer','dir','dirname','disabled','download','draggable','dropzone','enctype','for','form','formaction','frameborder','headers','height','hidden','high','href','hreflang','http-equiv','icon','id','ismap','itemprop','keytype','kind','label','lang','language','list','loop','low','max','maxlength','media','method','min','mozallowfullscreen','multiple','name','novalidate','open','optimum','pattern','ping','placeholder','poster','preload','pubdate','radiogroup','readonly','rel','required','reversed','rows','rowspan','sandbox','scope','scoped','scrolling','seamless','selected','shape','size','sizes','span','src','srcdoc','srclang','srcset','start','step','summary','spellcheck','style','tabindex','target','title','type','translate','usemap','value','valign','webkitallowfullscreen','width','wrap']};Mautic.basicFroalaOptions.iframeStyle=mQuery.FroalaEditor.DEFAULTS.iframeStyle+'body .fr-gatedvideo{user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;position:relative;display:table;min-height:140px}body .fr-gatedvideo::after{content:"";position:absolute;background-repeat:no-repeat;background-position:50% 40%;height:100%;width:100%;top:0;left:0;display:block;clear:both;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAByCAMAAAC4A3VPAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD64ociAAAAVHRSTlMAAQIDBAUGCAkKCw0PEBEUFxsfICUmKistLjE1Njo8QExNVl9iY2RmZ2hpa2xtb3Bxc3R8gIWGkZedoquwt8XP0dXX2drc4OLm6Ont7/Hz9ff5+/3esbxfAAACIklEQVRo3u3aW1fTQBSG4a9BKIUKVCi0IqCIp3pAjYpQaEGQYlWk5fv/v8WLrkKbJjNNsmeu9nuXrFnruclhJXsATdM0TdNSVihVqrV6itZXl2ZyeLM7Rz1mqN1YyQaWwltmrrUxDfHgUSUYOdztM1fNBav4rE/+fjI8mjtm3q5rFnFvsK46OFo4p0BPpxHZBADMd0jX5ovhor8AEJxSqLpdJAHgQErkddI19JJjZI1yNePFVxwjC5eCJDesIoEtSZGtGPE1I2RLlOTks+9NZAUWZUU2bCKxLUy2I2JjYgVCYZIzFpE4kSaXLCLRkSZXR8S3cQtwI02uW0RCWhx5zr6jb/I9fZNJojvyA32T+/RNGkRHpEl0QxpFJ+RHeiYff6Jv8oLeSSqppJJKKqmkkkoqqWTe9rveyfrDrncSFtPJl5fZdPN9aTQdfUWbTFf/Cgymsz8i5a53Mtl0+HcryZQn7+dQCSb+SJNVWEycSZMVWEwcSpMlWMy7gZtUvQIsJtaEyaPIBGHSRNCTJXdgM4GvouLtLGwmsCxKhjEzr4gJ4Lug2C/FTfbKvyJk8Z8cuRs/vxwzAWBTTDxOmguPmqaBRurO5zCFOTjxRUTsmHYz3JkX5sFNqk7njfsKhubn4YnN3NfQQWDZPVG+Iskf9zduMd+9cmnbrgGgGP5sPx8bby5/y/zsa20VMm74Cdb2Ds/SvbNvOifh9iI0TdM0TZPtP32lY4xP2bT1AAAAAElFTkSuQmCC)}body .fr-gatedvideo video{background-color:rgba(67,83,147,.5)}body .fr-gatedvideo.fr-active > *{z-index:2;position:relative}body .fr-gatedvideo > *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;max-width:100%;border:none}body .fr-box .fr-gatedvideo-resizer{position:absolute;border:solid 1px #1e88e5;display:none;user-select:none;-o-user-select:none;-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none}body .fr-box .fr-gatedvideo-resizer.fr-active{display:block}body .fr-box .fr-gatedvideo-resizer .fr-handler{display:block;position:absolute;background:#1e88e5;border:solid 1px #fff;z-index:4;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{cursor:nw-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{cursor:ne-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{cursor:sw-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{cursor:se-resize}body .fr-box .fr-gatedvideo-resizer .fr-handler{width:12px;height:12px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{left:-6px;top:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{right:-6px;top:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{left:-6px;bottom:-6px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{right:-6px;bottom:-6px}@media (min-width: 1200px){body .fr-box .fr-gatedvideo-resizer .fr-handler{width:10px;height:10px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hnw{left:-5px;top:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hne{right:-5px;top:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hsw{left:-5px;bottom:-5px}body .fr-box .fr-gatedvideo-resizer .fr-handler.fr-hse{right:-5px;bottom:-5px}}body .fr-gatedvideo-size-layer .fr-gatedvideo-group .fr-input-line{display:inline-block}body .fr-gatedvideo-size-layer .fr-gatedvideo-group .fr-input-line + .fr-input-line{margin-left:10px}body .fr-gatedvideo-overlay{position:fixed;top:0;left:0;bottom:0;right:0;z-index:9999;display:none}';mQuery.FroalaEditor.DEFAULTS.key='MCHCPd1XQVZFSHSd1C==';};Mautic.initAtWho=function(element,method,froala){if(Mautic.builderTokensRequestInProgress){var intervalID=setInterval(function(){if(!Mautic.builderTokensRequestInProgress){clearInterval(intervalID);Mautic.configureAtWho(element,method,froala);}},500);}else{Mautic.configureAtWho(element,method,froala);}};Mautic.configureAtWho=function(element,method,froala){Mautic.getTokens(method,function(tokens){element.atwho('destroy');Mautic.configureDynamicContentAtWhoTokens();mQuery.extend(tokens,Mautic.dynamicContentTokens);element.atwho({at:'{',displayTpl:'<li>${name} <small>${id}</small></li>',insertTpl:"${id}",editableAtwhoQueryAttrs:{"data-fr-verified":true},data:mQuery.map(tokens,function(value,i){return{'id':i,'name':value};}),acceptSpaceBar:true});if(froala){froala.events.on('keydown',function(e){if((e.which==mQuery.FroalaEditor.KEYCODE.TAB||e.which==mQuery.FroalaEditor.KEYCODE.ENTER||e.which==mQuery.FroalaEditor.KEYCODE.SPACE)&&froala.$el.atwho('isSelecting')){return false;}},true);}});};Mautic.getTokens=function(method,callback){if(!mQuery.isEmptyObject(Mautic.builderTokens)){return callback(Mautic.builderTokens);}
 Mautic.builderTokensRequestInProgress=true;mQuery.ajax({url:mauticAjaxUrl,data:'action='+method,success:function(response){if(typeof response.tokens==='object'){Mautic.builderTokens=response.tokens;callback(response.tokens);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.builderTokensRequestInProgress=false;}});};Mautic.configureDynamicContentAtWhoTokens=function(){Mautic.dynamicContentTokens={};var dynamicContentTabs=mQuery('#dynamicContentTabs');if(dynamicContentTabs.length===0&&window.parent){dynamicContentTabs=mQuery(window.parent.document.getElementById('dynamicContentTabs'));}
 if(dynamicContentTabs.length){dynamicContentTabs.find('a[data-toggle="tab"]').each(function(){var tokenText=mQuery(this).text();var prototype='{dynamiccontent="__tokenName__"}';var newOption=prototype.replace(/__tokenName__/g,tokenText);Mautic.dynamicContentTokens[newOption]=tokenText;});}};;Mautic.overflowNavOptions={"parent":".nav-overflow-tabs","more":Mautic.translate('mautic.core.tabs.more')};Mautic.toggleTabPublished=function(el){if(mQuery(el).val()==="1"&&mQuery(el).prop('checked')){Mautic.publishTab(el);}else{Mautic.unpublishTab(el);}}
 Mautic.publishTab=function(tab){mQuery('a[href="#'+Mautic.getTabId(tab)+'"]').find('.fa').removeClass('text-muted').addClass('text-success');};Mautic.unpublishTab=function(tab){mQuery('a[href="#'+Mautic.getTabId(tab)+'"]').find('.fa').removeClass('text-success').addClass('text-muted');};Mautic.getTabId=function(tab){if(!mQuery(tab).hasClass('tab-pane')){tab=mQuery(tab).closest('.tab-pane');}
@@ -415,29 +442,34 @@ Mautic.activateLabelLoadingIndicator('emailform_variantSettings_winnerCriteria')
 if(response.html!=''){Mautic.onPageLoad('#emailform_variantSettings_properties',response);}}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.submitSendForm=function(){Mautic.dismissConfirmation();mQuery('.btn-send').prop('disabled',true);mQuery('form[name=\'batch_send\']').submit();};Mautic.emailSendOnLoad=function(container,response){if(mQuery('.email-send-progress').length){if(!mQuery('#emailSendProgress').length){Mautic.clearModeratedInterval('emailSendProgress');}else{Mautic.setModeratedInterval('emailSendProgress','sendEmailBatch',2000);}}};Mautic.emailSendOnUnload=function(){if(mQuery('.email-send-progress').length){Mautic.clearModeratedInterval('emailSendProgress');if(typeof Mautic.sendEmailBatchXhr!='undefined'){Mautic.sendEmailBatchXhr.abort();delete Mautic.sendEmailBatchXhr;}}};Mautic.sendEmailBatch=function(){var data='id='+mQuery('.progress-bar-send').data('email')+'&pending='+mQuery('.progress-bar-send').attr('aria-valuemax')+'&batchlimit='+mQuery('.progress-bar-send').data('batchlimit');Mautic.sendEmailBatchXhr=Mautic.ajaxActionRequest('email:sendBatch',data,function(response){if(response.progress){if(response.progress[0]>0){mQuery('.imported-count').html(response.progress[0]);mQuery('.progress-bar-send').attr('aria-valuenow',response.progress[0]).css('width',response.percent+'%');mQuery('.progress-bar-send span.sr-only').html(response.percent+'%');}
 if(response.progress[0]>=response.progress[1]){Mautic.clearModeratedInterval('emailSendProgress');setTimeout(function(){mQuery.ajax({type:'POST',showLoadingBar:false,url:window.location,data:'complete=1',success:function(response){if(response.newContent){Mautic.processPageContent(response);}}});},1000);}}
 Mautic.moderatedIntervalCallbackIsComplete('emailSendProgress');});};Mautic.autoGeneratePlaintext=function(){mQuery('.plaintext-spinner').removeClass('hide');Mautic.ajaxActionRequest('email:generatePlaintText',{id:mQuery('#emailform_sessionId').val(),custom:mQuery('#emailform_customHtml').val()},function(response){mQuery('#emailform_plainText').val(response.text);mQuery('.plaintext-spinner').addClass('hide');});};Mautic.selectEmailType=function(emailType){if(emailType=='list'){mQuery('#leadList').removeClass('hide');mQuery('#segmentTranslationParent').removeClass('hide');mQuery('#templateTranslationParent').addClass('hide');mQuery('.page-header h3').text(mauticLang.newListEmail);}else{mQuery('#segmentTranslationParent').addClass('hide');mQuery('#templateTranslationParent').removeClass('hide');mQuery('#leadList').addClass('hide');mQuery('.page-header h3').text(mauticLang.newTemplateEmail);}
-mQuery('#emailform_emailType').val(emailType);mQuery('body').removeClass('noscroll');mQuery('.email-type-modal').remove();mQuery('.email-type-modal-backdrop').remove();};Mautic.getTotalAttachmentSize=function(){var assets=mQuery('#emailform_assetAttachments').val();if(assets){assets={'assets':assets};Mautic.ajaxActionRequest('email:getAttachmentsSize',assets,function(response){mQuery('#attachment-size').text(response.size);});}else{mQuery('#attachment-size').text('0');}};Mautic.standardEmailUrl=function(options){if(!options){return;}
-var url=options.windowUrl;if(url){var editEmailKey='/emails/edit/emailId';var previewEmailKey='/email/preview/emailId';if(url.indexOf(editEmailKey)>-1||url.indexOf(previewEmailKey)>-1){options.windowUrl=url.replace('emailId',mQuery('#campaignevent_properties_email').val());}}
-return options;};Mautic.disabledEmailAction=function(opener){if(typeof opener=='undefined'){opener=window;}
-var email=opener.mQuery('#campaignevent_properties_email').val();var disabled=email===''||email===null;opener.mQuery('#campaignevent_properties_editEmailButton').prop('disabled',disabled);opener.mQuery('#campaignevent_properties_previewEmailButton').prop('disabled',disabled);};Mautic.initEmailDynamicContent=function(){if(mQuery('#dynamic-content-container').length){mQuery('#emailFilters .remove-selected').each(function(index,el){mQuery(el).on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});if(!mQuery('#emailFilters li:not(.placeholder)').length){mQuery('#emailFilters li.placeholder').removeClass('hide');}else{mQuery('#emailFilters li.placeholder').addClass('hide');}});});mQuery('#addNewDynamicContent').on('click',function(e){e.preventDefault();var tabHolder=mQuery('#dynamicContentTabs');var filterHolder=mQuery('#dynamicContentContainer');var dynamicContentPrototype=mQuery('#dynamicContentPrototype').data('prototype');var dynamicContentIndex=tabHolder.find('li').length-1;var tabId='#emailform_dynamicContent_'+dynamicContentIndex;var tokenName='Dynamic Content '+(dynamicContentIndex+1);var newForm=dynamicContentPrototype.replace(/__name__/g,dynamicContentIndex);var newTab=mQuery('<li><a role="tab" data-toggle="tab" href="'+tabId+'">'+tokenName+'</a></li>');tabHolder.append(newTab);filterHolder.append(newForm);var itemContainer=mQuery(tabId);var textarea=itemContainer.find('.editor');var firstInput=itemContainer.find('input[type="text"]').first();textarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{toolbarButtons:['undo','redo','|','bold','italic','underline','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','insertLink','insertImage'],heightMin:100}));tabHolder.find('i').first().removeClass('fa-spinner fa-spin').addClass('fa-plus text-success');newTab.find('a').tab('show');firstInput.focus();Mautic.updateDynamicContentDropdown();Mautic.initDynamicContentItem(tabId);});Mautic.initDynamicContentItem();}};Mautic.initDynamicContentItem=function(tabId){var $el=mQuery('#dynamic-content-container');if(typeof tabId!="undefined"){$el=mQuery(tabId);}
-$el.find('.addNewDynamicContentFilter').on('click',function(e){e.preventDefault();var $this=mQuery(this);var parentElement=$this.parents('.panel');var tabHolder=parentElement.find('.nav');var filterHolder=parentElement.find('.tab-content');var filterBlockPrototype=mQuery('#filterBlockPrototype');var filterIndex=filterHolder.find('.tab-pane').length;var dynamicContentIndex=$this.data('index');var filterPrototype=filterBlockPrototype.data('prototype');var filterContainerId='#emailform_dynamicContent_'+dynamicContentIndex+'_filters_'+filterIndex;var newTab=mQuery('<li><a role="tab" data-toggle="tab" href="'+filterContainerId+'">Variation '+(filterIndex+1)+'</a></li>');var newForm=filterPrototype.replace(/__name__/g,filterIndex).replace(/dynamicContent_0_filters/g,'dynamicContent_'+dynamicContentIndex+'_filters').replace(/dynamicContent]\[0]\[filters/g,'dynamicContent]['+dynamicContentIndex+'][filters');tabHolder.append(newTab);filterHolder.append(newForm);var filterContainer=mQuery(filterContainerId);var availableFilters=filterContainer.find('select[data-mautic="available_filters"]');var altTextarea=filterContainer.find('.editor');var removeButton=filterContainer.find('.remove-item');Mautic.activateChosenSelect(availableFilters);availableFilters.on('change',function(){var $this=mQuery(this);if($this.val()){Mautic.addDynamicContentFilter($this.val());$this.val('');$this.trigger('chosen:updated');}});altTextarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{toolbarButtons:['undo','redo','|','bold','italic','underline','fontFamily','fontSize','color','align','orderedList','unorderedList','quote','clearFormatting','insertLink','insertImage'],heightMin:100}));Mautic.initRemoveEvents(removeButton);newTab.find('a').tab('show');});$el.find('.dynamic-content-token-name').on('input',function(e){var $this=mQuery(this);var parentTab=$this.parents('.tab-pane');var correspondingTabLink=mQuery('a[href="#'+parentTab.attr('id')+'"]');var tabContainer=correspondingTabLink.parents('ul').first();var correspondingTabLinkIndex=tabContainer.find('a[data-toggle="tab"]').index(correspondingTabLink);var tokenName=$this.val()||'Dynamic Content '+(correspondingTabLinkIndex+1);correspondingTabLink.text(tokenName);Mautic.updateDynamicContentDropdown();});$el.find('a.remove-selected').on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});});$el.find('select[data-mautic="available_filters"]').on('change',function(){var $this=mQuery(this);if($this.val()){Mautic.addDynamicContentFilter($this.val());$this.val('');$this.trigger('chosen:updated');}});Mautic.initRemoveEvents($el.find('.remove-item'));};Mautic.updateDynamicContentDropdown=function(){var options=[];mQuery('#dynamicContentTabs').find('a[data-toggle="tab"]').each(function(){var prototype='<li><a class="fr-command" data-cmd="dynamicContent" data-param1="__tokenName__">__tokenName__</a></li>';var newOption=prototype.replace(/__tokenName__/g,mQuery(this).text());options.push(newOption);});mQuery('button[data-cmd="dynamicContent"]').next().find('ul').html(options.join(''));};Mautic.initRemoveEvents=function(elements){if(elements.hasClass('remove-selected')){elements.on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});});}else{elements.on('click',function(e){e.preventDefault();var $this=mQuery(this);var parentElement=$this.parents('.tab-pane.dynamic-content');if($this.hasClass('remove-filter')){parentElement=$this.parents('.tab-pane.dynamic-content-filter');}
-var tabLink=mQuery('a[href="#'+parentElement.attr('id')+'"]').parent();var tabContainer=tabLink.parent();parentElement.remove();tabLink.remove();tabContainer.find('li').first().next().find('a').tab('show');Mautic.updateDynamicContentDropdown();});}};Mautic.addDynamicContentFilter=function(selectedFilter){var dynamicContentItems=mQuery('.tab-pane.dynamic-content');var activeDynamicContent=dynamicContentItems.filter(':visible');var dynamicContentIndex=dynamicContentItems.index(activeDynamicContent);var dynamicContentFilterContainers=activeDynamicContent.find('div[data-filter-container]');var activeDynamicContentFilterContainer=dynamicContentFilterContainers.filter(':visible');var dynamicContentFilterIndex=dynamicContentFilterContainers.index(activeDynamicContentFilterContainer);var selectedOption=mQuery('option[data-mautic="available_'+selectedFilter+'"]').first();var label=selectedOption.text();var filterNum=activeDynamicContentFilterContainer.children('.panel').length;var prototype=mQuery('#filterSelectPrototype').data('prototype');var fieldObject=selectedOption.data('field-object');var fieldType=selectedOption.data('field-type');var isSpecial=(mQuery.inArray(fieldType,['leadlist','lead_email_received','tags','multiselect','boolean','select','country','timezone','region','stage','locale'])!=-1);prototype=prototype.replace(/__name__/g,filterNum).replace(/__label__/g,label).replace(/dynamicContent_0_filters/g,'dynamicContent_'+dynamicContentIndex+'_filters').replace(/dynamicContent]\[0]\[filters/g,'dynamicContent]['+dynamicContentIndex+'][filters').replace(/filters_0_filters/g,'filters_'+dynamicContentFilterIndex+'_filters').replace(/filters]\[0]\[filters/g,'filters]['+dynamicContentFilterIndex+'][filters');if(filterNum===0){prototype=prototype.replace(/in-group/g,'');}
+mQuery('#emailform_emailType').val(emailType);mQuery('body').removeClass('noscroll');mQuery('.email-type-modal').remove();mQuery('.email-type-modal-backdrop').remove();};Mautic.getTotalAttachmentSize=function(){var assets=mQuery('#emailform_assetAttachments').val();if(assets){assets={'assets':assets};Mautic.ajaxActionRequest('email:getAttachmentsSize',assets,function(response){mQuery('#attachment-size').text(response.size);});}else{mQuery('#attachment-size').text('0');}};Mautic.standardEmailUrl=function(options){if(options&&options.windowUrl&&options.origin){var url=options.windowUrl;var editEmailKey='/emails/edit/emailId';var previewEmailKey='/email/preview/emailId';if(url.indexOf(editEmailKey)>-1||url.indexOf(previewEmailKey)>-1){options.windowUrl=url.replace('emailId',mQuery(options.origin).val());}}
+return options;};Mautic.disabledEmailAction=function(opener,origin){if(typeof opener=='undefined'){opener=window;}
+var email=opener.mQuery(origin);if(email.length==0)return;var emailId=email.val();var disabled=emailId===''||emailId===null;opener.mQuery('[id$=_editEmailButton]').prop('disabled',disabled);opener.mQuery('[id$=_previewEmailButton]').prop('disabled',disabled);};Mautic.initEmailDynamicContent=function(){if(mQuery('#dynamic-content-container').length){mQuery('#emailFilters .remove-selected').each(function(index,el){mQuery(el).on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});if(!mQuery('#emailFilters li:not(.placeholder)').length){mQuery('#emailFilters li.placeholder').removeClass('hide');}else{mQuery('#emailFilters li.placeholder').addClass('hide');}});});mQuery('#addNewDynamicContent').on('click',function(e){e.preventDefault();Mautic.createNewDynamicContentItem();});Mautic.initDynamicContentItem();}};Mautic.createNewDynamicContentItem=function(jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;var tabHolder=mQuery('#dynamicContentTabs');var filterHolder=mQuery('#dynamicContentContainer');var dynamicContentPrototype=mQuery('#dynamicContentPrototype').data('prototype');var dynamicContentIndex=tabHolder.find('li').length-1;while(mQuery('#emailform_dynamicContent_'+dynamicContentIndex).length>0){dynamicContentIndex++;}
+var tabId='#emailform_dynamicContent_'+dynamicContentIndex;var tokenName='Dynamic Content '+(dynamicContentIndex+1);var newForm=dynamicContentPrototype.replace(/__name__/g,dynamicContentIndex);var newTab=mQuery('<li><a role="tab" data-toggle="tab" href="'+tabId+'">'+tokenName+'</a></li>');tabHolder.append(newTab);filterHolder.append(newForm);var itemContainer=mQuery(tabId);var textarea=itemContainer.find('.editor');var firstInput=itemContainer.find('input[type="text"]').first();textarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{toolbarSticky:false,toolbarButtons:['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','token','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'],heightMin:100}));tabHolder.find('i').first().removeClass('fa-spinner fa-spin').addClass('fa-plus text-success');newTab.find('a').tab('show');firstInput.focus();Mautic.updateDynamicContentDropdown();Mautic.initDynamicContentItem(tabId,mQuery,tokenName);return tabId;};Mautic.createNewDynamicContentFilter=function(el,jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;var $this=mQuery(el);var parentElement=$this.parents('.panel');var tabHolder=parentElement.find('.nav');var filterHolder=parentElement.find('.tab-content');var filterBlockPrototype=mQuery('#filterBlockPrototype');var filterIndex=filterHolder.find('.tab-pane').length-1;var dynamicContentIndex=$this.attr('id').match(/\d+$/)[0];var filterPrototype=filterBlockPrototype.data('prototype');var filterContainerId='#emailform_dynamicContent_'+dynamicContentIndex+'_filters_'+filterIndex;while(mQuery(filterContainerId).length>0){filterIndex++;filterContainerId='#emailform_dynamicContent_'+dynamicContentIndex+'_filters_'+filterIndex;}
+var newTab=mQuery('<li><a role="tab" data-toggle="tab" href="'+filterContainerId+'">Variation '+(filterIndex+1)+'</a></li>');var newForm=filterPrototype.replace(/__name__/g,filterIndex).replace(/dynamicContent_0_filters/g,'dynamicContent_'+dynamicContentIndex+'_filters').replace(/dynamicContent]\[0]\[filters/g,'dynamicContent]['+dynamicContentIndex+'][filters');tabHolder.append(newTab);filterHolder.append(newForm);var filterContainer=mQuery(filterContainerId);var availableFilters=filterContainer.find('select[data-mautic="available_filters"]');var altTextarea=filterContainer.find('.editor');var removeButton=filterContainer.find('.remove-item');Mautic.activateChosenSelect(availableFilters,false,mQuery);availableFilters.on('change',function(){var $this=mQuery(this);if($this.val()){Mautic.addDynamicContentFilter($this.val(),mQuery);$this.val('');$this.trigger('chosen:updated');}});altTextarea.froalaEditor(mQuery.extend({},Mautic.basicFroalaOptions,{toolbarSticky:false,toolbarButtons:['undo','redo','|','bold','italic','underline','paragraphFormat','fontFamily','fontSize','color','align','formatOL','formatUL','quote','clearFormatting','token','insertLink','insertImage','insertGatedVideo','insertTable','html','fullscreen'],heightMin:100}));Mautic.initRemoveEvents(removeButton,mQuery);newTab.find('a').tab('show');return filterContainerId;};Mautic.initDynamicContentItem=function(tabId,jQueryVariant,tokenName){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;var $el=mQuery('#dynamic-content-container');if($el.size()==0){mQuery=parent.mQuery;$el=mQuery('#dynamic-content-container');}
+if(tabId||typeof tabId!="undefined"){$el=mQuery(tabId);}
+$el.find('.addNewDynamicContentFilter').on('click',function(e){e.preventDefault();Mautic.createNewDynamicContentFilter(this);});if(typeof tokenName!='undefined'){$el.find('.dynamic-content-token-name').val(tokenName);}
+if($el.find('.dynamic-content-token-name').val()==''){var dynamicContent=$el.attr('id').match(/\d+$/);if(dynamicContent){var dynamicContentIndex=dynamicContent[0];$el.find('.dynamic-content-token-name').val('Dynamic Content '+dynamicContentIndex);}}
+$el.find('a.remove-selected').on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});});$el.find('select[data-mautic="available_filters"]').on('change',function(){var $this=mQuery(this);if($this.val()){Mautic.addDynamicContentFilter($this.val(),mQuery);$this.val('');$this.trigger('chosen:updated');}});Mautic.initRemoveEvents($el.find('.remove-item'),mQuery);};Mautic.updateDynamicContentDropdown=function(){var options=[];mQuery('#dynamicContentTabs').find('a[data-toggle="tab"]').each(function(){var prototype='<li><a class="fr-command" data-cmd="dynamicContent" data-param1="__tokenName__">__tokenName__</a></li>';var newOption=prototype.replace(/__tokenName__/g,mQuery(this).text());options.push(newOption);});mQuery('button[data-cmd="dynamicContent"]').next().find('ul').html(options.join(''));};Mautic.initRemoveEvents=function(elements,jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;if(elements.hasClass('remove-selected')){elements.on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});});}else{elements.on('click',function(e){e.preventDefault();var $this=mQuery(this);var parentElement=$this.parents('.tab-pane.dynamic-content');if($this.hasClass('remove-filter')){parentElement=$this.parents('.tab-pane.dynamic-content-filter');}
+var tabLink=mQuery('a[href="#'+parentElement.attr('id')+'"]').parent();var tabContainer=tabLink.parent();parentElement.remove();tabLink.remove();if(tabContainer.hasClass('tabs-left')){tabContainer.find('li').first().next().find('a').tab('show');}else{tabContainer.find('li').first().find('a').tab('show');}
+Mautic.updateDynamicContentDropdown();});}};Mautic.addDynamicContentFilter=function(selectedFilter,jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;var dynamicContentItems=mQuery('.tab-pane.dynamic-content');var activeDynamicContent=dynamicContentItems.filter(':visible');var dynamicContentIndex=activeDynamicContent.attr('id').match(/\d+$/)[0];var dynamicContentFilterContainers=activeDynamicContent.find('div[data-filter-container]');var activeDynamicContentFilterContainer=dynamicContentFilterContainers.filter(':visible');var dynamicContentFilterIndex=dynamicContentFilterContainers.index(activeDynamicContentFilterContainer);var selectedOption=mQuery('option[data-mautic="available_'+selectedFilter+'"]').first();var label=selectedOption.text();var filterNum=activeDynamicContentFilterContainer.children('.panel').length;var prototype=mQuery('#filterSelectPrototype').data('prototype');var fieldObject=selectedOption.data('field-object');var fieldType=selectedOption.data('field-type');var isSpecial=(mQuery.inArray(fieldType,['leadlist','lead_email_received','tags','multiselect','boolean','select','country','timezone','region','stage','locale'])!=-1);prototype=prototype.replace(/__name__/g,filterNum).replace(/__label__/g,label).replace(/dynamicContent_0_filters/g,'dynamicContent_'+dynamicContentIndex+'_filters').replace(/dynamicContent]\[0]\[filters/g,'dynamicContent]['+dynamicContentIndex+'][filters').replace(/filters_0_filters/g,'filters_'+dynamicContentFilterIndex+'_filters').replace(/filters]\[0]\[filters/g,'filters]['+dynamicContentFilterIndex+'][filters');if(filterNum===0){prototype=prototype.replace(/in-group/g,'');}
 prototype=mQuery(prototype);if(fieldObject=='company'){prototype.find('.object-icon').removeClass('fa-user').addClass('fa-building');}else{prototype.find('.object-icon').removeClass('fa-building').addClass('fa-user');}
 var filterBase="emailform[dynamicContent]["+dynamicContentIndex+"][filters]["+dynamicContentFilterIndex+"][filters]["+filterNum+"]";var filterIdBase="emailform_dynamicContent_"+dynamicContentIndex+"_filters_"+dynamicContentFilterIndex+"_filters_"+filterNum;if(isSpecial){var templateField=fieldType;if(fieldType=='boolean'||fieldType=='multiselect'){templateField='select';}
 var template=mQuery('#templates .'+templateField+'-template').clone();var $template=mQuery(template);var templateNameAttr=$template.attr('name').replace(/__name__/g,filterNum).replace(/__dynamicContentIndex__/g,dynamicContentIndex).replace(/__dynamicContentFilterIndex__/g,dynamicContentFilterIndex);var templateIdAttr=$template.attr('id').replace(/__name__/g,filterNum).replace(/__dynamicContentIndex__/g,dynamicContentIndex).replace(/__dynamicContentFilterIndex__/g,dynamicContentFilterIndex);$template.attr('name',templateNameAttr);$template.attr('id',templateIdAttr);prototype.find('input[name="'+filterBase+'[filter]"]').replaceWith(template);}
 if(activeDynamicContentFilterContainer.find('.panel').length==0){prototype.find(".panel-footer").addClass('hide');}
-prototype.find("input[name='"+filterBase+"[field]']").val(selectedFilter);prototype.find("input[name='"+filterBase+"[type]']").val(fieldType);prototype.find("input[name='"+filterBase+"[object]']").val(fieldObject);var filterEl=(isSpecial)?"select[name='"+filterBase+"[filter]']":"input[name='"+filterBase+"[filter]']";activeDynamicContentFilterContainer.append(prototype);Mautic.initRemoveEvents(activeDynamicContentFilterContainer.find("a.remove-selected"));var filter='#'+filterIdBase+'_filter';var fieldOptions=fieldCallback='';if(isSpecial){if(fieldType=='select'||fieldType=='boolean'||fieldType=='multiselect'){fieldOptions=selectedOption.data("field-list");mQuery.each(fieldOptions,function(index,val){mQuery('<option>').val(index).text(val).appendTo(filterEl);});}}else if(fieldType=='lookup'){fieldCallback=selectedOption.data("field-callback");if(fieldCallback&&typeof Mautic[fieldCallback]=='function'){fieldOptions=selectedOption.data("field-list");Mautic[fieldCallback](filterIdBase+'_filter',selectedFilter,fieldOptions);}}else if(fieldType=='datetime'){mQuery(filter).datetimepicker({format:'Y-m-d H:i',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false});}else if(fieldType=='date'){mQuery(filter).datetimepicker({timepicker:false,format:'Y-m-d',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false,closeOnDateSelect:true});}else if(fieldType=='time'){mQuery(filter).datetimepicker({datepicker:false,format:'H:i',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false});}else if(fieldType=='lookup_id'){var oldFilter=mQuery(filterEl);var newDisplay=mQuery(oldFilter).clone();mQuery(newDisplay).attr('name',filterBase+'[display]').attr('id',filterIdBase+'_display');var oldDisplay=mQuery(prototype).find("input[name='"+filterBase+"[display]']");var newFilter=mQuery(oldDisplay).clone();mQuery(newFilter).attr('name',filterBase+'[filter]').attr('id',filterIdBase+'_filter');mQuery(oldFilter).replaceWith(newFilter);mQuery(oldDisplay).replaceWith(newDisplay);var fieldCallback=selectedOption.data("field-callback");if(fieldCallback&&typeof Mautic[fieldCallback]=='function'){fieldOptions=selectedOption.data("field-list");Mautic[fieldCallback](filterIdBase+'_display',selectedFilter,fieldOptions);}}else{mQuery(filter).attr('type',fieldType);}
-var operators=mQuery(selectedOption).data('field-operators');mQuery('#'+filterIdBase+'_operator').html('');mQuery.each(operators,function(value,label){var newOption=mQuery('<option/>').val(value).text(label);newOption.appendTo(mQuery('#'+filterIdBase+'_operator'));});Mautic.convertDynamicContentFilterInput('#'+filterIdBase+'_operator');};Mautic.convertDynamicContentFilterInput=function(el){var operator=mQuery(el).val();var regExp=/emailform_dynamicContent_(\d+)_filters_(\d+)_filters_(\d+)_operator/;var matches=regExp.exec(mQuery(el).attr('id'));var dynamicContentIndex=matches[1];var dynamicContentFilterIndex=matches[2];var filterNum=matches[3];var filterId='#emailform_dynamicContent_'+dynamicContentIndex+'_filters_'+dynamicContentFilterIndex+'_filters_'+filterNum+'_filter';var filterEl=mQuery(filterId);var filterElParent=filterEl.parent();if(filterElParent.hasClass('has-error')){filterElParent.find('div.help-block').hide();filterElParent.removeClass('has-error');}
+prototype.find("input[name='"+filterBase+"[field]']").val(selectedFilter);prototype.find("input[name='"+filterBase+"[type]']").val(fieldType);prototype.find("input[name='"+filterBase+"[object]']").val(fieldObject);var filterEl=(isSpecial)?"select[name='"+filterBase+"[filter]']":"input[name='"+filterBase+"[filter]']";activeDynamicContentFilterContainer.append(prototype);Mautic.initRemoveEvents(activeDynamicContentFilterContainer.find("a.remove-selected"),mQuery);var filter='#'+filterIdBase+'_filter';var fieldOptions=fieldCallback='';if(isSpecial){if(fieldType=='select'||fieldType=='boolean'||fieldType=='multiselect'){fieldOptions=selectedOption.data("field-list");mQuery.each(fieldOptions,function(index,val){mQuery('<option>').val(index).text(val).appendTo(filterEl);});}}else if(fieldType=='lookup'){fieldCallback=selectedOption.data("field-callback");if(fieldCallback&&typeof Mautic[fieldCallback]=='function'){fieldOptions=selectedOption.data("field-list");Mautic[fieldCallback](filterIdBase+'_filter',selectedFilter,fieldOptions);}}else if(fieldType=='datetime'){mQuery(filter).datetimepicker({format:'Y-m-d H:i',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false});}else if(fieldType=='date'){mQuery(filter).datetimepicker({timepicker:false,format:'Y-m-d',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false,closeOnDateSelect:true});}else if(fieldType=='time'){mQuery(filter).datetimepicker({datepicker:false,format:'H:i',lazyInit:true,validateOnBlur:false,allowBlank:true,scrollInput:false});}else if(fieldType=='lookup_id'){var oldFilter=mQuery(filterEl);var newDisplay=mQuery(oldFilter).clone();mQuery(newDisplay).attr('name',filterBase+'[display]').attr('id',filterIdBase+'_display');var oldDisplay=mQuery(prototype).find("input[name='"+filterBase+"[display]']");var newFilter=mQuery(oldDisplay).clone();mQuery(newFilter).attr('name',filterBase+'[filter]').attr('id',filterIdBase+'_filter');mQuery(oldFilter).replaceWith(newFilter);mQuery(oldDisplay).replaceWith(newDisplay);var fieldCallback=selectedOption.data("field-callback");if(fieldCallback&&typeof Mautic[fieldCallback]=='function'){fieldOptions=selectedOption.data("field-list");Mautic[fieldCallback](filterIdBase+'_display',selectedFilter,fieldOptions);}}else{mQuery(filter).attr('type',fieldType);}
+var operators=mQuery(selectedOption).data('field-operators');mQuery('#'+filterIdBase+'_operator').html('');mQuery.each(operators,function(value,label){var newOption=mQuery('<option/>').val(value).text(label);newOption.appendTo(mQuery('#'+filterIdBase+'_operator'));});Mautic.convertDynamicContentFilterInput('#'+filterIdBase+'_operator',mQuery);};Mautic.convertDynamicContentFilterInput=function(el,jQueryVariant){var mQuery=(typeof jQueryVariant!='undefined')?jQueryVariant:window.mQuery;var operator=mQuery(el).val();var regExp=/emailform_dynamicContent_(\d+)_filters_(\d+)_filters_(\d+)_operator/;var matches=regExp.exec(mQuery(el).attr('id'));var dynamicContentIndex=matches[1];var dynamicContentFilterIndex=matches[2];var filterNum=matches[3];var filterId='#emailform_dynamicContent_'+dynamicContentIndex+'_filters_'+dynamicContentFilterIndex+'_filters_'+filterNum+'_filter';var filterEl=mQuery(filterId);var filterElParent=filterEl.parent();if(filterElParent.hasClass('has-error')){filterElParent.find('div.help-block').hide();filterElParent.removeClass('has-error');}
 var disabled=(operator=='empty'||operator=='!empty');filterEl.prop('disabled',disabled);if(disabled){filterEl.val('');}
 var newName='';var lastPos;if(filterEl.is('select')){var isMultiple=filterEl.attr('multiple');var multiple=(operator=='in'||operator=='!in');var placeholder=filterEl.attr('data-placeholder');if(multiple&&!isMultiple){filterEl.attr('multiple','multiple');newName=filterEl.attr('name')+'[]';filterEl.attr('name',newName);placeholder=mauticLang['chosenChooseMore'];}else if(!multiple&&isMultiple){filterEl.removeAttr('multiple');newName=filterEl.attr('name');lastPos=newName.lastIndexOf('[]');newName=newName.substring(0,lastPos);filterEl.attr('name',newName);placeholder=mauticLang['chosenChooseOne'];}
 if(multiple){filterEl.find('option[value=""]').remove();filterEl.find('option:selected').removeAttr('selected');}else{filterEl.prepend("<option value='' selected></option>");}
 if(mQuery(filterId+'_chosen').length){filterEl.chosen('destroy');}
-filterEl.attr('data-placeholder',placeholder);Mautic.activateChosenSelect(filterEl);}};;Mautic.formOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','form.form');}
-var bodyOverflow={};if(mQuery('#mauticforms_fields')){mQuery('#mauticforms_fields').sortable({items:'.panel',cancel:'',helper:function(e,ui){ui.children().each(function(){mQuery(this).width(mQuery(this).width());});bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},scroll:true,axis:'y',containment:'#mauticforms_fields .drop-here',stop:function(e,ui){mQuery('body').css(bodyOverflow);mQuery(ui.item).attr('style','');mQuery.ajax({type:"POST",url:mauticAjaxUrl+"?action=form:reorderFields",data:mQuery('#mauticforms_fields').sortable("serialize",{attribute:'data-sortable-id'})+"&formId="+mQuery('#mauticform_sessionId').val()});}});Mautic.initFormFieldButtons();}
+filterEl.attr('data-placeholder',placeholder);Mautic.activateChosenSelect(filterEl,false,mQuery);}};;Mautic.formOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','form.form');}
+var bodyOverflow={};if(mQuery('#mauticforms_fields')){mQuery('#mauticforms_fields').sortable({items:'.panel',cancel:'',helper:function(e,ui){ui.children().each(function(){mQuery(this).width(mQuery(this).width());});bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},scroll:true,axis:'y',containment:'#mauticforms_fields .drop-here',stop:function(e,ui){mQuery('body').css(bodyOverflow);mQuery(ui.item).attr('style','');mQuery.ajax({type:"POST",url:mauticAjaxUrl+"?action=form:reorderFields",data:mQuery('#mauticforms_fields').sortable("serialize",{attribute:'data-sortable-id'})+"&formId="+mQuery('#mauticform_sessionId').val()});}});mQuery('#available_fields').change(function(e){mQuery(this).find('option:selected');Mautic.ajaxifyModal(mQuery(this).find('option:selected'));mQuery(this).val('');mQuery(this).trigger('chosen:updated');});Mautic.initFormFieldButtons();}
 if(mQuery('#mauticforms_actions')){mQuery('#mauticforms_actions').sortable({items:'.panel',cancel:'',helper:function(e,ui){ui.children().each(function(){mQuery(this).width(mQuery(this).width());});bodyOverflow.overflowX=mQuery('body').css('overflow-x');bodyOverflow.overflowY=mQuery('body').css('overflow-y');mQuery('body').css({overflowX:'visible',overflowY:'visible'});return ui;},scroll:true,axis:'y',containment:'#mauticforms_actions .drop-here',stop:function(e,ui){mQuery('body').css(bodyOverflow);mQuery(ui.item).attr('style','');mQuery.ajax({type:"POST",url:mauticAjaxUrl+"?action=form:reorderActions",data:mQuery('#mauticforms_actions').sortable("serialize")+"&formId="+mQuery('#mauticform_sessionId').val()});}});mQuery('#mauticforms_actions .mauticform-row').on('dblclick.mauticformactions',function(event){event.preventDefault();mQuery(this).find('.btn-edit').first().click();});}
 if(mQuery('#mauticform_formType').length&&mQuery('#mauticform_formType').val()==''){mQuery('body').addClass('noscroll');}
 Mautic.initHideItemButton('#mauticforms_fields');Mautic.initHideItemButton('#mauticforms_actions');};Mautic.updateFormFields=function(){Mautic.activateLabelLoadingIndicator('campaignevent_properties_field');var formId=mQuery('#campaignevent_properties_form').val();Mautic.ajaxActionRequest('form:updateFormFields',{'formId':formId},function(response){if(response.fields){var select=mQuery('#campaignevent_properties_field');select.find('option').remove();var fieldOptions={};mQuery.each(response.fields,function(key,field){var option=mQuery('<option></option>').attr('value',field.alias).text(field.label);select.append(option);fieldOptions[field.alias]=field.options;});select.attr('data-field-options',JSON.stringify(fieldOptions));select.trigger('chosen:updated');Mautic.updateFormFieldValues(select);}
 Mautic.removeLabelLoadingIndicator();});};Mautic.updateFormFieldValues=function(field){field=mQuery(field);var fieldValue=field.val();var options=jQuery.parseJSON(field.attr('data-field-options'));var valueField=mQuery('#campaignevent_properties_value');var valueFieldAttrs={'class':valueField.attr('class'),'id':valueField.attr('id'),'name':valueField.attr('name'),'autocomplete':valueField.attr('autocomplete'),'value':valueField.attr('value')};if(typeof options[fieldValue]!=='undefined'&&!mQuery.isEmptyObject(options[fieldValue])){var newValueField=mQuery('<select/>').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);mQuery.each(options[fieldValue],function(key,optionVal){var option=mQuery("<option></option>").attr('value',optionVal).text(optionVal);newValueField.append(option);});valueField.replaceWith(newValueField);}else{var newValueField=mQuery('<input/>').attr('type','text').attr('class',valueFieldAttrs['class']).attr('id',valueFieldAttrs['id']).attr('name',valueFieldAttrs['name']).attr('autocomplete',valueFieldAttrs['autocomplete']).attr('value',valueFieldAttrs['value']);valueField.replaceWith(newValueField);}};Mautic.formFieldOnLoad=function(container,response){if(response.fieldHtml){var newHtml=response.fieldHtml;var fieldId='#mauticform_'+response.fieldId;var fieldContainer=mQuery(fieldId).closest('.form-field-wrapper');if(mQuery(fieldId).length){mQuery(fieldContainer).replaceWith(newHtml);var newField=false;}else{var panel=mQuery('#mauticforms_fields .mauticform-button-wrapper').closest('.form-field-wrapper');panel.before(newHtml);var newField=true;}
-var fieldContainer=mQuery(fieldId).closest('.form-field-wrapper');mQuery(fieldContainer).find("[data-toggle='ajax']").click(function(event){event.preventDefault();return Mautic.ajaxifyLink(this,event);});mQuery(fieldContainer).find("*[data-toggle='tooltip']").tooltip({html:true});mQuery(fieldContainer).find("[data-toggle='ajaxmodal']").on('click.ajaxmodal',function(event){event.preventDefault();console.log(this);Mautic.ajaxifyModal(this,event);});Mautic.initFormFieldButtons(fieldContainer);Mautic.initHideItemButton(fieldContainer);if(!mQuery('#fields-panel').hasClass('in')){mQuery('a[href="#fields-panel"]').trigger('click');}
+var fieldContainer=mQuery(fieldId).closest('.form-field-wrapper');mQuery(fieldContainer).find("[data-toggle='ajax']").click(function(event){event.preventDefault();return Mautic.ajaxifyLink(this,event);});mQuery(fieldContainer).find("*[data-toggle='tooltip']").tooltip({html:true});mQuery(fieldContainer).find("[data-toggle='ajaxmodal']").on('click.ajaxmodal',function(event){event.preventDefault();Mautic.ajaxifyModal(this,event);});Mautic.initFormFieldButtons(fieldContainer);Mautic.initHideItemButton(fieldContainer);if(!mQuery('#fields-panel').hasClass('in')){mQuery('a[href="#fields-panel"]').trigger('click');}
 if(newField){mQuery('.bundle-main-inner-wrapper').scrollTop(mQuery('.bundle-main-inner-wrapper').height());}
 if(mQuery('#form-field-placeholder').length){mQuery('#form-field-placeholder').remove();}}};Mautic.initFormFieldButtons=function(container){if(typeof container=='undefined'){mQuery('#mauticforms_fields .mauticform-row').off(".mauticformfields");var container='#mauticforms_fields';}
 mQuery(container).find('.mauticform-row').on('dblclick.mauticformfields',function(event){event.preventDefault();mQuery(this).closest('.form-field-wrapper').find('.btn-edit').first().click();});};Mautic.formActionOnLoad=function(container,response){if(response.actionHtml){var newHtml=response.actionHtml;var actionId='#mauticform_action_'+response.actionId;if(mQuery(actionId).length){mQuery(actionId).replaceWith(newHtml);var newField=false;}else{mQuery(newHtml).appendTo('#mauticforms_actions');var newField=true;}
@@ -461,12 +493,13 @@ Mautic.leadEmailOnLoad=function(container,response){mQuery('[name="lead_quickema
 if(td.attr('fr-original-style')){td.attr('style',td.attr('fr-original-style'));td.removeAttr('fr-original-style');}
 if(td.css('border')==='1px solid rgb(221, 221, 221)'){td.css('border','');}});textarea.val(emailHtml.find('html').get(0).outerHTML);});}
 Mautic.leadlistOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','lead.list');}
-if(mQuery('#leadlist_filters').length){mQuery('#available_filters').on('change',function(){if(mQuery(this).val()){Mautic.addLeadListFilter(mQuery(this).val());mQuery(this).val('');mQuery(this).trigger('chosen:updated');}});mQuery('#leadlist_filters .remove-selected').each(function(index,el){mQuery(el).on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});if(!mQuery('#leadlist_filters li:not(.placeholder)').length){mQuery('#leadlist_filters li.placeholder').removeClass('hide');}else{mQuery('#leadlist_filters li.placeholder').addClass('hide');}});});}};Mautic.convertLeadFilterInput=function(el){var operator=mQuery(el).val();var regExp=/leadlist_filters_(\d+)_operator/;var matches=regExp.exec(mQuery(el).attr('id'));var filterNum=matches[1];var filterId='#leadlist_filters_'+filterNum+'_filter';if(mQuery(filterId).parent().hasClass('has-error')){mQuery(filterId).parent().find('div.help-block').hide();mQuery(filterId).parent().removeClass('has-error');}
-var disabled=(operator=='empty'||operator=='!empty');mQuery(filterId).prop('disabled',disabled);if(disabled){mQuery(filterId).val('');}
+if(mQuery('#leadlist_filters').length){mQuery('#available_filters').on('change',function(){if(mQuery(this).val()){Mautic.addLeadListFilter(mQuery(this).val());mQuery(this).val('');mQuery(this).trigger('chosen:updated');}});mQuery('#leadlist_filters .remove-selected').each(function(index,el){mQuery(el).on('click',function(){mQuery(this).closest('.panel').animate({'opacity':0},'fast',function(){mQuery(this).remove();});if(!mQuery('#leadlist_filters li:not(.placeholder)').length){mQuery('#leadlist_filters li.placeholder').removeClass('hide');}else{mQuery('#leadlist_filters li.placeholder').addClass('hide');}});});}};Mautic.convertLeadFilterInput=function(el){var prefix='leadlist';var parent=mQuery(el).parents('.dynamic-content-filter');if(parent){prefix=parent.attr('id');}
+var operator=mQuery(el).val();var regExp=/_filters_(\d+)_operator/;var matches=regExp.exec(mQuery(el).attr('id'));var filterNum=matches[1];var filterId='#'+prefix+'_filters_'+filterNum+'_filter';if(mQuery(filterId).parent().hasClass('has-error')){mQuery(filterId).parent().find('div.help-block').hide();mQuery(filterId).parent().removeClass('has-error');}
+var disabled=(operator=='empty'||operator=='!empty');mQuery(filterId+', #'+prefix+'_filters_'+filterNum+'_display').prop('disabled',disabled);if(disabled){mQuery(filterId).val('');}
 var newName='';var lastPos;if(mQuery(filterId).is('select')){var isMultiple=mQuery(filterId).attr('multiple');var multiple=(operator=='in'||operator=='!in');var placeholder=mQuery(filterId).attr('data-placeholder');if(multiple&&!isMultiple){mQuery(filterId).attr('multiple','multiple');newName=mQuery(filterId).attr('name')+'[]';mQuery(filterId).attr('name',newName);placeholder=mauticLang['chosenChooseMore'];}else if(!multiple&&isMultiple){mQuery(filterId).removeAttr('multiple');newName=filterEl.attr('name');lastPos=newName.lastIndexOf('[]');newName=newName.substring(0,lastPos);mQuery(filterId).attr('name',newName);placeholder=mauticLang['chosenChooseOne'];}
 if(multiple){mQuery(filterId).find('option[value=""]').remove();mQuery(filterId+' option:selected').removeAttr('selected');}else{mQuery(filterId).prepend("<option value='' selected></option>");}
 if(mQuery(filterId+'_chosen').length){mQuery(filterId).chosen('destroy');}
-mQuery(filterId).attr('data-placeholder',placeholder);Mautic.activateChosenSelect(mQuery(filterId));}};Mautic.addLeadListFilter=function(elId){var filterId='#available_'+elId;var label=mQuery(filterId).text();var filterNum=parseInt(mQuery('.available-filters').data('index'));mQuery('.available-filters').data('index',filterNum+1);var prototype=mQuery('.available-filters').data('prototype');var fieldType=mQuery(filterId).data('field-type');var fieldObject=mQuery(filterId).data('field-object');var isSpecial=(mQuery.inArray(fieldType,['leadlist','lead_email_received','tags','multiselect','boolean','select','country','timezone','region','stage','locale','globalcategory'])!=-1);prototype=prototype.replace(/__name__/g,filterNum);prototype=prototype.replace(/__label__/g,label);prototype=mQuery(prototype);var filterBase="leadlist[filters]["+filterNum+"]";var filterIdBase="leadlist_filters_"+filterNum+"_";if(isSpecial){var templateField=fieldType;if(fieldType=='boolean'||fieldType=='multiselect'){templateField='select';}
+mQuery(filterId).attr('data-placeholder',placeholder);Mautic.activateChosenSelect(mQuery(filterId));}};Mautic.updateLookupListFilter=function(field,datum){if(datum&&datum.id){var filterField='#'+field.replace('_display','_filter');mQuery(filterField).val(datum.id);}};Mautic.activateSegmentFilterTypeahead=function(displayId,filterId,fieldOptions){mQuery('#'+displayId).attr('data-lookup-callback','updateLookupListFilter');Mautic.activateFieldTypeahead(displayId,filterId,[],'lead:fieldList')};Mautic.addLeadListFilter=function(elId){var filterId='#available_'+elId;var label=mQuery(filterId).text();var filterNum=parseInt(mQuery('.available-filters').data('index'));mQuery('.available-filters').data('index',filterNum+1);var prototype=mQuery('.available-filters').data('prototype');var fieldType=mQuery(filterId).data('field-type');var fieldObject=mQuery(filterId).data('field-object');var isSpecial=(mQuery.inArray(fieldType,['leadlist','lead_email_received','lead_email_sent','tags','multiselect','boolean','select','country','timezone','region','stage','locale','globalcategory'])!=-1);prototype=prototype.replace(/__name__/g,filterNum);prototype=prototype.replace(/__label__/g,label);prototype=mQuery(prototype);var filterBase="leadlist[filters]["+filterNum+"]";var filterIdBase="leadlist_filters_"+filterNum+"_";if(isSpecial){var templateField=fieldType;if(fieldType=='boolean'||fieldType=='multiselect'){templateField='select';}
 var template=mQuery('#templates .'+templateField+'-template').clone();mQuery(template).attr('name',mQuery(template).attr('name').replace(/__name__/g,filterNum));mQuery(template).attr('id',mQuery(template).attr('id').replace(/__name__/g,filterNum));mQuery(prototype).find('input[name="'+filterBase+'[filter]"]').replaceWith(template);}
 if(mQuery('#leadlist_filters div.panel').length==0){mQuery(prototype).find(".panel-heading").addClass('hide');}
 if(fieldObject=='company'){mQuery(prototype).find(".object-icon").removeClass('fa-user').addClass('fa-building');}else{mQuery(prototype).find(".object-icon").removeClass('fa-building').addClass('fa-user');}
@@ -514,20 +547,30 @@ if(mQuery(container+' select[name="page[redirectType]"]').length){Mautic.autoHid
 Mautic.getTokens(Mautic.getBuilderTokensMethod(),function(){});Mautic.initSelectTheme(mQuery('#page_template'));};Mautic.getPageAbTestWinnerForm=function(abKey){if(abKey&&mQuery(abKey).val()&&mQuery(abKey).closest('.form-group').hasClass('has-error')){mQuery(abKey).closest('.form-group').removeClass('has-error');if(mQuery(abKey).next().hasClass('help-block')){mQuery(abKey).next().remove();}}
 Mautic.activateLabelLoadingIndicator('page_variantSettings_winnerCriteria');var pageId=mQuery('#page_sessionId').val();var query="action=page:getAbTestForm&abKey="+mQuery(abKey).val()+"&pageId="+pageId;mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:query,dataType:"json",success:function(response){if(typeof response.html!='undefined'){if(mQuery('#page_variantSettings_properties').length){mQuery('#page_variantSettings_properties').replaceWith(response.html);}else{mQuery('#page_variantSettings').append(response.html);}
 if(response.html!=''){Mautic.onPageLoad('#page_variantSettings_properties',response);}}
-Mautic.removeLabelLoadingIndicator();},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);spinner.remove();},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.autoHideRedirectUrl=function(container){var select=mQuery(container+' select[name="page[redirectType]"]');var input=mQuery(container+' input[name="page[redirectUrl]"]');if(select.val()==''){input.closest('.form-group').hide();input.val('');}else{input.closest('.form-group').show();}};;Mautic.initiateIntegrationAuthorization=function(){mQuery('#integration_details_in_auth').val(1);Mautic.postForm(mQuery('form[name="integration_details"]'),'loadIntegrationAuthWindow');};Mautic.loadIntegrationAuthWindow=function(response){if(response.newContent){Mautic.processModalContent(response,'#IntegrationEditModal');}else{Mautic.stopPageLoadingBar();Mautic.stopIconSpinPostEvent();mQuery('#integration_details_in_auth').val(0);if(response.authUrl){var generator=window.open(response.authUrl,'integrationauth','height=500,width=500');if(!generator||generator.closed||typeof generator.closed=='undefined'){alert(mauticLang.popupBlockerMessage);}}}};Mautic.refreshIntegrationForm=function(){var opener=window.opener;if(opener){var form=opener.mQuery('form[name="integration_details"]');if(form.length){var action=form.attr('action');if(action){opener.Mautic.startModalLoadingBar('#IntegrationEditModal');opener.Mautic.loadAjaxModal('#IntegrationEditModal',action);}}}
-window.close()};Mautic.integrationOnLoad=function(container,response){if(response&&response.name){var integration='.integration-'+response.name;if(response.enabled){mQuery(integration).removeClass('integration-disabled');}else{mQuery(integration).addClass('integration-disabled');}}else{Mautic.filterIntegrations();}};Mautic.filterIntegrations=function(update){var filter=mQuery('#integrationFilter').val();if(update){mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:"action=plugin:setIntegrationFilter&plugin="+filter});}
-if(mQuery('.shuffle-integrations').length){var grid=mQuery(".shuffle-integrations");setTimeout(function(){grid.shuffle('shuffle',function($el,shuffle){if(filter){return $el.hasClass('plugin'+filter);}else{return true;}});mQuery("html").on("fa.sidebar.minimize",function(){grid.shuffle("update");}).on("fa.sidebar.maximize",function(){grid.shuffle("update");});},500);}};Mautic.getIntegrationLeadFields=function(integration,el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));if(typeof settings=='undefined'){settings={};}
-var data={integration:integration,settings:settings};mQuery('#leadFieldsContainer').html('');Mautic.ajaxActionRequest('plugin:getIntegrationLeadFields',data,function(response){if(response.success){mQuery('#leadFieldsContainer').replaceWith(response.html);Mautic.onPageLoad('#leadFieldsContainer');if(mQuery('#fields-tab').length){mQuery('#fields-tab').removeClass('hide');}}else{if(mQuery('#fields-tab').length){mQuery('#fields-tab').addClass('hide');}}
-Mautic.removeLabelLoadingIndicator();});};Mautic.getIntegrationCompanyFields=function(integration,el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));if(typeof settings=='undefined'){settings={};}
-var data={integration:integration,settings:settings};mQuery('#companyFieldsContainer').html('');Mautic.ajaxActionRequest('plugin:getIntegrationCompanyFields',data,function(response){if(response.success){mQuery('#companyFieldsContainer').replaceWith(response.html);Mautic.onPageLoad('#companyFieldsContainer');if(mQuery('#company-fields-container').length){mQuery('#company-fields-container').removeClass('hide');}}else{if(mQuery('#company-fields-container').length){mQuery('#company-fields-container').addClass('hide');}}
-Mautic.removeLabelLoadingIndicator();});};Mautic.getIntegrationConfig=function(el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));if(typeof settings=='undefined'){settings={};}
-settings.name=mQuery(el).attr('name');var data={integration:mQuery(el).val(),settings:settings};mQuery('.integration-config-container').html('');Mautic.ajaxActionRequest('plugin:getIntegrationConfig',data,function(response){if(response.success){mQuery('.integration-config-container').html(response.html);Mautic.onPageLoad('.integration-config-container');}
-Mautic.removeLabelLoadingIndicator();});};;Mautic.pointOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','point');}};Mautic.pointTriggerOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','point.trigger');}
+Mautic.removeLabelLoadingIndicator();},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);spinner.remove();},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.autoHideRedirectUrl=function(container){var select=mQuery(container+' select[name="page[redirectType]"]');var input=mQuery(container+' input[name="page[redirectUrl]"]');if(select.val()==''){input.closest('.form-group').hide();input.val('');}else{input.closest('.form-group').show();}};;Mautic.matchedFields=function(index,object,integration){var integrationField=mQuery('#integration_details_featureSettings_'+object+'Fields_i_'+index).val();var mauticField=mQuery('#integration_details_featureSettings_'+object+'Fields_m_'+index+' option:selected').val();if(object=='lead'){var updateMauticField=mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic'+index+']"]:checked').val();}else{var updateMauticField=mQuery('input[name="integration_details[featureSettings]['+object+'Fields][update_mautic_company'+index+']"]:checked').val();}
+Mautic.ajaxActionRequest('plugin:matchFields',{object:object,integration:integration,integrationField:integrationField,mauticField:mauticField,updateMautic:updateMauticField},function(response){var theMessage=(response.success)?'<i class="fa fa-check-circle text-success"></i>':'';mQuery('#matched-'+index+"-"+object).html(theMessage);});};Mautic.initiateIntegrationAuthorization=function(){mQuery('#integration_details_in_auth').val(1);Mautic.postForm(mQuery('form[name="integration_details"]'),'loadIntegrationAuthWindow');};Mautic.loadIntegrationAuthWindow=function(response){if(response.newContent){Mautic.processModalContent(response,'#IntegrationEditModal');}else{Mautic.stopPageLoadingBar();Mautic.stopIconSpinPostEvent();mQuery('#integration_details_in_auth').val(0);if(response.authUrl){var generator=window.open(response.authUrl,'integrationauth','height=500,width=500');if(!generator||generator.closed||typeof generator.closed=='undefined'){alert(mauticLang.popupBlockerMessage);}}}};Mautic.refreshIntegrationForm=function(){var opener=window.opener;if(opener){var form=opener.mQuery('form[name="integration_details"]');if(form.length){var action=form.attr('action');if(action){opener.Mautic.startModalLoadingBar('#IntegrationEditModal');opener.Mautic.loadAjaxModal('#IntegrationEditModal',action);}}}
+window.close()};Mautic.integrationOnLoad=function(container,response){if(response&&response.name){var integration='.integration-'+response.name;if(response.enabled){mQuery(integration).removeClass('integration-disabled');}else{mQuery(integration).addClass('integration-disabled');}}else{Mautic.filterIntegrations();}
+mQuery('[data-toggle="tooltip"]').tooltip();};Mautic.integrationConfigOnLoad=function(container){if(mQuery('.fields-container select.integration-field').length){var selects=mQuery('.fields-container select.integration-field');selects.on('change',function(){var select=mQuery(this),newValue=select.val(),previousValue=select.attr('data-value');select.attr('data-value',newValue);var groupSelects=mQuery(this).closest('.fields-container').find('select.integration-field').not(select);if(previousValue){mQuery('option[value="'+previousValue+'"]',groupSelects).each(function(){if(!mQuery(this).closest('select').prop('disabled')){mQuery(this).prop('disabled',false);mQuery(this).removeAttr('disabled');}});}
+if(newValue){mQuery('option[value="'+newValue+'"]',groupSelects).each(function(){if(!mQuery(this).closest('select').prop('disabled')){mQuery(this).prop('disabled',true);mQuery(this).attr('disabled','disabled');}});}
+groupSelects.each(function(){mQuery(this).trigger('chosen:updated');});});selects.each(function(){if(!mQuery(this).closest('.field-container').hasClass('hide')){mQuery(this).trigger('change');}});}};Mautic.filterIntegrations=function(update){var filter=mQuery('#integrationFilter').val();if(update){mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:"action=plugin:setIntegrationFilter&plugin="+filter});}
+if(mQuery('.shuffle-integrations').length){var grid=mQuery(".shuffle-integrations");setTimeout(function(){grid.shuffle('shuffle',function($el,shuffle){if(filter){return $el.hasClass('plugin'+filter);}else{return true;}});mQuery("html").on("fa.sidebar.minimize",function(){grid.shuffle("update");}).on("fa.sidebar.maximize",function(){grid.shuffle("update");});},500);}};Mautic.getIntegrationLeadFields=function(integration,el,settings){if(typeof settings=='undefined'){settings={};}
+settings.integration=integration;settings.object='lead';Mautic.getIntegrationFields(settings,1,el);};Mautic.getIntegrationCompanyFields=function(integration,el,settings){if(typeof settings=='undefined'){settings={};}
+settings.integration=integration;settings.object='company';Mautic.getIntegrationFields(settings,1,el);};Mautic.getIntegrationFields=function(settings,page,el){var object=settings.object?settings.object:'lead';var fieldsTab=('lead'===object)?'#fields-tab':'#'+object+'-fields-container';if(el){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));}
+var fieldsContainer='#'+object+'FieldsContainer';var inModal=mQuery(fieldsContainer).closest('.modal');if(inModal){var modalId='#'+mQuery(fieldsContainer).closest('.modal').attr('id');Mautic.startModalLoadingBar(modalId);}
+Mautic.ajaxActionRequest('plugin:getIntegrationFields',{page:page,integration:(settings.integration)?settings.integration:null,settings:settings},function(response){if(response.success){mQuery(fieldsContainer).replaceWith(response.html);Mautic.onPageLoad(fieldsContainer);Mautic.integrationConfigOnLoad(fieldsContainer);if(mQuery(fieldsTab).length){mQuery(fieldsTab).removeClass('hide');}}else{if(mQuery(fieldsTab).length){mQuery(fieldsTab).addClass('hide');}}
+if(el){Mautic.removeLabelLoadingIndicator();}
+if(inModal){Mautic.stopModalLoadingBar(modalId);}});};Mautic.getIntegrationConfig=function(el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));if(typeof settings=='undefined'){settings={};}
+settings.name=mQuery(el).attr('name');var data={integration:mQuery(el).val(),settings:settings};mQuery('.integration-campaigns-status').html('');mQuery('.integration-config-container').html('');Mautic.ajaxActionRequest('plugin:getIntegrationConfig',data,function(response){if(response.success){mQuery('.integration-config-container').html(response.html);Mautic.onPageLoad('.integration-config-container',response);}
+Mautic.integrationConfigOnLoad('.integration-config-container');Mautic.removeLabelLoadingIndicator();});};Mautic.getIntegrationCampaignStatus=function(el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));if(typeof settings=='undefined'){settings={};}
+settings.name=mQuery('#campaignevent_properties_integration').attr('name');var data={integration:mQuery('#campaignevent_properties_integration').val(),campaign:mQuery(el).val(),settings:settings};if(typeof mQuery('#campaignevent_properties_integration').val()=='undefined'){data={integration:mQuery('#formaction_properties_integration').val(),campaign:mQuery(el).val(),settings:settings};}
+mQuery('.integration-campaigns-status').html('');mQuery('.integration-campaigns-status').removeClass('hide');Mautic.ajaxActionRequest('plugin:getIntegrationCampaignStatus',data,function(response){if(response.success){mQuery('.integration-campaigns-status').append(response.html);Mautic.onPageLoad('.integration-campaigns-status',response);}
+Mautic.integrationConfigOnLoad('.integration-campaigns-status');Mautic.removeLabelLoadingIndicator();});};Mautic.getIntegrationCampaigns=function(el,settings){Mautic.activateLabelLoadingIndicator(mQuery(el).attr('id'));var data={integration:mQuery(el).val()};mQuery('.integration-campaigns').html('');Mautic.ajaxActionRequest('plugin:getIntegrationCampaigns',data,function(response){if(response.success){console.log(response.html);mQuery('.integration-campaigns').html(response.html);Mautic.onPageLoad('.integration-campaigns',response);}
+Mautic.integrationConfigOnLoad('.integration-campaigns');Mautic.removeLabelLoadingIndicator();});};;Mautic.pointOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','point');}};Mautic.pointTriggerOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','point.trigger');}
 if(mQuery('#triggerEvents')){mQuery('#triggerEvents').sortable({items:'.trigger-event-row',handle:'.reorder-handle',stop:function(i){mQuery.ajax({type:"POST",url:mauticAjaxUrl+"?action=point:reorderTriggerEvents",data:mQuery('#triggerEvents').sortable("serialize")+"&triggerId="+mQuery('#pointtrigger_sessionId').val()});}});mQuery('#triggerEvents .trigger-event-row').on('mouseover.triggerevents',function(){mQuery(this).find('.form-buttons').removeClass('hide');}).on('mouseout.triggerevents',function(){mQuery(this).find('.form-buttons').addClass('hide');}).on('dblclick.triggerevents',function(event){event.preventDefault();mQuery(this).find('.btn-edit').first().click();});}};Mautic.pointTriggerEventOnLoad=function(container,response){if(response.eventHtml){var newHtml=response.eventHtml;var eventId='#triggerEvent_'+response.eventId;if(mQuery(eventId).length){mQuery(eventId).replaceWith(newHtml);var newField=false;}else{mQuery(newHtml).appendTo('#triggerEvents');var newField=true;}
 mQuery(eventId+" *[data-toggle='tooltip']").tooltip({html:true});mQuery(eventId+" a[data-toggle='ajax']").click(function(event){event.preventDefault();return Mautic.ajaxifyLink(this,event);});mQuery(eventId+" a[data-toggle='ajaxmodal']").on('click.ajaxmodal',function(event){event.preventDefault();Mautic.ajaxifyModal(this,event);});mQuery('#triggerEvents .trigger-event-row').off(".triggerevents");mQuery('#triggerEvents .trigger-event-row').on('mouseover.triggerevents',function(){mQuery(this).find('.form-buttons').removeClass('hide');}).on('mouseout.triggerevents',function(){mQuery(this).find('.form-buttons').addClass('hide');}).on('dblclick.triggerevents',function(event){event.preventDefault();mQuery(this).find('.btn-edit').first().click();});if(!mQuery('#events-panel').hasClass('in')){mQuery('a[href="#events-panel"]').trigger('click');}
 if(mQuery('#triggerEventPlaceholder').length){mQuery('#triggerEventPlaceholder').remove();}}};Mautic.getPointActionPropertiesForm=function(actionType){Mautic.activateLabelLoadingIndicator('point_type');var query="action=point:getActionForm&actionType="+actionType;mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:query,dataType:"json",success:function(response){if(typeof response.html!='undefined'){mQuery('#pointActionProperties').html(response.html);Mautic.onPageLoad('#pointActionProperties',response);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.EnablesOption=function(urlActionProperty){if(urlActionProperty==='point_properties_returns_within'&&mQuery('#point_properties_returns_within').val()>0){mQuery('#point_properties_returns_after').val(0);}else{if(urlActionProperty==='point_properties_returns_after'&&mQuery('#point_properties_returns_after').val()>0){mQuery('#point_properties_returns_within').val(0);}}};;Mautic.reportOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','report');}
-if(mQuery('div[id=report_filters]').length){mQuery('div[id=report_filters]').data('index',mQuery('#report_filters > div').length);mQuery('div[id=report_tableOrder]').data('index',mQuery('#report_tableOrder > div').length);if(mQuery('.filter-columns').length){mQuery('.filter-columns').each(function(){Mautic.updateReportFilterValueInput(this,true);mQuery(this).on('change',function(){Mautic.updateReportFilterValueInput(this);});});}}else{mQuery('#report-shelves .collapse').on('show.bs.collapse',function(e){var actives=mQuery('#report-shelves').find('.in, .collapsing');actives.each(function(index,element){mQuery(element).collapse('hide');var id=mQuery(element).attr('id');mQuery('a[aria-controls="'+id+'"]').addClass('collapsed');})})}
-Mautic.initDateRangePicker();};Mautic.addReportRow=function(elId){var prototypeHolder=mQuery('div[id="'+elId+'"]');var index=parseInt(prototypeHolder.attr('data-index'));if(!index){index=1;}
+if(mQuery('div[id=report_filters]').length){mQuery('div[id=report_filters]').attr('data-index',mQuery('#report_filters > div').length+1);mQuery('div[id=report_tableOrder]').attr('data-index',mQuery('#report_tableOrder > div').length+1);mQuery('div[id=report_aggregators]').attr('data-index',mQuery('#report_aggregators > div').length+1);if(mQuery('.filter-columns').length){mQuery('.filter-columns').each(function(){Mautic.updateReportFilterValueInput(this,true);mQuery(this).on('change',function(){Mautic.updateReportFilterValueInput(this);});});}}else{mQuery('#report-shelves .collapse').on('show.bs.collapse',function(e){var actives=mQuery('#report-shelves').find('.in, .collapsing');actives.each(function(index,element){mQuery(element).collapse('hide');var id=mQuery(element).attr('id');mQuery('a[aria-controls="'+id+'"]').addClass('collapsed');})})}
+Mautic.checkSelectedGroupBy();Mautic.initDateRangePicker();};Mautic.addReportRow=function(elId){var prototypeHolder=mQuery('div[id="'+elId+'"]');var index=parseInt(prototypeHolder.attr('data-index'));if(!index){index=1;}
 var prototype=prototypeHolder.data('prototype');var output=prototype.replace(/__name__/g,index);prototypeHolder.attr('data-index',index+1);prototypeHolder.append(output);var newColumnId='#'+elId+'_'+index+'_column';if(elId=='report_filters'){if(typeof Mautic.reportPrototypeFilterOptions!='undefined'){mQuery(newColumnId).html(Mautic.reportPrototypeFilterOptions);}
 mQuery(newColumnId).on('change',function(){Mautic.updateReportFilterValueInput(this);});Mautic.updateReportFilterValueInput(newColumnId);}else if(typeof Mautic.reportPrototypeColumnOptions!='undefined'){mQuery(newColumnId).html(Mautic.reportPrototypeColumnOptions);}
 Mautic.activateChosenSelect(mQuery('#'+elId+'_'+index+'_column'));mQuery("#"+elId+" *[data-toggle='tooltip']").tooltip({html:true,container:'body'});};Mautic.updateReportFilterValueInput=function(filterColumn,setup){var definitions=(typeof Mautic.reportPrototypeFilterDefinitions!='undefined')?Mautic.reportPrototypeFilterDefinitions:mQuery('#report_filters').data('filter-definitions');var operators=(typeof Mautic.reportPrototypeFilterOperators!='undefined')?Mautic.reportPrototypeFilterOperators:mQuery('#report_filters').data('filter-operators');var newValue=mQuery(filterColumn).val();if(!newValue){return;}
@@ -538,7 +581,7 @@ if(setup){mQuery('#'+valueId+'_'+valueVal).click();}}else if(mQuery(valueEl).att
 if((filterType=='multiselect'||filterType=='select')&&typeof definitions[newValue].list!='undefined'){var currentValue=mQuery(valueEl).val();var attr={id:valueId,name:valueName,"class":'form-control filter-value',};if(filterType=='multiselect'){attr.multiple=true;}
 var newSelect=mQuery('<select />',attr);mQuery.each(definitions[newValue].list,function(value,label){var newOption=mQuery('<option />').val(value).html(label);if(value==currentValue){newOption.prop('selected',true);}
 newOption.appendTo(newSelect);});mQuery(valueEl).replaceWith(newSelect);Mautic.activateChosenSelect(newSelect);}
-if(filterType=='datetime'||filterType=='date'||filterType=='time'){Mautic.activateDateTimeInputs('#'+valueId,filterType);}else if(mQuery('#'+valueId).hasClass('calendar-activated')){mQuery('#'+valueId).datetimepicker('destroy');}};Mautic.removeReportRow=function(container){mQuery("#"+container+" *[data-toggle='tooltip']").tooltip('destroy');mQuery('#'+container).remove();};Mautic.updateReportSourceData=function(context){Mautic.activateLabelLoadingIndicator('report_source');mQuery.ajax({url:mauticAjaxUrl,type:'post',data:"action=report:getSourceData&context="+context,success:function(response){mQuery('#report_columns').html(response.columns);mQuery('#report_columns').multiSelect('refresh');mQuery('#report_filters').find('div').remove().end();mQuery('#report_filters').data('index',0);Mautic.reportPrototypeColumnOptions=mQuery(response.columns);mQuery('#report_tableOrder').find('div').remove().end();mQuery('#report_tableOrder').data('index',0);Mautic.reportPrototypeFilterDefinitions=response.filterDefinitions;Mautic.reportPrototypeFilterOptions=response.filters;Mautic.reportPrototypeFilterOperators=response.filterOperators;mQuery('#report_graphs').html(response.graphs);mQuery('#report_graphs').multiSelect('refresh');if(!response.graphs){mQuery('#graphs-container').addClass('hide');mQuery('#graphs-tab').addClass('hide');}else{mQuery('#graphs-container').removeClass('hide');mQuery('#graphs-tab').removeClass('hide');}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.checkReportCondition=function(selector){var option=mQuery('#'+selector+' option:selected').val();var valueInput=selector.replace('condition','value');if(option=='empty'||option=='notEmpty'){mQuery('#'+valueInput).prop('disabled',true);}else{mQuery('#'+valueInput).prop('disabled',false);}};;Mautic.smsOnLoad=function(container,response){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','sms');}};Mautic.selectSmsType=function(smsType){if(smsType=='list'){mQuery('#leadList').removeClass('hide');mQuery('#publishStatus').addClass('hide');mQuery('.page-header h3').text(mauticLang.newListSms);}else{mQuery('#publishStatus').removeClass('hide');mQuery('#leadList').addClass('hide');mQuery('.page-header h3').text(mauticLang.newTemplateSms);}
+if(filterType=='datetime'||filterType=='date'||filterType=='time'){Mautic.activateDateTimeInputs('#'+valueId,filterType);}else if(mQuery('#'+valueId).hasClass('calendar-activated')){mQuery('#'+valueId).datetimepicker('destroy');}};Mautic.removeReportRow=function(container){mQuery("#"+container+" *[data-toggle='tooltip']").tooltip('destroy');mQuery('#'+container).remove();};Mautic.updateReportSourceData=function(context){Mautic.activateLabelLoadingIndicator('report_source');mQuery.ajax({url:mauticAjaxUrl,type:'post',data:"action=report:getSourceData&context="+context,success:function(response){mQuery('#report_columns').html(response.columns);mQuery('#report_columns').multiSelect('refresh');mQuery('#report_groupBy').html(response.columns);mQuery('#report_groupBy').multiSelect('refresh');mQuery('#report_filters').find('div').remove().end();mQuery('#report_filters').data('index',0);Mautic.reportPrototypeColumnOptions=mQuery(response.columns);mQuery('#report_tableOrder').find('div').remove().end();mQuery('#report_tableOrder').data('index',0);mQuery('#report_aggregators').find('div').remove().end();mQuery('#report_aggregators').data('index',0);Mautic.reportPrototypeFilterDefinitions=response.filterDefinitions;Mautic.reportPrototypeFilterOptions=response.filters;Mautic.reportPrototypeFilterOperators=response.filterOperators;mQuery('#report_graphs').html(response.graphs);mQuery('#report_graphs').multiSelect('refresh');if(!response.graphs){mQuery('#graphs-container').addClass('hide');mQuery('#graphs-tab').addClass('hide');}else{mQuery('#graphs-container').removeClass('hide');mQuery('#graphs-tab').removeClass('hide');}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);},complete:function(){Mautic.removeLabelLoadingIndicator();}});};Mautic.checkReportCondition=function(selector){var option=mQuery('#'+selector+' option:selected').val();var valueInput=selector.replace('condition','value');if(option=='empty'||option=='notEmpty'){mQuery('#'+valueInput).prop('disabled',true);}else{mQuery('#'+valueInput).prop('disabled',false);}};Mautic.checkSelectedGroupBy=function(){var selectedOption=mQuery("select[name='report[groupBy][]'] option:selected").length;var existingAggregators=mQuery("select[name*='report[aggregators]']");if(selectedOption>0){mQuery('#aggregators-button').prop('disabled',false);}else{existingAggregators.each(function(){var containerId=mQuery(this).attr('id').replace('_column','');Mautic.removeReportRow(containerId+'_container');});mQuery('#aggregators-button').prop('disabled',true);}};;Mautic.smsOnLoad=function(container,response){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','sms');}};Mautic.selectSmsType=function(smsType){if(smsType=='list'){mQuery('#leadList').removeClass('hide');mQuery('#publishStatus').addClass('hide');mQuery('.page-header h3').text(mauticLang.newListSms);}else{mQuery('#publishStatus').removeClass('hide');mQuery('#leadList').addClass('hide');mQuery('.page-header h3').text(mauticLang.newTemplateSms);}
 mQuery('#sms_smsType').val(smsType);mQuery('body').removeClass('noscroll');mQuery('.sms-type-modal').remove();mQuery('.sms-type-modal-backdrop').remove();};Mautic.standardSmsUrl=function(options){if(!options){return;}
 var url=options.windowUrl;if(url){var editEmailKey='/sms/edit/smsId';if(url.indexOf(editEmailKey)>-1){options.windowUrl=url.replace('smsId',mQuery('#campaignevent_properties_sms').val());}}
 return options;};Mautic.disabledSmsAction=function(opener){if(typeof opener=='undefined'){opener=window;}
diff --git a/media/js/libraries.js b/media/js/libraries.js
index b5494a75188..23590164535 100644
--- a/media/js/libraries.js
+++ b/media/js/libraries.js
@@ -473,14 +473,17 @@ return this.pushStack(ret);};});var iframe,elemdisplay={};function actualDisplay
 function defaultDisplay(nodeName){var doc=document,display=elemdisplay[nodeName];if(!display){display=actualDisplay(nodeName,doc);if(display==="none"||!display){iframe=(iframe||jQuery("<iframe frameborder='0' width='0' height='0'/>")).appendTo(doc.documentElement);doc=iframe[0].contentDocument;doc.write();doc.close();display=actualDisplay(nodeName,doc);iframe.detach();}
 elemdisplay[nodeName]=display;}
 return display;}
-var rmargin=(/^margin/);var rnumnonpx=new RegExp("^("+pnum+")(?!px)[a-z%]+$","i");var getStyles=function(elem){return elem.ownerDocument.defaultView.getComputedStyle(elem,null);};function curCSS(elem,name,computed){var width,minWidth,maxWidth,ret,style=elem.style;computed=computed||getStyles(elem);if(computed){ret=computed.getPropertyValue(name)||computed[name];}
+var rmargin=(/^margin/);var rnumnonpx=new RegExp("^("+pnum+")(?!px)[a-z%]+$","i");var getStyles=function(elem){if(elem.ownerDocument&&elem.ownerDocument.defaultView)
+return elem.ownerDocument.defaultView.getComputedStyle(elem,null);else if(window.getComputedStyle)
+return getComputedStyle(elem,null);return{};};function curCSS(elem,name,computed){var width,minWidth,maxWidth,ret,style=elem.style;computed=computed||getStyles(elem);if(computed){ret=computed.getPropertyValue(name)||computed[name];}
 if(computed){if(ret===""&&!jQuery.contains(elem.ownerDocument,elem)){ret=jQuery.style(elem,name);}
 if(rnumnonpx.test(ret)&&rmargin.test(name)){width=style.width;minWidth=style.minWidth;maxWidth=style.maxWidth;style.minWidth=style.maxWidth=style.width=ret;ret=computed.width;style.width=width;style.minWidth=minWidth;style.maxWidth=maxWidth;}}
 return ret!==undefined?ret+"":ret;}
 function addGetHookIf(conditionFn,hookFn){return{get:function(){if(conditionFn()){delete this.get;return;}
 return(this.get=hookFn).apply(this,arguments);}};}
 (function(){var pixelPositionVal,boxSizingReliableVal,docElem=document.documentElement,container=document.createElement("div"),div=document.createElement("div");if(!div.style){return;}
-div.style.backgroundClip="content-box";div.cloneNode(true).style.backgroundClip="";support.clearCloneStyle=div.style.backgroundClip==="content-box";container.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;"+"position:absolute";container.appendChild(div);function computePixelPositionAndBoxSizingReliable(){div.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;"+"box-sizing:border-box;display:block;margin-top:1%;top:1%;"+"border:1px;padding:1px;width:4px;position:absolute";div.innerHTML="";docElem.appendChild(container);var divStyle=window.getComputedStyle(div,null);pixelPositionVal=divStyle.top!=="1%";boxSizingReliableVal=divStyle.width==="4px";docElem.removeChild(container);}
+div.style.backgroundClip="content-box";div.cloneNode(true).style.backgroundClip="";support.clearCloneStyle=div.style.backgroundClip==="content-box";container.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;"+"position:absolute";container.appendChild(div);function computePixelPositionAndBoxSizingReliable(){div.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;"+"box-sizing:border-box;display:block;margin-top:1%;top:1%;"+"border:1px;padding:1px;width:4px;position:absolute";div.innerHTML="";docElem.appendChild(container);var divStyle=window.getComputedStyle(div,null);if(divStyle){pixelPositionVal=divStyle.top!=="1%";boxSizingReliableVal=divStyle.width==="4px";}
+docElem.removeChild(container);}
 if(window.getComputedStyle){jQuery.extend(support,{pixelPosition:function(){computePixelPositionAndBoxSizingReliable();return pixelPositionVal;},boxSizingReliable:function(){if(boxSizingReliableVal==null){computePixelPositionAndBoxSizingReliable();}
 return boxSizingReliableVal;},reliableMarginRight:function(){var ret,marginDiv=div.appendChild(document.createElement("div"));marginDiv.style.cssText=div.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;"+"box-sizing:content-box;display:block;margin:0;border:0;padding:0";marginDiv.style.marginRight=marginDiv.style.width="0";div.style.width="1px";docElem.appendChild(container);ret=!parseFloat(window.getComputedStyle(marginDiv,null).marginRight);docElem.removeChild(container);return ret;}});}})();jQuery.swap=function(elem,options,callback,args){var ret,name,old={};for(name in options){old[name]=elem.style[name];elem.style[name]=options[name];}
 ret=callback.apply(elem,args||[]);for(name in options){elem.style[name]=old[name];}
@@ -3089,7 +3092,8 @@ var coords=coordsChar(cm,x,y),line;if(forRect&&coords.xRel==1&&(line=getLine(cm.
 return coords;}
 function onMouseDown(e){var cm=this,display=cm.display;if(signalDOMEvent(cm,e)||display.activeTouch&&display.input.supportsTouch())return;display.shift=e.shiftKey;if(eventInWidget(display,e)){if(!webkit){display.scroller.draggable=false;setTimeout(function(){display.scroller.draggable=true;},100);}
 return;}
-if(clickInGutter(cm,e))return;var start=posFromMouse(cm,e);window.focus();switch(e_button(e)){case 1:if(cm.state.selectingText)
+if(clickInGutter(cm,e))return;var start=posFromMouse(cm,e);var codeMode=typeof Mautic!='undefined'&&Mautic.codeMode===true;if(!codeMode){window.focus();}
+switch(e_button(e)){case 1:if(cm.state.selectingText&&!codeMode)
 cm.state.selectingText(e);else if(start)
 leftButtonDown(cm,e,start);else if(e_target(e)==display.scroller)
 e_preventDefault(e);break;case 2:if(webkit)cm.state.lastMiddleDown=+new Date;if(start)extendSelection(cm.doc,start);setTimeout(function(){display.input.focus();},20);e_preventDefault(e);break;case 3:if(captureRightClick)onContextMenu(cm,e);else delayBlurEvent(cm);break;}}
diff --git a/media/js/mautic-form.js b/media/js/mautic-form.js
index d5d369a3093..ee8acd9da76 100644
--- a/media/js/mautic-form.js
+++ b/media/js/mautic-form.js
@@ -42,5 +42,5 @@ this.buildOut();this.initializeEvents();window.getComputedStyle(this.modal).heig
 if(this.options.overlay===true){this.overlay=document.createElement("div");this.overlay.className="mauticForm-overlay "+this.options.className;docFrag.appendChild(this.overlay);}
 contentHolder=document.createElement("div");contentHolder.className="mauticForm-content";contentHolder.innerHTML=content;this.modal.appendChild(contentHolder);docFrag.appendChild(this.modal);document.body.appendChild(docFrag);};Modal.extendDefaults=function(source,properties){for(var property in properties){if(properties.hasOwnProperty(property))source[property]=properties[property];}
 return source;};Modal.initializeEvents=function(){if(this.closeButton)this.closeButton.addEventListener('click',this.close.bind(this));if(this.overlay)this.overlay.addEventListener('click',this.close.bind(this));};Modal.transitionSelect=function(){var el=document.createElement("div");return(el.style.WebkitTransition)?"webkitTransitionEnd":(el.style.WebkitTransition)?"webkitTransitionEnd":"oTransitionEnd";};Modal.close=function(){var _=this;this.modal.className=this.modal.className.replace(" mauticForm-open","");this.overlay.className=this.overlay.className.replace(" mauticForm-open","");this.modal.addEventListener(this.transitionSelect(),function(){_.modal.parentNode.removeChild(_.modal);});this.overlay.addEventListener(this.transitionSelect(),function(){if(_.overlay.parentNode)_.overlay.parentNode.removeChild(_.overlay);});this.overlay.parentNode.removeChild(this.overlay);this.modal.parentNode.removeChild(this.modal);};Core.parseToObject=function(params){return JSON.parse('{"'+decodeURI(params.trim().replace(/&/g,"\",\"").replace(/=/g,"\":\""))+'"}');};Core.setConfig=function(options){config=options;};Core.getConfig=function(){return config;};Core.debug=function(){return(typeof(config.debug)!='undefined'&&parseInt(config.debug)!='Nan'&&config.debug==1)?true:false;};Core.devMode=function(){return(typeof(config.devmode)!='undefined'&&parseInt(config.devmode)!='Nan'&&config.devmode==1)?true:false;};Core.setMauticBaseUrl=function(base_url){config.mautic_base_url=base_url.split('/').slice(0,-3).join('/')+'/';};Core.getMauticBaseUrl=function(){return config.mautic_base_url;};Core.initialize=function(base_url){Profiler.startTime();if(Core.debug())console.log('SDK initialized');if(typeof(config.mautic_base_url)=='undefined')Core.setMauticBaseUrl(base_url);if(Core.debug())console.log('Automatic setup mautic_base_url as: '+config.mautic_base_url);Modal.loadStyle();document.addEventListener("DOMContentLoaded",function(e){if(Core.debug())console.log('DOM is ready');Form.initialize();});};Core.openModal=function(options){Modal.open(options);};Core.onLoad=function(){Form.prepareForms();Form.registerFormMessenger();};return Core;}
-if(typeof(MauticSDK)==='undefined'){window.MauticSDK=define_library();var sjs=document.getElementsByTagName('script'),tjs=sjs.length;for(var i=0;i<sjs.length;i++){if(!sjs[i].hasAttribute('src')||sjs[i].getAttribute("src").indexOf('mautic-form-src.js')==-1)continue;var sParts=sjs[i].getAttribute("src").split("?");if(sParts[1])MauticSDK.setConfig(MauticSDK.parseToObject(sParts[1]));MauticSDK.initialize(sParts[0]);break;}}
+if(typeof(MauticSDK)==='undefined'){window.MauticSDK=define_library();var sjs=document.getElementsByTagName('script'),tjs=sjs.length;for(var i=0;i<sjs.length;i++){if(!sjs[i].hasAttribute('src')||sjs[i].getAttribute("src").indexOf('mautic-form.js')==-1)continue;var sParts=sjs[i].getAttribute("src").split("?");if(sParts[1])MauticSDK.setConfig(MauticSDK.parseToObject(sParts[1]));MauticSDK.initialize(sParts[0]);break;}}
 if(typeof window.MauticFormValidations=='undefined'){window.MauticFormValidations={};}})(window);
\ No newline at end of file
diff --git a/plugins/MauticCitrixBundle/Assets/css/citrix.css b/plugins/MauticCitrixBundle/Assets/css/citrix.css
index 1d7989c71dd..219e976e8bc 100644
--- a/plugins/MauticCitrixBundle/Assets/css/citrix.css
+++ b/plugins/MauticCitrixBundle/Assets/css/citrix.css
@@ -1,7 +1,9 @@
-span.event-name-slot {
-
-}
-
-span.event-desc-slot {
-
+.citrix-start-button {
+  font-size: 16px;
+  color: #ffffff;
+  text-decoration: none;
+  border-radius: 3px;
+  padding: 12px 18px;
+  background-color: #4e5e9e;
+  display: inline-block;
 }
diff --git a/plugins/MauticCitrixBundle/Assets/css/citrix.less b/plugins/MauticCitrixBundle/Assets/css/citrix.less
new file mode 100644
index 00000000000..67c8ab86600
--- /dev/null
+++ b/plugins/MauticCitrixBundle/Assets/css/citrix.less
@@ -0,0 +1,17 @@
+span.event-name-slot {
+
+}
+
+span.event-desc-slot {
+
+}
+
+.citrix-start-button {
+  font-size: 16px;
+  color: #ffffff;
+  text-decoration: none;
+  border-radius: 3px;
+  padding: 12px 18px;
+  background-color: #4e5e9e;
+  display: inline-block;
+}
diff --git a/plugins/MauticCitrixBundle/Command/SyncCommand.php b/plugins/MauticCitrixBundle/Command/SyncCommand.php
index 079fdaae903..37e20c3bf2e 100644
--- a/plugins/MauticCitrixBundle/Command/SyncCommand.php
+++ b/plugins/MauticCitrixBundle/Command/SyncCommand.php
@@ -14,7 +14,6 @@
 use Mautic\CoreBundle\Command\ModeratedCommand;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixHelper;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixProducts;
-use MauticPlugin\MauticCitrixBundle\Model\CitrixModel;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -26,9 +25,6 @@
  */
 class SyncCommand extends ModeratedCommand
 {
-    /** @var CitrixModel */
-    protected $citrixModel;
-
     /**
      * {@inheritdoc}
      *
diff --git a/plugins/MauticCitrixBundle/Config/config.php b/plugins/MauticCitrixBundle/Config/config.php
index d2949cdbf7d..242b1217392 100644
--- a/plugins/MauticCitrixBundle/Config/config.php
+++ b/plugins/MauticCitrixBundle/Config/config.php
@@ -55,7 +55,10 @@
                 ],
             ],
             'mautic.citrix.emailbundle.subscriber' => [
-                'class' => 'MauticPlugin\MauticCitrixBundle\EventListener\EmailSubscriber',
+                'class'     => 'MauticPlugin\MauticCitrixBundle\EventListener\EmailSubscriber',
+                'arguments' => [
+                    'mautic.citrix.model.citrix',
+                ],
             ],
         ],
         'forms' => [
diff --git a/plugins/MauticCitrixBundle/Entity/CitrixEvent.php b/plugins/MauticCitrixBundle/Entity/CitrixEvent.php
index 1bc8362fd5d..82b52aa669d 100644
--- a/plugins/MauticCitrixBundle/Entity/CitrixEvent.php
+++ b/plugins/MauticCitrixBundle/Entity/CitrixEvent.php
@@ -158,12 +158,50 @@ public function getEventName()
         return $this->eventName;
     }
 
+    /**
+     * @return string
+     */
+    public function getEventNameOnly()
+    {
+        $eventName = $this->eventName;
+
+        return substr($eventName, 0, strpos($eventName, '_#'));
+    }
+
+    /**
+     * @return string
+     */
+    public function getEventId()
+    {
+        $eventName = $this->eventName;
+
+        return substr($eventName, strpos($eventName, '_#') + 2);
+    }
+
     /**
      * @return string
      */
     public function getEventDesc()
     {
-        return $this->eventDesc;
+        $pos = strpos($this->eventDesc, '_!');
+        if (false === $pos) {
+            return $this->eventDesc;
+        }
+
+        return substr($this->eventDesc, 0, $pos);
+    }
+
+    /**
+     * @return string
+     */
+    public function getJoinUrl()
+    {
+        $pos = strpos($this->eventDesc, '_!');
+        if (false === $pos) {
+            return '';
+        }
+
+        return substr($this->eventDesc, $pos + 2);
     }
 
     /**
diff --git a/plugins/MauticCitrixBundle/EventListener/EmailSubscriber.php b/plugins/MauticCitrixBundle/EventListener/EmailSubscriber.php
index f8e14a64405..49936bde3cf 100644
--- a/plugins/MauticCitrixBundle/EventListener/EmailSubscriber.php
+++ b/plugins/MauticCitrixBundle/EventListener/EmailSubscriber.php
@@ -16,25 +16,42 @@
 use Mautic\EmailBundle\Event\EmailBuilderEvent;
 use Mautic\EmailBundle\Event\EmailSendEvent;
 use MauticPlugin\MauticCitrixBundle\CitrixEvents;
+use MauticPlugin\MauticCitrixBundle\Entity\CitrixEvent;
 use MauticPlugin\MauticCitrixBundle\Event\TokenGenerateEvent;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixHelper;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixProducts;
+use MauticPlugin\MauticCitrixBundle\Model\CitrixModel;
 
 /**
  * Class EmailSubscriber.
  */
 class EmailSubscriber extends CommonSubscriber
 {
+    /**
+     * @var CitrixModel
+     */
+    protected $citrixModel;
+
+    /**
+     * FormSubscriber constructor.
+     *
+     * @param CitrixModel $citrixModel
+     */
+    public function __construct(CitrixModel $citrixModel)
+    {
+        $this->citrixModel = $citrixModel;
+    }
+
     /**
      * @return array
      */
     public static function getSubscribedEvents()
     {
         return [
-//            CitrixEvents::ON_CITRIX_TOKEN_GENERATE => ['onTokenGenerate', 254],
-            EmailEvents::EMAIL_ON_BUILD => ['onEmailBuild', 0],
-//            EmailEvents::EMAIL_ON_SEND => array('decodeTokensSend', 0),
-            EmailEvents::EMAIL_ON_DISPLAY => ['decodeTokensDisplay', 0],
+            CitrixEvents::ON_CITRIX_TOKEN_GENERATE => ['onTokenGenerate', 254],
+            EmailEvents::EMAIL_ON_BUILD            => ['onEmailBuild', 0],
+            EmailEvents::EMAIL_ON_SEND             => ['decodeTokensSend', 0],
+            EmailEvents::EMAIL_ON_DISPLAY          => ['decodeTokensDisplay', 0],
         ];
     }
 
@@ -47,6 +64,28 @@ public static function getSubscribedEvents()
     public function onTokenGenerate(TokenGenerateEvent $event)
     {
         // inject product details in $event->params on email send
+        if ('webinar' == $event->getProduct()) {
+            $event->setProductLink('https://www.gotomeeting.com/webinar');
+            $params = $event->getParams();
+            if (!empty($params['lead'])) {
+                $email  = $params['lead']['email'];
+                $repo   = $this->citrixModel->getRepository();
+                $result = $repo->findBy(
+                    [
+                        'product'   => 'webinar',
+                        'eventType' => 'registered',
+                        'email'     => $email,
+                    ], ['eventDate' => 'DESC'], 1);
+                if (0 !== count($result)) {
+                    /** @var CitrixEvent $ce */
+                    $ce = $result[0];
+                    $event->setProductLink($ce->getJoinUrl());
+                }
+            } else {
+                CitrixHelper::log('Updating webinar token failed! Email not found '.implode(', ', $event->getParams()));
+            }
+            $event->setProductText($this->translator->trans('plugin.citrix.token.join_webinar'));
+        }
     }
 
     /**
@@ -57,13 +96,23 @@ public function onTokenGenerate(TokenGenerateEvent $event)
      */
     public function onEmailBuild(EmailBuilderEvent $event)
     {
-        // register tokens
-        $tokens = [
-            '{meeting_button}'  => $this->translator->trans('plugin.citrix.token.meeting_button'),
-            '{training_button}' => $this->translator->trans('plugin.citrix.token.training_button'),
-            '{assist_button}'   => $this->translator->trans('plugin.citrix.token.assist_button'),
-        ];
+        // register tokens only if the plugins are enabled
+        $tokens         = [];
+        $activeProducts = [];
+        foreach (['meeting', 'training', 'assist', 'webinar'] as $p) {
+            if (CitrixHelper::isAuthorized('Goto'.$p)) {
+                $activeProducts[]          = $p;
+                $tokens['{'.$p.'_button}'] = $this->translator->trans('plugin.citrix.token.'.$p.'_button');
+                if ('webinar' === $p) {
+                    $tokens['{'.$p.'_link}'] = $this->translator->trans('plugin.citrix.token.'.$p.'_link');
+                }
+            }
+        }
+        if (0 === count($activeProducts)) {
+            return;
+        }
 
+        // register tokens
         if ($event->tokensRequested(array_keys($tokens))) {
             $event->addTokens(
                 $event->filterTokens($tokens)
@@ -80,7 +129,7 @@ public function onEmailBuild(EmailBuilderEvent $event)
      */
     public function decodeTokensDisplay(EmailSendEvent $event)
     {
-        $this->decodeTokens($event);
+        $this->decodeTokens($event, false);
     }
 
     /**
@@ -114,6 +163,7 @@ public function decodeTokens(EmailSendEvent $event, $triggerEvent = false)
             CitrixProducts::GOTOMEETING,
             CitrixProducts::GOTOTRAINING,
             CitrixProducts::GOTOASSIST,
+            CitrixProducts::GOTOWEBINAR,
         ];
 
         foreach ($products as $product) {
@@ -122,9 +172,15 @@ public function decodeTokens(EmailSendEvent $event, $triggerEvent = false)
                     'product' => $product,
                 ];
 
+                if ('webinar' == $product) {
+                    $params['productText'] = $this->translator->trans('plugin.citrix.token.join_webinar');
+                    $params['productLink'] = 'https://www.gotomeeting.com/webinar';
+                }
+
                 // trigger event to replace the links in the tokens
                 if ($triggerEvent && $this->dispatcher->hasListeners(CitrixEvents::ON_CITRIX_TOKEN_GENERATE)) {
-                    $tokenEvent = new TokenGenerateEvent($params);
+                    $params['lead'] = $event->getLead();
+                    $tokenEvent     = new TokenGenerateEvent($params);
                     $this->dispatcher->dispatch(CitrixEvents::ON_CITRIX_TOKEN_GENERATE, $tokenEvent);
                     $params = $tokenEvent->getParams();
                     unset($tokenEvent);
@@ -135,6 +191,7 @@ public function decodeTokens(EmailSendEvent $event, $triggerEvent = false)
                     $params
                 );
                 $content = str_replace('{'.$product.'_button}', $button, $content);
+                $content = str_replace('{'.$product.'_link}', $params['productLink'], $content);
             } else {
                 // remove the token
                 $content = str_replace('{'.$product.'_button}', '', $content);
diff --git a/plugins/MauticCitrixBundle/EventListener/FormSubscriber.php b/plugins/MauticCitrixBundle/EventListener/FormSubscriber.php
index c19023c2605..1329f9442eb 100644
--- a/plugins/MauticCitrixBundle/EventListener/FormSubscriber.php
+++ b/plugins/MauticCitrixBundle/EventListener/FormSubscriber.php
@@ -18,12 +18,14 @@
 use Mautic\FormBundle\Entity\Form;
 use Mautic\FormBundle\Entity\SubmissionRepository;
 use Mautic\FormBundle\Event as Events;
+use Mautic\FormBundle\Event\SubmissionEvent;
 use Mautic\FormBundle\Exception\ValidationException;
 use Mautic\FormBundle\FormEvents;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\FormBundle\Model\SubmissionModel;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\PluginBundle\Event\PluginIntegrationRequestEvent;
+use Mautic\PluginBundle\PluginEvents;
 use MauticPlugin\MauticCitrixBundle\CitrixEvents;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixHelper;
 use MauticPlugin\MauticCitrixBundle\Helper\CitrixProducts;
@@ -73,27 +75,27 @@ public function __construct(CitrixModel $citrixModel, FormModel $formModel, Subm
     public static function getSubscribedEvents()
     {
         return [
-            FormEvents::FORM_ON_BUILD                                         => ['onFormBuilder', 0],
-            CitrixEvents::ON_WEBINAR_REGISTER_ACTION                          => ['onWebinarRegister', 0],
-            CitrixEvents::ON_MEETING_START_ACTION                             => ['onMeetingStart', 0],
-            CitrixEvents::ON_TRAINING_REGISTER_ACTION                         => ['onTrainingRegister', 0],
-            CitrixEvents::ON_TRAINING_START_ACTION                            => ['onTrainingStart', 0],
-            CitrixEvents::ON_ASSIST_REMOTE_ACTION                             => ['onAssistRemote', 0],
-            CitrixEvents::ON_FORM_VALIDATE_ACTION                             => ['onFormValidate', 0],
-            FormEvents::FORM_PRE_SAVE                                         => ['onFormPreSave', 0],
-            \Mautic\PluginBundle\PluginEvents::PLUGIN_ON_INTEGRATION_REQUEST  => ['onRequest', 0],
-            \Mautic\PluginBundle\PluginEvents::PLUGIN_ON_INTEGRATION_RESPONSE => ['onResponse', 0],
+            FormEvents::FORM_ON_BUILD                    => ['onFormBuilder', 0],
+            CitrixEvents::ON_WEBINAR_REGISTER_ACTION     => ['onWebinarRegister', 0],
+            CitrixEvents::ON_MEETING_START_ACTION        => ['onMeetingStart', 0],
+            CitrixEvents::ON_TRAINING_REGISTER_ACTION    => ['onTrainingRegister', 0],
+            CitrixEvents::ON_TRAINING_START_ACTION       => ['onTrainingStart', 0],
+            CitrixEvents::ON_ASSIST_REMOTE_ACTION        => ['onAssistRemote', 0],
+            CitrixEvents::ON_FORM_VALIDATE_ACTION        => ['onFormValidate', 0],
+            FormEvents::FORM_PRE_SAVE                    => ['onFormPreSave', 0],
+            PluginEvents::PLUGIN_ON_INTEGRATION_REQUEST  => ['onRequest', 0],
+            PluginEvents::PLUGIN_ON_INTEGRATION_RESPONSE => ['onResponse', 0],
         ];
     }
 
     /**
-     * @param Events\SubmissionEvent $event
-     * @param string                 $product
-     * @param string                 $startType indicates that this is a start product, not registration
+     * @param SubmissionEvent $event
+     * @param string          $product
+     * @param string          $startType indicates that this is a start product, not registration
      *
      * @throws ValidationException
      */
-    private function _doRegistration(Events\SubmissionEvent $event, $product, $startType = null)
+    private function _doRegistration(SubmissionEvent $event, $product, $startType = null)
     {
         $submission = $event->getSubmission();
         $form       = $submission->getForm();
@@ -203,27 +205,27 @@ private function _doRegistration(Events\SubmissionEvent $event, $product, $start
         }
     }
 
-    public function onWebinarRegister(Events\SubmissionEvent $event)
+    public function onWebinarRegister(SubmissionEvent $event)
     {
         $this->_doRegistration($event, CitrixProducts::GOTOWEBINAR);
     }
 
-    public function onMeetingStart(Events\SubmissionEvent $event)
+    public function onMeetingStart(SubmissionEvent $event)
     {
         $this->_doRegistration($event, CitrixProducts::GOTOMEETING, 'start.meeting');
     }
 
-    public function onTrainingRegister(Events\SubmissionEvent $event)
+    public function onTrainingRegister(SubmissionEvent $event)
     {
         $this->_doRegistration($event, CitrixProducts::GOTOTRAINING);
     }
 
-    public function onTrainingStart(Events\SubmissionEvent $event)
+    public function onTrainingStart(SubmissionEvent $event)
     {
         $this->_doRegistration($event, CitrixProducts::GOTOTRAINING, 'start.training');
     }
 
-    public function onAssistRemote(Events\SubmissionEvent $event)
+    public function onAssistRemote(SubmissionEvent $event)
     {
         $this->_doRegistration($event, CitrixProducts::GOTOASSIST, 'screensharing.assist');
     }
diff --git a/plugins/MauticCitrixBundle/EventListener/LeadSubscriber.php b/plugins/MauticCitrixBundle/EventListener/LeadSubscriber.php
index 51024e3c7e7..23c08bfe024 100644
--- a/plugins/MauticCitrixBundle/EventListener/LeadSubscriber.php
+++ b/plugins/MauticCitrixBundle/EventListener/LeadSubscriber.php
@@ -135,8 +135,10 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                             'eventType'  => $timelineEventTypeLabel,
                             'timestamp'  => $citrixEvent->getEventDate(),
                             'extra'      => [
-                                'eventName' => $citrixEvent->getEventName(),
+                                'eventName' => $citrixEvent->getEventNameOnly(),
+                                'eventId'   => $citrixEvent->getEventId(),
                                 'eventDesc' => $citrixEvent->getEventDesc(),
+                                'joinUrl'   => $citrixEvent->getJoinUrl(),
                             ],
                             'contentTemplate' => 'MauticCitrixBundle:SubscribedEvents\Timeline:citrix_event.html.php',
                         ]
@@ -194,7 +196,8 @@ public function onListChoicesGenerate(LeadListFiltersChoicesEvent $event)
                             'list' => $eventNamesWithAny,
                         ],
                         'operators' => [
-                            'include' => ['in', '!in'],
+                            'in'  => $event->getTranslator()->trans('mautic.core.operator.in'),
+                            '!in' => $event->getTranslator()->trans('mautic.core.operator.notin'),
                         ],
                     ]
                 );
@@ -210,7 +213,8 @@ public function onListChoicesGenerate(LeadListFiltersChoicesEvent $event)
                         'list' => $eventNamesWithAny,
                     ],
                     'operators' => [
-                        'include' => ['in', '!in'],
+                        'in'  => $event->getTranslator()->trans('mautic.core.operator.in'),
+                        '!in' => $event->getTranslator()->trans('mautic.core.operator.notin'),
                     ],
                 ]
             );
@@ -225,7 +229,7 @@ public function onListChoicesGenerate(LeadListFiltersChoicesEvent $event)
                         'list' => $eventNamesWithoutAny,
                     ],
                     'operators' => [
-                        'include' => ['in'],
+                        'in' => $event->getTranslator()->trans('mautic.core.operator.in'),
                     ],
                 ]
             );
diff --git a/plugins/MauticCitrixBundle/Helper/CitrixHelper.php b/plugins/MauticCitrixBundle/Helper/CitrixHelper.php
index 71b5bcd55ff..a7483cd5a3c 100644
--- a/plugins/MauticCitrixBundle/Helper/CitrixHelper.php
+++ b/plugins/MauticCitrixBundle/Helper/CitrixHelper.php
@@ -564,6 +564,7 @@ protected static function extractContacts($results)
                     'firstname' => (isset($result['firstName'])) ? $result['firstName'] : '',
                     'lastname'  => (isset($result['lastName'])) ? $result['lastName'] : '',
                     'email'     => $result['email'],
+                    'joinUrl'   => (isset($result['joinUrl'])) ? $result['joinUrl'] : '',
                 ];
             }
 
diff --git a/plugins/MauticCitrixBundle/Integration/CitrixAbstractIntegration.php b/plugins/MauticCitrixBundle/Integration/CitrixAbstractIntegration.php
index 25ed811642a..5a551bb8601 100644
--- a/plugins/MauticCitrixBundle/Integration/CitrixAbstractIntegration.php
+++ b/plugins/MauticCitrixBundle/Integration/CitrixAbstractIntegration.php
@@ -107,7 +107,7 @@ public function getFormSettings()
      */
     public function getApiUrl()
     {
-        return 'https://api.citrixonline.com';
+        return 'https://api.getgo.com';
     }
 
     /**
diff --git a/plugins/MauticCitrixBundle/Model/CitrixModel.php b/plugins/MauticCitrixBundle/Model/CitrixModel.php
index 455098a4725..559849fd2f6 100644
--- a/plugins/MauticCitrixBundle/Model/CitrixModel.php
+++ b/plugins/MauticCitrixBundle/Model/CitrixModel.php
@@ -138,7 +138,7 @@ public function getEmailsByEvent($product, $eventName, $eventType)
         $emails = [];
         if (0 !== count($citrixEvents)) {
             $emails = array_map(
-                function (\MauticPlugin\MauticCitrixBundle\Entity\CitrixEvent $citrixEvent) {
+                function (CitrixEvent $citrixEvent) {
                     return $citrixEvent->getEmail();
                 },
                 $citrixEvents
@@ -191,7 +191,22 @@ public function getDistinctEventNamesDesc($product)
         $items  = $query->getResult();
         $result = [];
         foreach ($items as $item) {
-            $result[$item['eventName']] = $item['eventDesc'];
+            $eventDesc = $item['eventDesc'];
+            // strip joinUrl if exists
+            $pos = strpos($eventDesc, '_!');
+            if (false !== $pos) {
+                $eventDesc = substr($eventDesc, 0, $pos);
+            }
+            // filter events with same id
+            $eventId = $item['eventName'];
+            $pos     = strpos($eventId, '_#');
+            $eventId = substr($eventId, $pos);
+            foreach ($result as $k => $v) {
+                if (false !== strpos($k, $eventId)) {
+                    unset($result[$k]);
+                }
+            }
+            $result[$item['eventName']] = $eventDesc;
         }
 
         return $result;
@@ -346,6 +361,10 @@ public function batchAddAndRemove(
                     $citrixEvent->setEventDate($info['event_date']);
                 }
 
+                if (!empty($info['joinUrl'])) {
+                    $citrixEvent->setEventDesc($eventDesc.'_!'.$info['joinUrl']);
+                }
+
                 $newEntities[] = $citrixEvent;
 
                 if (null !== $output) {
diff --git a/plugins/MauticCitrixBundle/Translations/en_US/messages.ini b/plugins/MauticCitrixBundle/Translations/en_US/messages.ini
index 7511d4524ed..3ac48d59bf7 100644
--- a/plugins/MauticCitrixBundle/Translations/en_US/messages.ini
+++ b/plugins/MauticCitrixBundle/Translations/en_US/messages.ini
@@ -118,9 +118,13 @@ plugin.citrix.last_name.tooltip = "Select the form field that matches the contac
 
 plugin.citrix.token.meeting_button = "GoToMeeting Start Button"
 plugin.citrix.token.training_button = "GoToTraining Start Button"
-plugin.citrix.token.assist_button = "Request GoToAssist Session Button"
+plugin.citrix.token.assist_button = "GoToAssist Request Session Button"
+plugin.citrix.token.webinar_button = "GoToWebinar Join Button"
+plugin.citrix.token.webinar_link = "GoToWebinar Join URL"
+plugin.citrix.token.join_webinar = "Join Webinar"
 
 plugin.citrix.emailtemplate="Send this email template"
 plugin.citrix.emailtemplate_descr="This is the email template with the token in the body to insert the link."
 
 plugin.citrix.start.producttext="Click here to start your %s"
+plugin.citrix.webinar.token_error="ERROR: A "Join Webinar" token is in the email body, but a GotoWebinar filter is not present in the email segments"
diff --git a/plugins/MauticCitrixBundle/Views/SubscribedEvents/EmailToken/token.html.php b/plugins/MauticCitrixBundle/Views/SubscribedEvents/EmailToken/token.html.php
index eb304c64396..7006fb874f4 100644
--- a/plugins/MauticCitrixBundle/Views/SubscribedEvents/EmailToken/token.html.php
+++ b/plugins/MauticCitrixBundle/Views/SubscribedEvents/EmailToken/token.html.php
@@ -13,7 +13,8 @@
 $link     = (isset($productLink)) ? $productLink : '#';
 $text     = (isset($productText)) ? $productText : 'Start GoTo'.ucfirst($prodName);
 ?>
-<a href="<?php echo $link; ?>" target="_blank" style="font-size: 16px; color: #ffffff; text-decoration: none; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; padding: 12px 18px; background-color: #4e5e9e; display: inline-block;">
+<link rel="stylesheet" href="<?php echo $view['assets']->getUrl('plugins/MauticCitrixBundle/Assets/css/citrix.css'); ?>" type="text/css"/>
+<a class="citrix-start-button" href="<?php echo $link; ?>" target="_blank">
     <?php echo $text; ?>
 </a>
 <div style="clear:both"></div>
diff --git a/plugins/MauticCitrixBundle/Views/SubscribedEvents/Timeline/citrix_event.html.php b/plugins/MauticCitrixBundle/Views/SubscribedEvents/Timeline/citrix_event.html.php
index 50d1ab3c9ee..7863a55b680 100644
--- a/plugins/MauticCitrixBundle/Views/SubscribedEvents/Timeline/citrix_event.html.php
+++ b/plugins/MauticCitrixBundle/Views/SubscribedEvents/Timeline/citrix_event.html.php
@@ -29,8 +29,12 @@
 	    </div>
 		<div class="panel-footer">
 			<p>
-                <span class="event-name-slot"><?php echo $view->escape($event['extra']['eventName']) ?></span>
-				<span class="event-desc-slot"><?php echo $view->escape($event['extra']['eventDesc']) ?></span>
+                <span class="event-name-slot"><strong>ID:</strong> <?php echo $view->escape($event['extra']['eventId']) ?></span><br/>
+                <span class="event-name-slot"><strong>Name:</strong> <?php echo $view->escape($event['extra']['eventName']) ?></span><br/>
+                <span class="event-name-slot"><strong>Description:</strong> <?php echo $view->escape($event['extra']['eventDesc']) ?></span><br/>
+                <?php if ('' !== $event['extra']['joinUrl']) : ?>
+                    <span class="event-desc-slot"><strong>Join URL:</strong> <a href="<?php echo $view->escape($event['extra']['joinUrl']) ?>"><?php echo $view->escape($event['extra']['joinUrl']) ?></a></span>
+                <?php endif ?>
 			</p>
 		</div>
 	</div>
diff --git a/plugins/MauticCrmBundle/Api/SalesforceApi.php b/plugins/MauticCrmBundle/Api/SalesforceApi.php
index bcbb3ed73e1..a2a747d6a27 100644
--- a/plugins/MauticCrmBundle/Api/SalesforceApi.php
+++ b/plugins/MauticCrmBundle/Api/SalesforceApi.php
@@ -42,7 +42,6 @@ public function request($operation, $elementData = [], $method = 'GET', $retry =
         if (!$object) {
             $object = $this->object;
         }
-
         if (!$queryUrl) {
             $queryUrl   = $this->integration->getApiUrl();
             $requestUrl = sprintf($queryUrl.'/%s/%s', $object, $operation);
@@ -99,25 +98,48 @@ public function getLeadFields($object = null)
      *
      * @return mixed
      */
-    public function createLead(array $data, $lead)
+    public function createLead(array $data)
     {
-        //find lead
-        $update = false;
-        if (isset($data['Email'])) {
-            $findLead = 'select Id from Lead where email = \''.$data['Email'].'\'';
-            $queryUrl = $this->integration->getQueryUrl();
-            $sfLead   = $this->request('query', ['q' => $findLead], 'GET', false, null, $queryUrl);
-
-            $lead = $sfLead['records'];
-            if (isset($lead[0]['Id'])) {
-                $update = true;
+        $createdLeadData = [];
+        $createLead      = true;
+        $config          = $this->integration->mergeConfigToFeatureSettings([]);
+        //if not found then go ahead and make an API call to find all the records with that email
+
+        $queryUrl            = $this->integration->getQueryUrl();
+        $sfRecord['records'] = [];
+        //try searching for lead as this has been changed before in updated done to the plugin
+        if (isset($config['objects']) && array_search('Contact', $config['objects']) && isset($data['Contact']['Email'])) {
+            $sfObject    = 'Contact';
+            $findContact = 'select Id from Contact where email = \''.$data['Contact']['Email'].'\'';
+            $sfRecord    = $this->request('query', ['q' => $findContact], 'GET', false, null, $queryUrl);
+        }
+
+        if (empty($sfRecord['records']) && isset($data['Lead']['Email'])) {
+            $sfObject = 'Lead';
+            $findLead = 'select Id, ConvertedContactId from Lead where email = \''.$data['Lead']['Email'].'\'';
+            $sfRecord = $this->request('query', ['q' => $findLead], 'GET', false, null, $queryUrl);
+        }
+        $sfLeadRecords = $sfRecord['records'];
+
+        if (!empty($sfLeadRecords)) {
+            foreach ($sfLeadRecords as $sfLeadRecord) {
+                $createLead = false;
+                $sfLeadId   = $sfLeadRecord['Id'];
+                //update the converted contact if found and not the Lead because it will error in SF
+                if (isset($sfLeadRecord['ConvertedContactId']) && $sfLeadRecord['ConvertedContactId'] != null) {
+                    if (isset($config['objects']) && array_search('Contact', $config['objects'])) {
+                        $createdLeadData[] = $this->request('', $data['Contact'], 'PATCH', false, 'Contact/'.$sfLeadRecord['ConvertedContactId']);
+                    } elseif (count($sfLeadRecords) <= 1) {
+                        $createLead = true;
+                    }
+                } else {
+                    $createdLeadData[] = $this->request('', $data[$sfObject], 'PATCH', false, $sfObject.'/'.$sfLeadId);
+                }
             }
         }
 
-        if ($update) {
-            $createdLeadData = $this->request('', $data, 'PATCH', false, 'Lead/'.$lead[0]['Id']);
-        } else {
-            $createdLeadData = $this->request('', $data, 'POST', false, 'Lead');
+        if ($createLead && isset($data['Lead']['Email'])) {
+            $createdLeadData = $this->request('', $data['Lead'], 'POST', false, 'Lead');
         }
 
         //todo: check if push activities is selected in config
@@ -125,6 +147,18 @@ public function createLead(array $data, $lead)
         return $createdLeadData;
     }
 
+    /**
+     * @param array $data
+     *
+     * @return mixed|string
+     */
+    public function syncMauticToSalesforce(array $data)
+    {
+        $queryUrl = $this->integration->getCompositeUrl();
+
+        return $this->request('composite/', $data, 'POST', false, null, $queryUrl);
+    }
+
     /**
      * @param array $activity
      * @param       $object
@@ -227,10 +261,8 @@ public function createLeadActivity(array $activity, $object)
     public function getLeads($query, $object)
     {
         $organizationCreatedDate = $this->getOrganizationCreatedDate();
-
+        $queryUrl                = $this->integration->getQueryUrl();
         if (isset($query['start'])) {
-            $queryUrl = $this->integration->getQueryUrl();
-
             if (strtotime($query['start']) < strtotime($organizationCreatedDate)) {
                 $query['start'] = date('c', strtotime($organizationCreatedDate.' +1 hour'));
             }
@@ -240,7 +272,7 @@ public function getLeads($query, $object)
         switch ($object) {
             case 'company':
             case 'Account':
-                $fields = array_keys(array_filter($fields['companyFields']));
+              $fields = array_keys(array_filter($fields['companyFields']));
                 break;
             default:
                 $mixedFields = array_filter($fields['leadFields']);
@@ -249,12 +281,15 @@ public function getLeads($query, $object)
                     if (strpos($sfField, '__'.$object) !== false) {
                         $fields[] = str_replace('__'.$object, '', $sfField);
                     }
+                    if (strpos($sfField, '-'.$object) !== false) {
+                        $fields[] = str_replace('-'.$object, '', $sfField);
+                    }
                 }
         }
-
+        $result = [];
         if (!empty($fields) and isset($query['start'])) {
-            $fields   = implode(', ', $fields);
             $fields[] = 'Id';
+            $fields   = implode(', ', array_unique($fields));
 
             $config = $this->integration->mergeConfigToFeatureSettings([]);
             if (isset($config['updateOwner']) && isset($config['updateOwner'][0]) && $config['updateOwner'][0] == 'updateOwner') {
@@ -263,8 +298,11 @@ public function getLeads($query, $object)
 
             $getLeadsQuery = 'SELECT '.$fields.' from '.$object.' where LastModifiedDate>='.$query['start'].' and LastModifiedDate<='.$query['end'];
             $result        = $this->request('query', ['q' => $getLeadsQuery], 'GET', false, null, $queryUrl);
+        } elseif (isset($query['nextUrl'])) {
+            $query  = str_replace('/services/data/v34.0/query', '', $query['nextUrl']);
+            $result = $this->request('query'.$query, [], 'GET', false, null, $queryUrl);
         } else {
-            $result = $this->request('query/'.$query, [], 'GET', false, null, $queryUrl);
+            $result = $this->request('query', ['q' => $query], 'GET', false, null, $queryUrl);
         }
 
         return $result;
@@ -286,4 +324,33 @@ public function getOrganizationCreatedDate()
 
         return $organizationCreatedDate;
     }
+
+    public function getCampaigns()
+    {
+        $campaignQuery = 'Select Id, Name from Campaign where isDeleted = false';
+        $queryUrl      = $this->integration->getQueryUrl();
+
+        $result = $this->request('query', ['q' => $campaignQuery], 'GET', false, null, $queryUrl);
+
+        return $result;
+    }
+
+    public function getCampaignMembers($campaignId)
+    {
+        $campaignMembersQuery = "Select CampaignId, ContactId, LeadId, isDeleted from CampaignMember where CampaignId = '".trim($campaignId)."'";
+        $queryUrl             = $this->integration->getQueryUrl();
+        $result               = $this->request('query', ['q' => $campaignMembersQuery], 'GET', false, null, $queryUrl);
+
+        return $result;
+    }
+
+    public function getCampaignMemberStatus($campaignId)
+    {
+        $campaignQuery = "Select Id, Label from CampaignMemberStatus where isDeleted = false and CampaignId='".$campaignId."'";
+        $queryUrl      = $this->integration->getQueryUrl();
+
+        $result = $this->request('query', ['q' => $campaignQuery], 'GET', false, null, $queryUrl);
+
+        return $result;
+    }
 }
diff --git a/plugins/MauticCrmBundle/Config/config.php b/plugins/MauticCrmBundle/Config/config.php
index db6c48877ac..303e0940358 100644
--- a/plugins/MauticCrmBundle/Config/config.php
+++ b/plugins/MauticCrmBundle/Config/config.php
@@ -32,4 +32,15 @@
             ],
         ],
     ],
+    'services' => [
+        'events' => [
+            'mautic.integration.leadbundle.subscriber' => [
+                'class'     => 'MauticPlugin\MauticCrmBundle\EventListener\LeadListSubscriber',
+                'arguments' => [
+                    'mautic.helper.integration',
+                    'mautic.lead.model.list',
+                ],
+            ],
+        ],
+    ],
 ];
diff --git a/plugins/MauticCrmBundle/EventListener/LeadListSubscriber.php b/plugins/MauticCrmBundle/EventListener/LeadListSubscriber.php
new file mode 100644
index 00000000000..c284085b089
--- /dev/null
+++ b/plugins/MauticCrmBundle/EventListener/LeadListSubscriber.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticCrmBundle\EventListener;
+
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\LeadBundle\Event\LeadListFiltersChoicesEvent;
+use Mautic\LeadBundle\Event\ListPreProcessListEvent;
+use Mautic\LeadBundle\LeadEvents;
+use Mautic\LeadBundle\Model\ListModel;
+use Mautic\PluginBundle\Helper\IntegrationHelper;
+
+/**
+ * Class LeadListsSubscriber.
+ */
+class LeadListSubscriber extends CommonSubscriber
+{
+    /**
+     * @var IntegrationHelper
+     */
+    protected $helper;
+
+    protected $listModel;
+
+    /**
+     * ChannelSubscriber constructor.
+     *
+     * @param IntegrationHelper $helper
+     */
+    public function __construct(IntegrationHelper $helper, ListModel $listModel)
+    {
+        $this->helper    = $helper;
+        $this->listModel = $listModel;
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            LeadEvents::LIST_FILTERS_CHOICES_ON_GENERATE => ['onFilterChoiceFieldsGenerate', 0],
+            LeadEvents::LIST_PRE_PROCESS_LIST            => ['onLeadListProcessList', 0],
+        ];
+    }
+
+    /**
+     * @param LeadListFiltersChoicesEvent $event
+     */
+    public function onFilterChoiceFieldsGenerate(LeadListFiltersChoicesEvent $event)
+    {
+        $integration = $this->helper->getIntegrationObject('Salesforce');
+        if (!$integration || !$integration->getIntegrationSettings()->isPublished()) {
+            return;
+        }
+
+        $choices   = [];
+        $campaigns = $integration->getCampaigns();
+        if (isset($campaigns['records']) && !empty($campaigns['records'])) {
+            foreach ($campaigns['records'] as $campaign) {
+                $choices[$campaign['Id']] = $campaign['Name'];
+            }
+        }
+        if (!empty($campaigns)) {
+            $config = [
+                'label'      => $this->translator->trans('mautic.plugin.integration.campaign_members'),
+                'properties' => ['type' => 'select', 'list' => $choices],
+                'operators'  => $this->listModel->getOperatorsForFieldType(
+                    [
+                        'include' => [
+                            '=',
+                        ],
+                    ]),
+                'object' => 'lead',
+            ];
+            $event->addChoice('lead', 'integration_campaigns', $config);
+        }
+    }
+
+    /**
+     * Add/remove contacts to a segment based on contacts found in Integration Campaigns.
+     *
+     * @param ListChangeEvent $event
+     */
+    public function onLeadListProcessList(ListPreProcessListEvent $event)
+    {
+        //get Integration Campaign members
+        $integrationObjects = $this->helper->getIntegrationObjects();
+        $list               = $event->getList();
+        $success            = false;
+
+        foreach ($integrationObjects as $name => $integrationObject) {
+            $settings = $integrationObject->getIntegrationSettings();
+            if (!$settings->isPublished()) {
+                continue;
+            }
+
+            if (method_exists($integrationObject, 'getCampaignMembers')) {
+                foreach ($list['filters'] as $filter) {
+                    if ($filter['field'] == 'integration_campaigns') {
+                        if ($integrationObject->getCampaignMembers($filter['filter'], [])) {
+                            $success = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $event->setResult($success);
+    }
+}
diff --git a/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php b/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
index 0ecbf303f3c..20ee418ef95 100644
--- a/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
@@ -24,6 +24,7 @@
 abstract class CrmAbstractIntegration extends AbstractIntegration
 {
     protected $auth;
+    protected $pushContactLink = false;
 
     /**
      * @param Integration $settings
@@ -182,26 +183,31 @@ public function getApiHelper()
         return $helper;
     }
 
+    /**
+     * @param \DateTime|null $startDate
+     * @param \DateTime|null $endDate
+     * @param                $leadId
+     *
+     * @return array
+     */
     public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = null, $leadId)
     {
         return [];
     }
 
+    /**
+     * @param array $params
+     */
     public function pushLeadActivity($params = [])
     {
     }
 
     /**
-     * Create or update existing Mautic lead from the integration's profile data.
+     * @param $data
      *
-     * @param mixed       $data        Profile data from integration
-     * @param bool|true   $persist     Set to false to not persist lead to the database in this method
-     * @param array|null  $socialCache
-     * @param mixed||null $identifiers
-     *
-     * @return Lead
+     * @return Company|void
      */
-    public function getMauticCompany($data, $persist = true, $identifiers = null)
+    public function getMauticCompany($data)
     {
         if (is_object($data)) {
             // Convert to array in all levels
@@ -212,15 +218,21 @@ public function getMauticCompany($data, $persist = true, $identifiers = null)
         }
         $config = $this->mergeConfigToFeatureSettings([]);
         // Match that data with mapped lead fields
-        $matchedFields = $this->populateMauticLeadData($data, $config, 'company');
-
-        if (!isset($matchedFields['companyname'])) {
-            if (isset($matchedFields['companywebsite'])) {
-                $matchedFields['companyname'] = $matchedFields['companywebsite'];
+        $matchedFields          = $this->populateMauticLeadData($data, $config, 'company');
+        $fieldsToUpdateInMautic = isset($config['update_mautic_company']) ? array_keys($config['update_mautic_company'], 0) : [];
+        if (!empty($fieldsToUpdateInMautic)) {
+            $fieldsToUpdateInMautic = array_diff_key($config['companyFields'], array_flip($fieldsToUpdateInMautic));
+            $newMatchedFields       = array_intersect_key($matchedFields, array_flip($fieldsToUpdateInMautic));
+        } else {
+            $newMatchedFields = $matchedFields;
+        }
+        if (!isset($newMatchedFields['companyname'])) {
+            if (isset($newMatchedFields['companywebsite'])) {
+                $newMatchedFields['companyname'] = $newMatchedFields['companywebsite'];
             }
         }
 
-        if (empty($matchedFields)) {
+        if (empty($newMatchedFields)) {
             return;
         }
 
@@ -229,12 +241,14 @@ public function getMauticCompany($data, $persist = true, $identifiers = null)
         $companyModel = $this->factory->getModel('lead.company');
 
         // Default to new company
-        $company = new Company();
-
+        $company         = new Company();
         $existingCompany = IdentifyCompanyHelper::identifyLeadsCompany($matchedFields, null, $companyModel);
         if ($existingCompany[2]) {
             $company = $existingCompany[2];
+        } else {
+            $matchedFields = $newMatchedFields; //change direction of fields only when updating an existing company
         }
+
         $companyModel->setFieldValues($company, $matchedFields, false, false);
         $companyModel->saveEntity($company, false);
 
@@ -284,6 +298,7 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
             //return if uniqueIdentifiers have no data set to avoid duplicating leads.
             return;
         }
+
         // Default to new lead
         $lead = new Lead();
         $lead->setNewlyCreated(true);
@@ -296,6 +311,13 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
                 $lead = array_shift($existingLeads);
             }
         }
+
+        //use direction of fields only when updating existing lead
+        $fieldsToUpdateInMautic = (isset($config['update_mautic']) && empty($existingLeads)) ? array_keys($config['update_mautic'], 0) : [];
+        if (!empty($fieldsToUpdateInMautic)) {
+            $fieldsToUpdateInMautic = array_diff_key($config['leadFields'], array_flip($fieldsToUpdateInMautic));
+            $matchedFields          = array_intersect_key($matchedFields, array_flip($fieldsToUpdateInMautic));
+        }
         $leadModel->setFieldValues($lead, $matchedFields, false, false);
 
         if (!empty($socialCache)) {
@@ -341,7 +363,7 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
      *
      * @return array|mixed
      */
-    protected function getFormFieldsByObject($object)
+    protected function getFormFieldsByObject($object, $settings = [])
     {
         $settings['feature_settings']['objects'] = [$object => $object];
 
diff --git a/plugins/MauticCrmBundle/Integration/HubspotIntegration.php b/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
index a3e7d7f96d6..2ec6e5a230a 100644
--- a/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
@@ -99,7 +99,7 @@ public function getApiUrl()
      */
     public function getFormCompanyFields($settings = [])
     {
-        return $this->getFormFieldsByObject('company');
+        return $this->getFormFieldsByObject('company', $settings);
     }
 
     /**
@@ -109,7 +109,7 @@ public function getFormCompanyFields($settings = [])
      */
     public function getFormLeadFields($settings = [])
     {
-        return $this->getFormFieldsByObject('contacts');
+        return $this->getFormFieldsByObject('contacts', $settings);
     }
 
     /**
@@ -166,8 +166,6 @@ public function getAvailableLeadFields($settings = [])
             }
         }
 
-        $this->cache->set('leadFields', $hubsFields);
-
         return $hubsFields;
     }
 
diff --git a/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php b/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
index f1a40f55240..175446ee9e5 100644
--- a/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
@@ -13,9 +13,11 @@
 
 use Mautic\EmailBundle\Model\EmailModel;
 use Mautic\FormBundle\Model\SubmissionModel;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\PluginBundle\Entity\IntegrationEntity;
 use Mautic\PluginBundle\Entity\IntegrationEntityRepository;
+use Mautic\PluginBundle\Exception\ApiErrorException;
 use MauticPlugin\MauticCrmBundle\Api\SalesforceApi;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -25,6 +27,12 @@
  */
 class SalesforceIntegration extends CrmAbstractIntegration
 {
+    private $objects = [
+        'Lead',
+        'Contact',
+        'Account',
+    ];
+
     /**
      * {@inheritdoc}
      *
@@ -88,6 +96,14 @@ public function getRefreshTokenKeys()
         return ['refresh_token', ''];
     }
 
+    /**
+     * @return array
+     */
+    public function getSupportedFeatures()
+    {
+        return ['push_lead', 'get_leads', 'push_leads'];
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -144,6 +160,14 @@ public function getQueryUrl()
         return sprintf('%s/services/data/v34.0', $this->keys['instance_url']);
     }
 
+    /**
+     * @return string
+     */
+    public function getCompositeUrl()
+    {
+        return sprintf('%s/services/data/v38.0', $this->keys['instance_url']);
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -168,6 +192,16 @@ public function getAuthenticationType()
         return 'oauth2';
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function getDataPriority()
+    {
+        return true;
+    }
+
     /**
      * Get available company fields for choices in the config UI.
      *
@@ -177,7 +211,7 @@ public function getAuthenticationType()
      */
     public function getFormCompanyFields($settings = [])
     {
-        return $this->getFormFieldsByObject('company');
+        return $this->getFormFieldsByObject('company', $settings);
     }
 
     /**
@@ -189,8 +223,8 @@ public function getFormCompanyFields($settings = [])
      */
     public function getFormLeadFields($settings = [])
     {
-        $leadFields    = $this->getFormFieldsByObject('Lead');
-        $contactFields = $this->getFormFieldsByObject('Contact');
+        $leadFields    = $this->getFormFieldsByObject('Lead', $settings);
+        $contactFields = $this->getFormFieldsByObject('Contact', $settings);
 
         return array_merge($leadFields, $contactFields);
     }
@@ -214,7 +248,9 @@ public function getAvailableLeadFields($settings = [])
         }
 
         $isRequired = function (array $field, $object) {
-            return ($field['type'] !== 'boolean' && empty($field['nillable']) && !in_array($field['name'], ['Status', 'Id'])) || ($object == 'Lead' && in_array($field['name'], ['Company']));
+            return ($field['type'] !== 'boolean' && empty($field['nillable']) && !in_array($field['name'], ['Status', 'Id']))
+                || ($object == 'Lead'
+                    && in_array($field['name'], ['Company']));
         };
 
         $salesFields = [];
@@ -236,14 +272,15 @@ public function getAvailableLeadFields($settings = [])
                         // Check the cache first
                         $settings['cache_suffix'] = $cacheSuffix = '.'.$sfObject;
                         if ($fields = parent::getAvailableLeadFields($settings)) {
-                            $salesFields[$sfObject] = $fields;
+                            if (('company' === $sfObject && isset($fields['Id'])) || isset($fields['Id__'.$sfObject])) {
+                                $salesFields[$sfObject] = $fields;
 
-                            continue;
+                                continue;
+                            }
                         }
 
                         if (!isset($salesFields[$sfObject])) {
                             $fields = $this->getApiHelper()->getLeadFields($sfObject);
-
                             if (!empty($fields['fields'])) {
                                 foreach ($fields['fields'] as $fieldInfo) {
                                     if ((!$fieldInfo['updateable'] && (!$fieldInfo['calculated'] && $fieldInfo['name'] != 'Id'))
@@ -261,10 +298,12 @@ public function getAvailableLeadFields($settings = [])
                                         $type = 'string';
                                     }
                                     if ($sfObject !== 'company') {
-                                        $salesFields[$sfObject][$fieldInfo['name'].' - '.$sfObject] = [
-                                            'type'     => $type,
-                                            'label'    => $sfObject.' - '.$fieldInfo['label'],
-                                            'required' => $isRequired($fieldInfo, $sfObject),
+                                        $salesFields[$sfObject][$fieldInfo['name'].'__'.$sfObject] = [
+                                            'type'        => $type,
+                                            'label'       => $sfObject.'-'.$fieldInfo['label'],
+                                            'required'    => $isRequired($fieldInfo, $sfObject),
+                                            'group'       => $sfObject,
+                                            'optionLabel' => $fieldInfo['label'],
                                         ];
                                     } else {
                                         $salesFields[$sfObject][$fieldInfo['name']] = [
@@ -278,6 +317,8 @@ public function getAvailableLeadFields($settings = [])
                                 $this->cache->set('leadFields'.$cacheSuffix, $salesFields[$sfObject]);
                             }
                         }
+
+                        asort($salesFields[$sfObject]);
                     }
                 }
             }
@@ -336,6 +377,8 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
 
         $count  = 0;
         $entity = null;
+        /** @var IntegrationEntityRepository $integrationEntityRepo */
+        $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
 
         if (isset($data['records']) and $object !== 'Activity') {
             foreach ($data['records'] as $record) {
@@ -362,18 +405,19 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
                         $entity                = $this->getMauticLead($dataObject, true, null, null);
                         $mauticObjectReference = 'lead';
                     } elseif ($object == 'Account') {
-                        $entity                = $this->getMauticCompany($dataObject, true, null);
+                        $entity                = $this->getMauticCompany($dataObject);
                         $mauticObjectReference = 'company';
                     } else {
-                        $this->logIntegrationError(new \Exception(
-                            sprintf('Received an unexpected object without an internalObjectReference "%s"', $object)));
+                        $this->logIntegrationError(
+                            new \Exception(
+                                sprintf('Received an unexpected object without an internalObjectReference "%s"', $object)
+                            )
+                        );
                         continue;
                     }
 
                     if ($entity) {
-                        /** @var IntegrationEntityRepository $integrationEntityRepo */
-                        $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
-                        $integrationId         = $integrationEntityRepo->getIntegrationsEntityId(
+                        $integrationId = $integrationEntityRepo->getIntegrationsEntityId(
                             'Salesforce',
                             $object,
                             $mauticObjectReference,
@@ -394,6 +438,8 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
                             $integrationEntity->setLastSyncDate(new \DateTime());
                             $integrationEntities[] = $integrationEntity;
                         }
+                        $this->em->detach($entity);
+                        unset($entity);
                     } else {
                         continue;
                     }
@@ -402,9 +448,10 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
 
                 $this->em->getRepository('MauticPluginBundle:IntegrationEntity')->saveEntities($integrationEntities);
                 $this->em->clear('Mautic\PluginBundle\Entity\IntegrationEntity');
-
-                unset($data);
             }
+            unset($data);
+            unset($integrationEntities);
+            unset($dataObject);
         }
 
         return $count;
@@ -501,8 +548,8 @@ public function cleanSalesForceData($fields, $keys, $object)
 
         foreach ($keys as $key) {
             if (strstr($key, '__'.$object)) {
-                $newKey                       = str_replace('__'.$object, '', $key);
-                $leadFields[$object][$newKey] = $fields['leadFields'][$key];
+                $newKey              = str_replace('__'.$object, '', $key);
+                $leadFields[$newKey] = $fields['leadFields'][$key];
             }
         }
 
@@ -527,19 +574,32 @@ public function pushLead($lead, $config = [])
 
         $fields = array_keys($config['leadFields']);
 
-        $leadFields = $this->cleanSalesForceData($config, $fields, $object);
-
-        $mappedData[$object] = $this->populateLeadData($lead, ['leadFields' => $leadFields[$object], 'object' => $object]);
+        $leadFields          = $this->cleanSalesForceData($config, $fields, $object);
+        $fieldsToUpdateInSf  = isset($config['update_mautic']) ? array_keys($config['update_mautic'], 1) : [];
+        $leadFields          = array_diff_key($leadFields, array_flip($fieldsToUpdateInSf));
+        $mappedData[$object] = $this->populateLeadData(
+            $lead,
+            ['leadFields' => $leadFields, 'object' => $object, 'feature_settings' => ['objects' => $config['objects']]]
+        );
         $this->amendLeadDataBeforePush($mappedData[$object]);
 
-        if (empty($mappedData[$object])) {
+        if (isset($config['objects']) && array_search('Contact', $config['objects'])) {
+            $contactFields         = $this->cleanSalesForceData($config, $fields, 'Contact');
+            $mappedData['Contact'] = $this->populateLeadData(
+                $lead,
+                ['leadFields' => $contactFields, 'object' => 'Contact', 'feature_settings' => ['objects' => $config['objects']]]
+            );
+            $this->amendLeadDataBeforePush($mappedData['Contact']);
+        }
+        if (empty($mappedData)) {
             return false;
         }
 
         try {
             if ($this->isAuthorized()) {
-                $createdLeadData = $this->getApiHelper()->createLead($mappedData[$object], $lead);
+                $createdLeadData = $this->getApiHelper()->createLead($mappedData);
                 if (isset($createdLeadData['id'])) {
+                    $object = 'Lead';
                     /** @var IntegrationEntityRepository $integrationEntityRepo */
                     $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
                     $integrationId         = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', $object, 'leads', $lead->getId());
@@ -550,7 +610,7 @@ public function pushLead($lead, $config = [])
                         $integrationEntity->setIntegration('Salesforce');
                         $integrationEntity->setIntegrationEntity($object);
                         $integrationEntity->setIntegrationEntityId($createdLeadData['id']);
-                        $integrationEntity->setInternalEntity('Lead');
+                        $integrationEntity->setInternalEntity('lead');
                         $integrationEntity->setInternalEntityId($lead->getId());
                     } else {
                         $integrationEntity = $integrationEntityRepo->getEntity($integrationId[0]['id']);
@@ -558,11 +618,17 @@ public function pushLead($lead, $config = [])
                     $integrationEntity->setLastSyncDate(new \DateTime());
                     $this->em->persist($integrationEntity);
                     $this->em->flush($integrationEntity);
+
+                    return $createdLeadData['id'];
                 }
 
                 return true;
             }
         } catch (\Exception $e) {
+            if ($e instanceof ApiErrorException) {
+                $e->setContact($lead);
+            }
+
             $this->logIntegrationError($e);
         }
 
@@ -575,32 +641,22 @@ public function pushLead($lead, $config = [])
      *
      * @return int|null
      */
-    public function getLeads($params = [], $query = null)
+    public function getLeads($params = [], $query = null, &$executed = null, $result = [], $object = 'Lead')
     {
-        $executed = null;
-
         $config = $this->mergeConfigToFeatureSettings([]);
 
-        $salesForceObjects[] = 'Lead';
-
-        if (isset($config['objects'])) {
-            $salesForceObjects = $config['objects'];
-        }
-
-        if (empty($query)) {
+        if (!$query) {
             $query = $this->getFetchQuery($params);
         }
 
         try {
             if ($this->isAuthorized()) {
-                foreach ($salesForceObjects as $object) {
-                    if ($object !== 'Activity' and $object !== 'company') {
-                        $result = $this->getApiHelper()->getLeads($query, $object);
-                        $executed += $this->amendLeadDataBeforeMauticPopulate($result, $object);
-                        if (isset($result['nextRecordsUrl'])) {
-                            $query = $result['nextRecordsUrl'];
-                            $this->getLeads($params, $query);
-                        }
+                if ($object !== 'Activity' and $object !== 'company') {
+                    $result = $this->getApiHelper()->getLeads($query, $object);
+                    $executed += $this->amendLeadDataBeforeMauticPopulate($result, $object);
+                    if (isset($result['nextRecordsUrl'])) {
+                        $query['nextUrl'] = $result['nextRecordsUrl'];
+                        $this->getLeads($params, $query, $executed, $result['records'], $object);
                     }
                 }
 
@@ -619,7 +675,7 @@ public function getLeads($params = [], $query = null)
      *
      * @return int|null
      */
-    public function getCompanies($params = [], $query = null)
+    public function getCompanies($params = [], $query = null, $executed = null)
     {
         $executed = null;
 
@@ -634,8 +690,9 @@ public function getCompanies($params = [], $query = null)
                 $result = $this->getApiHelper()->getLeads($query, $salesForceObject);
                 $executed += $this->amendLeadDataBeforeMauticPopulate($result, $salesForceObject);
                 if (isset($result['nextRecordsUrl'])) {
-                    $query = $result['nextRecordsUrl'];
-                    $this->getCompanies($params, $query);
+                    $query['nextUrl'] = $result['nextRecordsUrl'];
+                    $result           = null;
+                    $this->getCompanies($params, $query, $executed);
                 }
 
                 return $executed;
@@ -647,24 +704,6 @@ public function getCompanies($params = [], $query = null)
         return $executed;
     }
 
-    /**
-     * @param array $fields
-     *
-     * @return array
-     *
-     * @deprecated 2.6.0 to be removed in 3.0
-     */
-    public function amendToSfFields($fields)
-    {
-        $newFields = [];
-        foreach ($fields as $key => $field) {
-            $key                      = explode('-', $key);
-            $newFields[trim($key[0])] = $field;
-        }
-
-        return $newFields;
-    }
-
     /**
      * @param array $params
      *
@@ -683,7 +722,7 @@ public function pushLeadActivity($params = [])
         $apiHelper = $this->getApiHelper();
 
         $salesForceObjects[] = 'Lead';
-        if (isset($config['objects'])) {
+        if (isset($config['objects']) && !empty($config['objects'])) {
             $salesForceObjects = $config['objects'];
         }
 
@@ -909,9 +948,757 @@ public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = nu
      */
     public function convertLeadFieldKey($key, $field)
     {
-        $key    = explode(' - ', $key);
-        $newKey = trim($key[0]);
+        $search = [];
+        foreach ($this->objects as $object) {
+            $search[] = '__'.$object;
+        }
+
+        return str_replace($search, '', $key);
+    }
+
+    /**
+     * @param array $params
+     *
+     * @return mixed
+     */
+    public function pushLeads($params = [])
+    {
+        $limit                 = $params['limit'];
+        $config                = $this->mergeConfigToFeatureSettings();
+        $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
+        $mauticData            = $leadsToUpdate            = $fields            = [];
+        $fieldsToUpdateInSf    = isset($config['update_mautic']) ? array_keys($config['update_mautic'], 1) : [];
+        $leadFields            = $config['leadFields'];
+        $checkEmailsInSF       = [];
+        $sfContact             = [];
+
+        if (!empty($config['leadFields'])) {
+            $fields = implode(', l.', $config['leadFields']);
+            $fields = 'l.'.$fields;
+            $result = 0;
+            if ($mauticContactLinkField = array_search('mauticContactTimelineLink', $config['leadFields'])) {
+                $this->pushContactLink = true;
+                unset($leadFields[$mauticContactLinkField]);
+            }
+            $fields = implode(', l.', $leadFields);
+            $fields = 'l.'.$fields;
+            $result = 0;
+
+            $leadSfFieldsToCreate = $this->cleanSalesForceData($config, array_keys($config['leadFields']), 'Lead');
+            $leadSfFields         = array_diff_key($leadSfFieldsToCreate, array_flip($fieldsToUpdateInSf));
+            $contactSfFields      = $this->cleanSalesForceData($config, array_keys($config['leadFields']), 'Contact');
+
+            $contactSfFields = array_diff_key($contactSfFields, array_flip($fieldsToUpdateInSf));
+            $availableFields = $this->getAvailableLeadFields(['feature_settings' => ['objects' => ['Lead', 'Contact']]]);
+
+            $leadsToUpdate = $integrationEntityRepo->findLeadsToUpdate('Salesforce', 'lead', $fields, $limit);
+        }
+        foreach ($leadsToUpdate as $lead) {
+            if ($this->pushContactLink) {
+                $link = $this->factory->getRouter()->generate(
+                    'mautic_plugin_timeline_view',
+                    ['integration' => 'Salesforce', 'leadId' => $lead['internal_entity_id']],
+                    UrlGeneratorInterface::ABSOLUTE_URL
+                );
+                $lead['mauticContactTimelineLink'] = $link;
+            }
+            if (isset($lead['email']) && !empty($lead['email'])) {
+                $checkEmailsInSF[mb_strtolower($lead['email'])] = $lead;
+            }
+        }
+
+        // Only get the max limit
+        if ($limit) {
+            $limit -= count($leadsToUpdate);
+        }
+        //create lead records
+        if (null === $limit || $limit && !empty($fields)) {
+            $leadsToCreate = $integrationEntityRepo->findLeadsToCreate('Salesforce', $fields, $limit);
+            foreach ($leadsToCreate as $lead) {
+                if ($this->pushContactLink) {
+                    $link = $this->factory->getRouter()->generate(
+                        'mautic_plugin_timeline_view',
+                        ['integration' => 'Salesforce', 'leadId' => $lead['internal_entity_id']],
+                        UrlGeneratorInterface::ABSOLUTE_URL
+                    );
+                    $lead['mauticContactTimelineLink'] = $link;
+                }
+                if (isset($lead['email'])) {
+                    $checkEmailsInSF[mb_strtolower($lead['email'])] = $lead;
+                }
+            }
+        }
+
+        $deletedSFLeads      = [];
+        $salesforceIdMapping = [];
+        if ($checkEmailsInSF) {
+            $findLead = 'select Id, ConvertedContactId, Email, IsDeleted from Lead where isDeleted = false and Email in (\''.implode("','", array_keys($checkEmailsInSF))
+                .'\')';
+            $queryUrl = $this->getQueryUrl();
+
+            if (isset($config['objects']) && array_search('Contact', $config['objects'])) {
+                $findContact = 'select Id, Email, IsDeleted from Contact where isDeleted = false and Email in (\''.implode("','", array_keys($checkEmailsInSF))
+                    .'\')';
+                $sfContact = $this->getApiHelper()->request('query', ['q' => $findContact], 'GET', false, null, $queryUrl);
+            }
+
+            $sfLead = $this->getApiHelper()->request('query', ['q' => $findLead], 'GET', false, null, $queryUrl);
+            //process Contacts in SF first
+            if (isset($sfContact['records']) && !empty($sfContact['records'])) {
+                $sfContactRecords = $sfContact['records'];
+                foreach ($sfContactRecords as $sfContactRecord) {
+                    $key = mb_strtolower($sfContactRecord['Email']);
+                    if (isset($checkEmailsInSF[$key])) {
+                        $salesforceIdMapping[$checkEmailsInSF[$key]['internal_entity_id']] = $sfContactRecord['Id'];
+
+                        if (empty($sfContactRecord['IsDeleted'])) {
+                            $this->buildCompositeBody(
+                                $mauticData,
+                                $availableFields,
+                                $contactSfFields,
+                                'Contact',
+                                $checkEmailsInSF[$key],
+                                $sfContactRecord['Id']
+                            );
+                        } else {
+                            // @todo - Salesforce doesn't seem to be returning deleted contacts by default
+                            $deletedSFLeads[] = $sfContactRecord['Id'];
+                        }
+                        unset($checkEmailsInSF[$key]);
+                    } // Otherwise a duplicate in Salesforce and has already been processed
+                }
+            }
+            if ($sfLeadRecords = $sfLead['records']) {
+                foreach ($sfLeadRecords as $sfLeadRecord) {
+                    $key = mb_strtolower($sfLeadRecord['Email']);
+                    if (isset($checkEmailsInSF[$key])) {
+                        $isConverted = (isset($sfLeadRecord['ConvertedContactId'])
+                            && $sfLeadRecord['ConvertedContactId'] != null);
+                        $salesforceIdMapping[$checkEmailsInSF[$key]['internal_entity_id']] = ($isConverted) ? $sfLeadRecord['ConvertedContactId']
+                            : $sfLeadRecord['Id'];
+
+                        if (empty($sfLeadRecord['IsDeleted'])) {
+                            if ($isConverted && isset($config['objects']) && array_search('Contact', $config['objects'])) {
+                                $this->buildCompositeBody(
+                                    $mauticData,
+                                    $availableFields,
+                                    $contactSfFields,
+                                    'Contact',
+                                    $checkEmailsInSF[$key],
+                                    $sfLeadRecord['ConvertedContactId']
+                                );
+                                unset($checkEmailsInSF[$key]);
+                            } elseif (isset($sfLeadRecord['Id']) && !$isConverted) {
+                                $this->buildCompositeBody(
+                                    $mauticData,
+                                    $availableFields,
+                                    $leadSfFields,
+                                    'Lead',
+                                    $checkEmailsInSF[$key],
+                                    $sfLeadRecord['Id']
+                                );
+                                unset($checkEmailsInSF[$key]);
+                            }
+                        } else {
+                            // @todo - Salesforce doesn't seem to be returning deleted contacts by default
+                            $deletedSFLeads[] = $sfLeadRecord['Id'];
+                            if (!empty($sfLeadRecord['ConvertedContactId'])) {
+                                $deletedSFLeads[] = $sfLeadRecord['ConvertedContactId'];
+                            }
+                            unset($checkEmailsInSF[$key]);
+                        }
+                    } // Otherwise a duplicate in Salesforce and has already been processed
+                }
+            }
+        }
+
+        // If there are any deleted, mark it as so to prevent them from being queried over and over or recreated
+        if ($deletedSFLeads) {
+            $integrationEntityRepo->markAsDeleted($deletedSFLeads, $this->getName(), 'lead');
+        }
+
+        // Create any left over
+        if ($checkEmailsInSF) {
+            foreach ($checkEmailsInSF as $lead) {
+                $this->buildCompositeBody(
+                    $mauticData,
+                    $availableFields,
+                    $leadSfFieldsToCreate, //use all matched fields when creating new records in SF
+                    'Lead',
+                    $lead
+                );
+            }
+        }
+        $request['allOrNone']        = 'false';
+        $request['compositeRequest'] = array_values($mauticData);
+
+        /** @var SalesforceApi $apiHelper */
+        $apiHelper = $this->getApiHelper();
+        if (!empty($request)) {
+            $result = $apiHelper->syncMauticToSalesforce($request);
+        }
+
+        return $this->processCompositeResponse($result['compositeResponse'], $salesforceIdMapping);
+    }
+
+    /**
+     * @param $lead
+     *
+     * @return array
+     */
+    public function getSalesforceLeadId($lead)
+    {
+        $config = $this->mergeConfigToFeatureSettings([]);
+        /** @var IntegrationEntityRepository $integrationEntityRepo */
+        $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
+
+        if (isset($config['objects'])) {
+            //try searching for lead as this has been changed before in updated done to the plugin
+            if (array_search('Contact', $config['objects'])) {
+                $resultContact = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'Contact', 'lead', $lead->getId());
+
+                if ($resultContact) {
+                    return $resultContact;
+                }
+            }
+        }
+        $resultLead = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'Lead', 'lead', $lead->getId());
+
+        return $resultLead;
+    }
+
+    /**
+     * @param array $fields
+     *
+     * @return array
+     *
+     * @deprecated 2.6.0 to be removed in 3.0
+     */
+    public function amendToSfFields($fields)
+    {
+    }
+
+    /**
+     * @param      $mauticData
+     * @param      $availableFields
+     * @param      $fieldsToUpdateInSfUpdate
+     * @param      $object
+     * @param      $lead
+     * @param null $objectId
+     */
+    protected function buildCompositeBody(&$mauticData, $availableFields, $fieldsToUpdateInSfUpdate, $object, $lead, $objectId = null)
+    {
+        $body = [];
+        if (isset($lead['email']) && !empty($lead['email'])) {
+            //use a composite patch here that can update and create (one query) every 200 records
+            foreach ($fieldsToUpdateInSfUpdate as $sfField => $mauticField) {
+                $required = !empty($availableFields[$object][$sfField.'__'.$object]['required']);
+                if (isset($lead[$mauticField])) {
+                    $body[$sfField] = $lead[$mauticField];
+                }
+
+                if ($required && empty($body[$sfField])) {
+                    $body[$sfField] = $this->factory->getTranslator()->trans('mautic.integration.form.lead.unknown');
+                }
+            }
+
+            if (!empty($body)) {
+                $url = '/services/data/v38.0/sobjects/'.$object;
+                if ($objectId) {
+                    $url .= '/'.$objectId;
+                }
+                $id              = $lead['internal_entity_id'].'-'.$object.(!empty($lead['id']) ? '-'.$lead['id'] : '');
+                $mauticData[$id] = [
+                    'method'      => ($objectId) ? 'PATCH' : 'POST',
+                    'url'         => $url,
+                    'referenceId' => $id,
+                    'body'        => $body,
+                ];
+            }
+        }
+    }
+
+    /**
+     * @param       $response
+     * @param array $salesforceIdMapping
+     *
+     * @return array
+     */
+    protected function processCompositeResponse($response, array $salesforceIdMapping = [])
+    {
+        $created   = 0;
+        $updated   = 0;
+        $reference = '';
+        $leadLink  = '';
+        if (is_array($response)) {
+            $persistEntities = [];
+            foreach ($response as $item) {
+                $contactId = $integrationEntityId = null;
+                $object    = 'Lead';
+                if (!empty($item['referenceId'])) {
+                    $reference = explode('-', $item['referenceId']);
+                    if (3 === count($reference)) {
+                        list($contactId, $object, $integrationEntityId) = $reference;
+                    }
+                    if (4 === count($reference)) {
+                        list($contactId, $object, $integrationEntityId, $campaignId) = $reference;
+                    } else {
+                        list($contactId, $object) = $reference;
+                    }
+                }
+                if (strstr($object, 'CampaignMember')) {
+                    $object = 'CampaignMember';
+                }
+                if (isset($item['body'][0]['errorCode'])) {
+                    $exception = new ApiErrorException($item['body'][0]['message']);
+                    if ($object == 'Contact' || $object = 'Lead') {
+                        $exception->setContactId($contactId);
+                    }
+                    $this->logIntegrationError($exception);
+
+                    if ($integrationEntityId && $object !== 'CampaignMember') {
+                        $integrationEntity = $this->em->getReference('MauticPluginBundle:IntegrationEntity', $integrationEntityId);
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+                        $persistEntities[] = $integrationEntity;
+                    } elseif (isset($campaignId) and $campaignId != null) {
+                        $integrationEntity = $this->em->getReference('MauticPluginBundle:IntegrationEntity', $campaignId);
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+
+                        $persistEntities[] = $integrationEntity;
+                    } elseif ($contactId) {
+                        $integrationEntity = new IntegrationEntity();
+                        $integrationEntity->setDateAdded(new \DateTime());
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+                        $integrationEntity->setIntegration($this->getName());
+                        $integrationEntity->setIntegrationEntity($object);
+                        $integrationEntity->setInternalEntity('lead-error');
+                        $integrationEntity->setInternal(['error' => $item['body'][0]['message']]);
+                        $integrationEntity->setInternalEntityId($contactId);
+
+                        $persistEntities[] = $integrationEntity;
+                    }
+                } elseif (!empty($item['body']['success'])) {
+                    if (201 === $item['httpStatusCode']) {
+                        // New object created
+                        $integrationEntity = new IntegrationEntity();
+                        $integrationEntity->setDateAdded(new \DateTime());
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+                        $integrationEntity->setIntegration($this->getName());
+                        $integrationEntity->setIntegrationEntity($object);
+                        if ($object === 'CampaignMember') {
+                            $integrationEntity->setIntegrationEntityId($integrationEntityId);
+                            $integrationEntity->setInternal(['Id' => $item['body']['id']]);
+                        } else {
+                            $integrationEntity->setIntegrationEntityId($item['body']['id']);
+                        }
+                        $integrationEntity->setInternalEntity('lead');
+                        $integrationEntity->setInternalEntityId($contactId);
+
+                        $persistEntities[] = $integrationEntity;
+                    }
+                    ++$created;
+                } elseif (204 === $item['httpStatusCode']) {
+                    // Record was updated
+                    if ($integrationEntityId) {
+                        $integrationEntity = $this->em->getReference('MauticPluginBundle:IntegrationEntity', $integrationEntityId);
+                        if (is_object($integrationEntity)) {
+                            $integrationEntity->setLastSyncDate(new \DateTime());
+                        } else {
+                            unset($integrationEntity);
+                        }
+                    } else {
+                        // Found in Salesforce so create a new record for it
+                        $integrationEntity = new IntegrationEntity();
+                        $integrationEntity->setDateAdded(new \DateTime());
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+                        $integrationEntity->setIntegration($this->getName());
+                        $integrationEntity->setIntegrationEntity($object);
+                        $integrationEntity->setIntegrationEntityId($salesforceIdMapping[$contactId]);
+                        $integrationEntity->setInternalEntity('lead');
+                        $integrationEntity->setInternalEntityId($contactId);
+                    }
+                    if ($integrationEntity->getIntegrationEntityId()) {
+                        $persistEntities[] = $integrationEntity;
+                    }
+                    ++$updated;
+                } else {
+                    $error = 'http status code '.$item['httpStatusCode'];
+                    switch (true) {
+                        case !empty($item['body'][0]['message']['message']):
+                            $error = $item['body'][0]['message']['message'];
+                            break;
+                        case !empty($item['body']['message']):
+                            $error = $item['body']['message'];
+                            break;
+                    }
+
+                    $exception = new ApiErrorException($error);
+                    if (!empty($item['referenceId']) && ($object == 'Contact' || $object = 'Lead')) {
+                        $exception->setContactId($item['referenceId']);
+                    }
+                    $this->logIntegrationError($exception);
+                }
+            }
+
+            if ($persistEntities) {
+                $this->em->getRepository('MauticPluginBundle:IntegrationEntity')->saveEntities($persistEntities);
+                unset($persistEntities);
+                $this->em->clear(IntegrationEntity::class);
+            }
+        }
+
+        return [$updated, $created];
+    }
+
+    /**
+     * @return array
+     *
+     * @throws \Exception
+     */
+    public function getCampaigns()
+    {
+        $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
+        $campaigns         = [];
+        try {
+            $campaigns = $this->getApiHelper()->getCampaigns();
+        } catch (\Exception $e) {
+            $this->logIntegrationError($e);
+            if (!$silenceExceptions) {
+                throw $e;
+            }
+        }
+
+        return $campaigns;
+    }
+
+    /**
+     * @param $campaignId
+     * @param $settings
+     *
+     * @throws \Exception
+     */
+    public function getCampaignMembers($campaignId, $settings)
+    {
+        $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
+        $persistEntities   = $contactList   = $leadList   = $existingLeads   = $existingContacts   = [];
+
+        try {
+            $campaignsMembersResults = $this->getApiHelper()->getCampaignMembers($campaignId);
+        } catch (\Exception $e) {
+            $this->logIntegrationError($e);
+            if (!$silenceExceptions) {
+                throw $e;
+            }
+        }
+
+        //prepare contacts to import to mautic contacts to delete from mautic
+        if (isset($campaignsMembersResults['records']) && !empty($campaignsMembersResults['records'])) {
+            foreach ($campaignsMembersResults['records'] as $campaignMember) {
+                $contactType = !empty($campaignMember['LeadId']) ? 'Lead' : 'Contact';
+                $contactId   = !empty($campaignMember['LeadId']) ? $campaignMember['LeadId'] : $campaignMember['ContactId'];
+                $isDeleted   = ($campaignMember['IsDeleted']) ? true : false;
+                if ($contactType == 'Lead') {
+                    $leadList[$contactId] = [
+                        'type'       => $contactType,
+                        'id'         => $contactId,
+                        'campaignId' => $campaignMember['CampaignId'],
+                        'isDeleted'  => $isDeleted,
+                    ];
+                }
+                if ($contactType == 'Contact') {
+                    $contactList[$contactId] = [
+                        'type'       => $contactType,
+                        'id'         => $contactId,
+                        'campaignId' => $campaignMember['CampaignId'],
+                        'isDeleted'  => $isDeleted,
+                    ];
+                }
+            }
+
+            /** @var IntegrationEntityRepository $integrationEntityRepo */
+            $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
+            //update lead/contact records
+            $listOfLeads = implode('", "', array_keys($leadList));
+            $listOfLeads = '"'.$listOfLeads.'"';
+            $leads       = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'Lead', 'lead', null, null, null, false, 0, 0, $listOfLeads);
+
+            $listOfContacts = implode('", "', array_keys($contactList));
+            $listOfContacts = '"'.$listOfContacts.'"';
+            $contacts       = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'Contact', 'lead', null, null, null, false, 0, 0, $listOfContacts);
+
+            if (!empty($leads)) {
+                $existingLeads = array_map(function ($lead) {
+                    if (($lead['integration_entity'] == 'Lead')) {
+                        return $lead['integration_entity_id'];
+                    }
+                }, $leads);
+            }
+            if (!empty($contacts)) {
+                $existingContacts = array_map(function ($lead) {
+                    return ($lead['integration_entity'] == 'Contact') ? $lead['integration_entity_id'] : [];
+                }, $contacts);
+            }
+            //record campaigns in integration entity for segment to process
+            $allCampaignMembers = array_merge(array_values($existingLeads), array_values($existingContacts));
+            //Leads
+            $leadsToFetch = array_diff_key($leadList, $existingLeads);
+            $mixedFields  = $this->getIntegrationSettings()->getFeatureSettings();
+            $executed     = 0;
+            if (!empty($leadsToFetch)) {
+                $listOfLeadsToFetch = implode("','", array_keys($leadsToFetch));
+                $listOfLeadsToFetch = "'".$listOfLeadsToFetch."'";
+
+                $fields    = $this->getMixedLeadFields($mixedFields, 'Lead');
+                $fields[]  = 'Id';
+                $fields    = implode(', ', array_unique($fields));
+                $leadQuery = 'SELECT '.$fields.' from Lead where Id in ('.$listOfLeadsToFetch.')';
+
+                $this->getLeads([], $leadQuery, $executed, [], 'Lead');
+
+                $allCampaignMembers = array_merge($allCampaignMembers, array_keys($leadsToFetch));
+            }
+            //Contacts
+            $contactsToFetch = array_diff_key($contactList, $existingContacts);
+            if (!empty($contactsToFetch)) {
+                $listOfContactsToFetch = implode("','", array_keys($contactsToFetch));
+                $listOfContactsToFetch = "'".$listOfContactsToFetch."'";
+                $fields                = $this->getMixedLeadFields($mixedFields, 'Contact');
+                $fields[]              = 'Id';
+                $fields                = implode(', ', array_unique($fields));
+                $contactQuery          = 'SELECT '.$fields.' from Contact where Id in ('.$listOfContactsToFetch.')';
+                $this->getLeads([], $contactQuery, $executed, [], 'Contact');
+                $allCampaignMembers = array_merge($allCampaignMembers, array_keys($contactsToFetch));
+            }
+            if (!empty($allCampaignMembers)) {
+                $internalLeadIds = implode('", "', $allCampaignMembers);
+                $internalLeadIds = '"'.$internalLeadIds.'"';
+                $leads           = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', null, 'lead', null, null, null, false, 0, 0, $internalLeadIds);
+                //first find existing campaign members.
+                foreach ($leads as $campaignMember) {
+                    $existingCampaignMember = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'CampaignMember', 'lead', $campaignMember['internal_entity_id']);
+                    if (empty($existingCampaignMember)) {
+                        $integrationEntity = new IntegrationEntity();
+                        $integrationEntity->setDateAdded(new \DateTime());
+                        $integrationEntity->setLastSyncDate(new \DateTime());
+                        $integrationEntity->setIntegration($this->getName());
+                        $integrationEntity->setIntegrationEntity('CampaignMember');
+                        $integrationEntity->setIntegrationEntityId($campaignId);
+                        $integrationEntity->setInternalEntity('lead');
+                        $integrationEntity->setInternalEntityId($campaignMember['internal_entity_id']);
+                        $persistEntities[] = $integrationEntity;
+                    }
+                }
+
+                if ($persistEntities) {
+                    $this->em->getRepository('MauticPluginBundle:IntegrationEntity')->saveEntities($persistEntities);
+                    unset($persistEntities);
+                    $this->em->clear(IntegrationEntity::class);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param $fields
+     * @param $object
+     *
+     * @return array
+     */
+    public function getMixedLeadFields($fields, $object)
+    {
+        $mixedFields = array_filter($fields['leadFields']);
+        $fields      = [];
+        foreach ($mixedFields as $sfField => $mField) {
+            if (strpos($sfField, '__'.$object) !== false) {
+                $fields[] = str_replace('__'.$object, '', $sfField);
+            }
+            if (strpos($sfField, '-'.$object) !== false) {
+                $fields[] = str_replace('-'.$object, '', $sfField);
+            }
+        }
+
+        return $fields;
+    }
+
+    /**
+     * @param $campaignId
+     *
+     * @return array
+     *
+     * @throws \Exception
+     */
+    public function getCampaignMemberStatus($campaignId)
+    {
+        $silenceExceptions    = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
+        $campaignMemberStatus = [];
+        try {
+            $campaignMemberStatus = $this->getApiHelper()->getCampaignMemberStatus($campaignId);
+        } catch (\Exception $e) {
+            $this->logIntegrationError($e);
+            if (!$silenceExceptions) {
+                throw $e;
+            }
+        }
+
+        return $campaignMemberStatus;
+    }
+
+    /**
+     * @param Lead $lead
+     * @param      $integrationCampaignId
+     * @param      $status
+     *
+     * @return array
+     */
+    public function pushLeadToCampaign(Lead $lead, $integrationCampaignId, $status)
+    {
+        $mauticData = $salesforceIdMapping = [];
+        $objectId   = null;
+        $all        = [];
+        $createLead = false;
+        $config     = $this->mergeConfigToFeatureSettings([]);
+        /** @var IntegrationEntityRepository $integrationEntityRepo */
+        $integrationEntityRepo = $this->em->getRepository('MauticPluginBundle:IntegrationEntity');
+        //find campaignMember
+        $existingCampaignMember = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', 'CampaignMember', 'lead', $lead->getId(), null, null, null, false, 0, 0, "'".$integrationCampaignId."'");
+
+        if ($status) {
+            $body = [
+                'Status' => $status,
+            ];
+        } else {
+            $body = ['Status' => ''];
+        }
+
+        $object = 'CampaignMember';
+        $url    = '/services/data/v38.0/sobjects/'.$object;
+        if ($existingCampaignMember) {
+            foreach ($existingCampaignMember as $member) {
+                $integrationEntity      = $integrationEntityRepo->getEntity($member['id']);
+                $referenceId            = $integrationEntity->getId();
+                $campaignMemberInternal = $integrationEntity->getInternal();
+                $internalLeadId         = $integrationEntity->getInternalEntityId();
+            }
+        }
+
+        $queryUrl = $this->getQueryUrl();
+
+        $sfLeadRecords = [];
+        $allIds        = [];
+        $contactIds    = [];
+        $leadIds       = [];
+
+        if (!empty($lead->getEmail())) {
+            if (isset($config['objects']) && array_search('Contact', $config['objects'])) {
+                $sfObject        = 'Contact';
+                $findContact     = 'select Id from Contact where email = \''.$lead->getEmail().'\'';
+                $sfRecordContact = $this->getApiHelper()->request('query', ['q' => $findContact], 'GET', false, null, $queryUrl);
+                if (!empty($sfRecordContact['records'])) {
+                    $sfLeadRecords = $sfRecordContact['records'];
+                }
+                foreach ($sfRecordContact['records'] as $sfLeadRecord) {
+                    $sfLeadId            = $sfLeadRecord['Id'];
+                    $allIds[]            = $sfLeadRecord['Id'];
+                    $type                = 'ContactId';
+                    $existingBody[$type] = $sfLeadId;
+                    $all[]               = array_merge($body, $existingBody);
+                }
+            }
+
+            $findLead     = 'select Id, ConvertedContactId from Lead where email = \''.$lead->getEmail().'\'';
+            $sfRecordLead = $this->getApiHelper()->request('query', ['q' => $findLead], 'GET', false, null, $queryUrl);
+            $existingBody = [];
+            if (!empty($sfRecordLead['records'])) {
+                $sfLeadRecords = array_merge($sfLeadRecords, $sfRecordLead['records']);
+                foreach ($sfRecordLead['records'] as $sfLeadRecord) {
+                    $sfLeadId = $sfLeadRecord['Id'];
+                    $allIds[] = $sfLeadRecord['Id'];
+                    //update the converted contact if found and not the Lead because it will error in SF
+                    if (isset($sfLeadRecord['ConvertedContactId']) && $sfLeadRecord['ConvertedContactId'] != null) {
+                        if (count($sfLeadRecords) <= 1) {
+                            $createLead = true;
+                            continue;
+                        } else {
+                            continue;
+                        }
+                    }
+                    $type                = 'LeadId';
+                    $existingBody[$type] = $sfLeadId;
+                    $all[]               = array_merge($body, $existingBody);
+                }
+            }
+
+            if (!empty($sfLeadRecords)) {
+                $findCampaignMembers         = "Select Id, ContactId, LeadId from CampaignMember where CampaignId = '".$integrationCampaignId."' and ContactId in ('".implode("','", $allIds)."')";
+                $findCampaignLeadMembers     = "Select Id, ContactId, LeadId from CampaignMember where CampaignId = '".$integrationCampaignId."' and LeadId in ('".implode("','", $allIds)."')";
+                $existingCampaignMemberLeads = $this->getApiHelper()->request('query', ['q' => $findCampaignLeadMembers], 'GET', false, null, $queryUrl);
+                $existingCampaignMember      = $this->getApiHelper()->request('query', ['q' => $findCampaignMembers], 'GET', false, null, $queryUrl);
+                $existingFoundRecords        = array_merge($existingCampaignMember['records'], $existingCampaignMemberLeads['records']);
+                if (!empty($existingFoundRecords)) {
+                    foreach ($existingFoundRecords as $campaignMember) {
+                        if (!empty($campaignMember['ContactId'])) {
+                            $contactIds[$campaignMember['Id']] = $campaignMember['ContactId'];
+                        }
+                        if (!empty($campaignMember['LeadId'])) {
+                            $leadIds[$campaignMember['Id']] = $campaignMember['LeadId'];
+                        }
+                    }
+                }
+            } else {
+                $createLead = true;
+            }
+        }
+
+        if ($createLead) {
+            $integration_entity_id = $this->pushLead($lead);
+            $body['LeadId']        = $integration_entity_id;
+            $all[]                 = $body;
+        }
+
+        foreach ($all as $key => $b) {
+            $campaignMappingId = '-'.$integrationCampaignId;
+            if (isset($b['ContactId']) and $memberId = array_search($b['ContactId'], $contactIds)) {
+                $id                  = (!empty($lead->getId()) ? $lead->getId() : '').'-CampaignMember'.$b['ContactId'].(!empty($referenceId && $internalLeadId == $lead->getId()) ? '-'.$referenceId : '').$campaignMappingId;
+                $salesforceIdMapping = [$integrationCampaignId];
+                $patchurl            = $url.'/'.$memberId;
+                unset($b['ContactId']);
+                $mauticData[$id] = [
+                    'method'      => 'PATCH',
+                    'url'         => $patchurl,
+                    'referenceId' => $id,
+                    'body'        => $b,
+                ];
+            } elseif (isset($b['LeadId']) and $memberId = array_search($b['LeadId'], $leadIds)) {
+                $id                  = (!empty($lead->getId()) ? $lead->getId() : '').'-CampaignMember'.$b['LeadId'].(!empty($referenceId && $internalLeadId == $lead->getId()) ? '-'.$referenceId : '').$campaignMappingId;
+                $salesforceIdMapping = [$integrationCampaignId];
+                $patchurl            = $url.'/'.$memberId;
+                unset($b['LeadId']);
+                $mauticData[$id] = [
+                    'method'      => 'PATCH',
+                    'url'         => $patchurl,
+                    'referenceId' => $id,
+                    'body'        => $b,
+                ];
+            } else {
+                $id                  = (!empty($lead->getId()) ? $lead->getId() : '').'-CampaignMemberNew-null'.$campaignMappingId;
+                $salesforceIdMapping = [];
+                $b                   = array_merge($b, ['CampaignId' => $integrationCampaignId]);
+                $mauticData[$id]     = [
+                    'method'      => 'POST',
+                    'url'         => $url,
+                    'referenceId' => $id,
+                    'body'        => $b,
+                ];
+            }
+        }
+        $request['allOrNone']        = 'false';
+        $request['compositeRequest'] = array_values($mauticData);
+        /** @var SalesforceApi $apiHelper */
+        $apiHelper = $this->getApiHelper();
+        if (!empty($request)) {
+            $result = $apiHelper->syncMauticToSalesforce($request);
+        }
 
-        return $newKey;
+        return $this->processCompositeResponse($result['compositeResponse'], $salesforceIdMapping);
     }
 }
diff --git a/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php b/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
index e8e88bf4e7e..bc0fd1a8c95 100644
--- a/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
@@ -32,6 +32,14 @@ public function getName()
         return 'Sugarcrm';
     }
 
+    /**
+     * @return array
+     */
+    public function getSupportedFeatures()
+    {
+        return ['push_lead'];
+    }
+
     /**
      * Get the array key for clientId.
      *
@@ -200,6 +208,8 @@ public function getAvailableLeadFields($settings = [])
                             }
                         }
                     }
+
+                    $this->cache->set('leadFields', $sugarFields);
                 }
             } else {
                 throw new ApiErrorException($this->authorzationError);
@@ -212,8 +222,6 @@ public function getAvailableLeadFields($settings = [])
             }
         }
 
-        $this->cache->set('leadFields', $sugarFields);
-
         return $sugarFields;
     }
 
diff --git a/plugins/MauticCrmBundle/Integration/VtigerIntegration.php b/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
index a092d0c3088..66e39c62b29 100644
--- a/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
@@ -28,6 +28,14 @@ public function getName()
         return 'Vtiger';
     }
 
+    /**
+     * @return array
+     */
+    public function getSupportedFeatures()
+    {
+        return ['push_lead'];
+    }
+
     /**
      * @return string
      */
@@ -190,6 +198,8 @@ public function getAvailableLeadFields($settings = [])
                         'required' => $fieldInfo['mandatory'],
                     ];
                 }
+
+                $this->cache->set('leadFields', $vtigerFields);
             }
         } catch (ErrorException $exception) {
             $this->logIntegrationError($exception);
@@ -201,8 +211,6 @@ public function getAvailableLeadFields($settings = [])
             return false;
         }
 
-        $this->cache->set('leadFields', $vtigerFields);
-
         return $vtigerFields;
     }
 
diff --git a/plugins/MauticCrmBundle/Integration/ZohoIntegration.php b/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
index 84a2d128a22..edb77182f4e 100644
--- a/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
@@ -12,6 +12,7 @@
 namespace MauticPlugin\MauticCrmBundle\Integration;
 
 use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\PluginBundle\Exception\ApiErrorException;
 
 /**
  * Class ZohoIntegration.
@@ -28,6 +29,14 @@ public function getName()
         return 'Zoho';
     }
 
+    /**
+     * @return array
+     */
+    public function getSupportedFeatures()
+    {
+        return ['push_lead'];
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -139,7 +148,11 @@ public function parseCallbackResponse($data, $postAuthorization = false)
     }
 
     /**
-     * @return array
+     * @param array $settings
+     *
+     * @return array|bool
+     *
+     * @throws ApiErrorException
      */
     public function getAvailableLeadFields($settings = [])
     {
@@ -149,6 +162,7 @@ public function getAvailableLeadFields($settings = [])
 
         $zohoFields        = [];
         $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
+
         try {
             if ($this->isAuthorized()) {
                 $leadObject = $this->getApiHelper()->getLeadFields();
@@ -168,8 +182,7 @@ public function getAvailableLeadFields($settings = [])
                             continue;
                         }
 
-                        $key              = InputHelper::alphanum(InputHelper::transliterate($field['dv']));
-                        $zohoFields[$key] = [
+                        $zohoFields[$this->getFieldKey($field['dv'])] = [
                             'type'     => 'string',
                             'label'    => $field['label'],
                             'dv'       => $field['dv'],
@@ -177,19 +190,24 @@ public function getAvailableLeadFields($settings = [])
                         ];
                     }
                 }
+
+                $this->cache->set('leadFields', $zohoFields);
             }
-        } catch (ErrorException $exception) {
+        } catch (ApiErrorException $exception) {
             $this->logIntegrationError($exception);
 
             if (!$silenceExceptions) {
+                if (strpos($exception->getMessage(), 'Invalid Ticket Id') !== false) {
+                    // Use a bit more friendly message
+                    $exception = new ApiErrorException('There was an issue with communicating with Zoho. Please try to reauthorize.');
+                }
+
                 throw $exception;
             }
 
             return false;
         }
 
-        $this->cache->set('leadFields', $zohoFields);
-
         return $zohoFields;
     }
 
@@ -199,16 +217,14 @@ public function getAvailableLeadFields($settings = [])
      * @param $key
      * @param $field
      *
-     * @return mixed
+     * @return array
      */
     public function convertLeadFieldKey($key, $field)
     {
-        return $field['dv'];
+        return [$this->getFieldKey($field['dv']), $field['dv']];
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param $lead
      * @param $config
      *
@@ -228,4 +244,14 @@ public function populateLeadData($lead, $config = [])
 
         return $xmlData;
     }
+
+    /**
+     * @param $dv
+     *
+     * @return string
+     */
+    protected function getFieldKey($dv)
+    {
+        return InputHelper::alphanum(InputHelper::transliterate($dv));
+    }
 }
diff --git a/plugins/MauticCrmBundle/Translations/en_US/messages.ini b/plugins/MauticCrmBundle/Translations/en_US/messages.ini
index f4529904b38..73338f2cde5 100644
--- a/plugins/MauticCrmBundle/Translations/en_US/messages.ini
+++ b/plugins/MauticCrmBundle/Translations/en_US/messages.ini
@@ -29,7 +29,7 @@ mautic.zoho.form.email="Zoho account email"
 mautic.zoho.form.password="Zoho account password"
 mautic.zoho.auth_error="Zoho login failed with response: %cause%"
 mautic.hubspot.form.apikey="Hubspot API Key"
-mautic.salesforce.object.company='Account'
+mautic.salesforce.object.company="Account"
 mautic.hubspot.form.objects_to_pull_from="Choose what Hubspot Objects to pull data from"
 mautic.hubspot.object.company="companies"
-mautic.hubspot.object.contact="contacts"
\ No newline at end of file
+mautic.hubspot.object.contact="contacts"
diff --git a/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php b/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
index cd7cff85009..8e6b64cb972 100644
--- a/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
+++ b/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
@@ -97,7 +97,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add('leadFields', 'integration_fields', [
                 'label'                => 'mautic.integration.leadfield_matches',
                 'required'             => true,
-                'lead_fields'          => $leadFields,
+                'mautic_fields'        => $leadFields,
                 'data'                 => isset($options['data']['leadFields']) ? $options['data']['leadFields'] : [],
                 'integration_fields'   => $fields,
                 'special_instructions' => $specialInstructions,
diff --git a/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php b/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
index 3d32dfe3334..8f2df8cf016 100644
--- a/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
+++ b/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
@@ -105,42 +105,41 @@ public function authCallback($settings = [], $parameters = [])
      */
     public function getAvailableLeadFields($settings = [])
     {
-        if ($fields = parent::getAvailableLeadFields($settings)) {
-            return $fields;
+        if (isset($settings['list'])) {
+            // Ajax update
+            $listId = $settings['list'];
+        } elseif (!empty($settings['feature_settings']['list_settings']['list'])) {
+            // Form load
+            $listId = $settings['feature_settings']['list_settings']['list'];
+        } elseif (!empty($settings['list_settings']['list'])) {
+            // Push action
+            $listId = $settings['list_settings']['list'];
         }
 
-        static $leadFields = [];
-
-        if (empty($leadFields)) {
-            if (isset($settings['list'])) {
-                // Ajax update
-                $listId = $settings['list'];
-            } elseif (!empty($settings['feature_settings']['list_settings']['list'])) {
-                // Form load
-                $listId = $settings['feature_settings']['list_settings']['list'];
-            } elseif (!empty($settings['list_settings']['list'])) {
-                // Push action
-                $listId = $settings['list_settings']['list'];
+        if (!empty($listId)) {
+            $settings['cache_suffix'] = $cacheSuffix = '.'.$listId;
+            if ($fields = parent::getAvailableLeadFields($settings)) {
+                return $fields;
             }
 
-            if (!empty($listId)) {
-                $fields = $this->getApiHelper()->getCustomFields($listId);
-
-                if (!empty($fields['data'][0]['merge_vars']) && count($fields['data'][0]['merge_vars'])) {
-                    foreach ($fields['data'][0]['merge_vars'] as $field) {
-                        $leadFields[$field['tag']] = [
-                            'label'    => $field['name'],
-                            'type'     => 'string',
-                            'required' => $field['req'],
-                        ];
-                    }
+            $fields = $this->getApiHelper()->getCustomFields($listId);
+
+            if (!empty($fields['data'][0]['merge_vars']) && count($fields['data'][0]['merge_vars'])) {
+                foreach ($fields['data'][0]['merge_vars'] as $field) {
+                    $leadFields[$field['tag']] = [
+                        'label'    => $field['name'],
+                        'type'     => 'string',
+                        'required' => $field['req'],
+                    ];
                 }
             }
-        }
 
-        $this->cache->set('leadFields', $leadFields);
+            $this->cache->set('leadFields'.$cacheSuffix, $leadFields);
+
+            return $leadFields;
+        }
 
-        return $leadFields;
+        return [];
     }
 
     /**
@@ -183,4 +182,15 @@ public function pushLead($lead, $config = [])
 
         return false;
     }
+
+    /**
+     * @return array
+     */
+    public function getFormSettings()
+    {
+        $settings                           = parent::getFormSettings();
+        $settings['dynamic_contact_fields'] = true;
+
+        return $settings;
+    }
 }
diff --git a/plugins/MauticSocialBundle/Assets/js/social.js b/plugins/MauticSocialBundle/Assets/js/social.js
index 025f0659dd2..8ff3e18050f 100644
--- a/plugins/MauticSocialBundle/Assets/js/social.js
+++ b/plugins/MauticSocialBundle/Assets/js/social.js
@@ -75,9 +75,9 @@ Mautic.composeSocialWatcher = function() {
 Mautic.getCharacterCount = function() {
     var tweetLenght = 140;
 
-    var length = mQuery('#compose-tweet textarea');
+    var currentLength = mQuery('textarea#twitter_tweet_text');
 
-    return (tweetLenght - length.val().length);
+    return (tweetLenght - currentLength.val().length);
 };
 
 /*
diff --git a/plugins/MauticSocialBundle/Config/config.php b/plugins/MauticSocialBundle/Config/config.php
index 4dfe549cb6f..1f6b57719d6 100644
--- a/plugins/MauticSocialBundle/Config/config.php
+++ b/plugins/MauticSocialBundle/Config/config.php
@@ -29,6 +29,22 @@
                 'path'       => '/monitoring/view/{objectId}/contacts/{page}',
                 'controller' => 'MauticSocialBundle:Monitoring:contacts',
             ],
+            'mautic_tweet_index' => [
+                'path'       => '/tweets/{page}',
+                'controller' => 'MauticSocialBundle:Tweet:index',
+            ],
+            'mautic_tweet_action' => [
+                'path'       => '/tweets/{objectAction}/{objectId}',
+                'controller' => 'MauticSocialBundle:Tweet:execute',
+            ],
+        ],
+        'api' => [
+            'mautic_api_tweetsstandard' => [
+                'standard_entity' => true,
+                'name'            => 'tweets',
+                'path'            => '/tweets',
+                'controller'      => 'MauticSocialBundle:Api\TweetApi',
+            ],
         ],
     ],
 
@@ -53,6 +69,12 @@
                     'mautic.helper.integration',
                 ],
             ],
+            'mautic.social.stats.subscriber' => [
+                'class'     => \MauticPlugin\MauticSocialBundle\EventListener\StatsSubscriber::class,
+                'arguments' => [
+                    'doctrine.orm.entity_manager',
+                ],
+            ],
         ],
         'forms' => [
             'mautic.form.type.social.sociallogin' => [
@@ -81,8 +103,11 @@
                 'alias' => 'socialmedia_linkedin',
             ],
             'mautic.social.form.type.twitter.tweet' => [
-                'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetType',
-                'alias' => 'twitter_tweet',
+                'class'     => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetType',
+                'alias'     => 'twitter_tweet',
+                'arguments' => [
+                    'doctrine.orm.entity_manager',
+                ],
             ],
             'mautic.social.form.type.monitoring' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\MonitoringType',
@@ -109,6 +134,15 @@
                 'alias'     => 'social_config',
                 'arguments' => 'mautic.lead.model.field',
             ],
+            'mautic.social.tweet.list' => [
+                'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetListType',
+                'alias' => 'tweet_list',
+            ],
+            'mautic.social.tweetsend_list' => [
+                'class'     => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetSendType',
+                'arguments' => 'router',
+                'alias'     => 'tweetsend_list',
+            ],
         ],
         'models' => [
             'mautic.social.model.monitoring' => [
@@ -117,6 +151,9 @@
             'mautic.social.model.postcount' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Model\PostCountModel',
             ],
+            'mautic.social.model.tweet' => [
+                'class' => 'MauticPlugin\MauticSocialBundle\Model\TweetModel',
+            ],
         ],
         'others' => [
             'mautic.social.helper.campaign' => [
@@ -126,6 +163,7 @@
                     'mautic.page.model.trackable',
                     'mautic.page.helper.token',
                     'mautic.asset.helper.token',
+                    'mautic.social.model.tweet',
                 ],
             ],
         ],
@@ -138,6 +176,19 @@
                 'access'   => 'plugin:mauticSocial:monitoring:view',
                 'priority' => 0,
             ],
+            'mautic.social.tweets' => [
+                'route'    => 'mautic_tweet_index',
+                'access'   => ['plugin:mauticSocial:tweets:viewown', 'plugin:mauticSocial:tweets:viewother'],
+                'parent'   => 'mautic.core.channels',
+                'priority' => 80,
+                'checks'   => [
+                    'integration' => [
+                        'Twitter' => [
+                            'enabled' => true,
+                        ],
+                    ],
+                ],
+            ],
         ],
     ],
 
diff --git a/plugins/MauticSocialBundle/Controller/AjaxController.php b/plugins/MauticSocialBundle/Controller/AjaxController.php
index c7fb19ecf54..8359454e31b 100644
--- a/plugins/MauticSocialBundle/Controller/AjaxController.php
+++ b/plugins/MauticSocialBundle/Controller/AjaxController.php
@@ -12,6 +12,7 @@
 namespace MauticPlugin\MauticSocialBundle\Controller;
 
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
+use Mautic\CoreBundle\Controller\AjaxLookupControllerTrait;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -20,6 +21,8 @@
  */
 class AjaxController extends CommonAjaxController
 {
+    use AjaxLookupControllerTrait;
+
     /**
      * @param Request $request
      *
diff --git a/plugins/MauticSocialBundle/Controller/Api/TweetApiController.php b/plugins/MauticSocialBundle/Controller/Api/TweetApiController.php
new file mode 100644
index 00000000000..0e4b5709a49
--- /dev/null
+++ b/plugins/MauticSocialBundle/Controller/Api/TweetApiController.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Controller\Api;
+
+use Mautic\ApiBundle\Controller\CommonApiController;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+
+/**
+ * Class TweetApiController.
+ */
+class TweetApiController extends CommonApiController
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(FilterControllerEvent $event)
+    {
+        $this->model           = $this->getModel('social.tweet');
+        $this->entityClass     = 'MauticPlugin\MauticSocialBundle\Entity\Tweet';
+        $this->entityNameOne   = 'tweet';
+        $this->entityNameMulti = 'tweets';
+
+        parent::initialize($event);
+    }
+}
diff --git a/plugins/MauticSocialBundle/Controller/TweetController.php b/plugins/MauticSocialBundle/Controller/TweetController.php
new file mode 100644
index 00000000000..16f17157e68
--- /dev/null
+++ b/plugins/MauticSocialBundle/Controller/TweetController.php
@@ -0,0 +1,220 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Controller;
+
+use Mautic\CoreBundle\Controller\FormController;
+use Symfony\Component\Form\Form;
+
+/**
+ * Class TweetController.
+ */
+class TweetController extends FormController
+{
+    /**
+     * @return mixed
+     */
+    protected function getModelName()
+    {
+        return 'social.tweet';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getJsLoadMethodPrefix()
+    {
+        return 'socialTweet';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getRouteBase()
+    {
+        return 'mautic_tweet';
+    }
+
+    /**
+     * @param null $objectId
+     *
+     * @return mixed
+     */
+    protected function getSessionBase($objectId = null)
+    {
+        return 'mautic_tweet';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getTemplateBase()
+    {
+        return 'MauticSocialBundle:Tweet';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getControllerBase()
+    {
+        return 'MauticSocialBundle:Tweet';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getTranslationBase()
+    {
+        return 'mautic.integration.Twitter';
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getPermissionBase()
+    {
+        return 'plugin:mauticSocial:tweets';
+    }
+
+    /**
+     * Define options to pass to the form when it's being created.
+     *
+     * @return array
+     */
+    protected function getEntityFormOptions()
+    {
+        return [
+            'update_select'      => $this->getUpdateSelect(),
+            'allow_extra_fields' => true,
+        ];
+    }
+
+    /**
+     * Get updateSelect value from request.
+     *
+     * @return string|bool
+     */
+    public function getUpdateSelect()
+    {
+        return ($this->request->getMethod() == 'POST')
+            ? $this->request->request->get('twitter_tweet[updateSelect]', false, true)
+            : $this->request->get('updateSelect', false);
+    }
+
+    /**
+     * Set custom form themes, etc.
+     *
+     * @param Form   $form
+     * @param string $action
+     *
+     * @return \Symfony\Component\Form\FormView
+     */
+    protected function getFormView(Form $form, $action)
+    {
+        return $this->setFormTheme($form, 'MauticSocialBundle:Tweet:form.html.php', ['MauticSocialBundle:FormTheme']);
+    }
+
+    /**
+     * @param int $page
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function indexAction($page = 1)
+    {
+        return parent::indexStandard($page);
+    }
+
+    /**
+     * Generates new form and processes post data.
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|Response
+     */
+    public function newAction()
+    {
+        return parent::newStandard();
+    }
+
+    /**
+     * Get the template file.
+     *
+     * @param $file
+     *
+     * @return string
+     */
+    protected function getTemplateName($file)
+    {
+        if ($file === 'form.html.php' && $this->request->get('modal') == 1) {
+            return parent::getTemplateName('form.modal.html.php');
+        }
+
+        return parent::getTemplateName($file);
+    }
+
+    /**
+     * Generates edit form and processes post data.
+     *
+     * @param int  $objectId
+     * @param bool $ignorePost
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|Response
+     */
+    public function editAction($objectId, $ignorePost = false)
+    {
+        return parent::editStandard($objectId, $ignorePost);
+    }
+
+    /**
+     * Displays details.
+     *
+     * @param $objectId
+     *
+     * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function viewAction($objectId)
+    {
+        return parent::indexStandard(1);
+    }
+
+    /**
+     * Clone an entity.
+     *
+     * @param int $objectId
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     */
+    public function cloneAction($objectId)
+    {
+        return parent::cloneStandard($objectId);
+    }
+
+    /**
+     * Deletes the entity.
+     *
+     * @param int $objectId
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function deleteAction($objectId)
+    {
+        return parent::deleteStandard($objectId);
+    }
+
+    /**
+     * Deletes a group of entities.
+     *
+     * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function batchDeleteAction()
+    {
+        return parent::batchDeleteStandard();
+    }
+}
diff --git a/plugins/MauticSocialBundle/Entity/PostCountRepository.php b/plugins/MauticSocialBundle/Entity/PostCountRepository.php
index 237ed84ac89..581e97fb315 100644
--- a/plugins/MauticSocialBundle/Entity/PostCountRepository.php
+++ b/plugins/MauticSocialBundle/Entity/PostCountRepository.php
@@ -46,19 +46,13 @@ public function getLeadStatsPost($dateFrom, $dateTo, $options)
         $chartQuery = new ChartQuery($this->getEntityManager()->getConnection(), $dateFrom, $dateTo);
 
         // Load points for selected period
-        $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->select('cl.post_count, cl.post_date')
-            ->from(MAUTIC_TABLE_PREFIX.'monitor_post_count', 'cl')
-            ->orderBy('cl.post_date', 'ASC');
-
+        $q = $chartQuery->prepareTimeDataQuery(MAUTIC_TABLE_PREFIX.'monitor_post_count', 'post_date', $options);
         if (isset($options['monitor_id'])) {
-            $q->andwhere($q->expr()->eq('cl.monitor_id', (int) $options['monitor_id']));
+            $q->andwhere($q->expr()->eq('t.monitor_id', (int) $options['monitor_id']));
         }
 
-        $chartQuery->applyDateFilters($q, 'post_date', 'cl');
-
-        $postCount = $q->execute()->fetchAll();
+        $data = $chartQuery->loadAndBuildTimeData($q);
 
-        return $postCount;
+        return $data;
     }
 }
diff --git a/plugins/MauticSocialBundle/Entity/Tweet.php b/plugins/MauticSocialBundle/Entity/Tweet.php
new file mode 100644
index 00000000000..9c066ba2cda
--- /dev/null
+++ b/plugins/MauticSocialBundle/Entity/Tweet.php
@@ -0,0 +1,514 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
+use Mautic\AssetBundle\Entity\Asset;
+use Mautic\CategoryBundle\Entity\Category;
+use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+use Mautic\CoreBundle\Entity\FormEntity;
+use Mautic\PageBundle\Entity\Page;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="tweets")
+ * @ORM\Entity(repositoryClass="MauticPlugin\MauticSocialBundle\Entity\TweetRepository")
+ */
+class Tweet extends FormEntity
+{
+    /**
+     * Internal Mautic ID of the tweet.
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * ID of the Twitter media object attached to the tweet.
+     *
+     * @var string
+     */
+    private $mediaId;
+
+    /**
+     * Path to the local media file.
+     *
+     * @var string
+     */
+    private $mediaPath;
+
+    /**
+     * Internal Mautic name of the tweet.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * The actual messge of the tweet.
+     *
+     * @var string
+     */
+    private $text;
+
+    /**
+     * Internal Mautic description.
+     *
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @var string
+     */
+    private $language = 'en';
+
+    /**
+     * @var int
+     */
+    private $sentCount = 0;
+
+    /**
+     * @var int
+     */
+    private $favoriteCount = 0;
+
+    /**
+     * @var int
+     */
+    private $retweetCount = 0;
+
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * @var Asset
+     */
+    private $asset;
+
+    /**
+     * @var Category
+     **/
+    private $category;
+
+    /**
+     * @var ArrayCollection
+     */
+    private $stats;
+
+    /**
+     * Tweet constructor.
+     */
+    public function __construct()
+    {
+        $this->stats = new ArrayCollection();
+    }
+
+    public function __clone()
+    {
+        $this->id            = null;
+        $this->tweetId       = null;
+        $this->sentCount     = 0;
+        $this->favoriteCount = 0;
+        $this->retweetCount  = 0;
+        $this->stats         = new ArrayCollection();
+
+        parent::__clone();
+    }
+
+    /**
+     * @param ORM\ClassMetadata $metadata
+     */
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
+    {
+        $builder = new ClassMetadataBuilder($metadata);
+
+        $builder->setTable('tweets')
+            ->setCustomRepositoryClass('MauticPlugin\MauticSocialBundle\Entity\TweetRepository')
+            ->addIndex(['text'], 'tweet_text_index')
+            ->addIndex(['sent_count'], 'sent_count_index')
+            ->addIndex(['favorite_count'], 'favorite_count_index')
+            ->addIndex(['retweet_count'], 'retweet_count_index');
+
+        $builder->addIdColumns();
+        $builder->addCategory();
+
+        $builder->createField('mediaId', 'string')
+            ->columnName('media_id')
+            ->nullable()
+            ->build();
+
+        $builder->createField('mediaPath', 'string')
+            ->columnName('media_path')
+            ->nullable()
+            ->build();
+
+        $builder->createField('text', 'string')
+            ->build();
+
+        $builder->createField('sentCount', 'integer')
+            ->columnName('sent_count')
+            ->nullable()
+            ->build();
+
+        $builder->createField('favoriteCount', 'integer')
+            ->columnName('favorite_count')
+            ->nullable()
+            ->build();
+
+        $builder->createField('retweetCount', 'integer')
+            ->columnName('retweet_count')
+            ->nullable()
+            ->build();
+
+        $builder->createField('language', 'string')
+            ->columnName('lang')
+            ->nullable()
+            ->build();
+
+        $builder->createManyToOne('page', Page::class)
+            ->addJoinColumn('page_id', 'id', true, false, 'SET NULL')
+            ->build();
+
+        $builder->createManyToOne('asset', Asset::class)
+            ->addJoinColumn('asset_id', 'id', true, false, 'SET NULL')
+            ->build();
+
+        $builder->createOneToMany('stats', 'TweetStat')
+            ->setIndexBy('id')
+            ->mappedBy('tweet')
+            ->cascadePersist()
+            ->fetchExtraLazy()
+            ->build();
+    }
+
+    /**
+     * Prepares the metadata for API usage.
+     *
+     * @param $metadata
+     */
+    public static function loadApiMetadata(ApiMetadataDriver $metadata)
+    {
+        $metadata->setGroupPrefix('tweet')
+            ->addListProperties(
+                [
+                    'id',
+                    'name',
+                    'text',
+                    'language',
+                    'category',
+                ]
+            )
+            ->addProperties(
+                [
+                    'mediaId',
+                    'mediaPath',
+                    'sentCount',
+                    'favoriteCount',
+                    'retweetCount',
+                    'description',
+                ]
+            )
+            ->build();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return $this
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param int $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @param int $description
+     *
+     * @return $this
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMediaId()
+    {
+        return $this->mediaId;
+    }
+
+    /**
+     * @param string $mediaId
+     *
+     * @return $this
+     */
+    public function setMediaId($mediaId)
+    {
+        $this->isChanged('mediaId', $mediaId);
+        $this->mediaId = $mediaId;
+
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMediaPath()
+    {
+        return $this->mediaPath;
+    }
+
+    /**
+     * @param string $mediaPath
+     *
+     * @return $this
+     */
+    public function setMediaPath($mediaPath)
+    {
+        $this->isChanged('mediaPath', $mediaPath);
+        $this->mediaPath = $mediaPath;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     *
+     * @return $this
+     */
+    public function setText($text)
+    {
+        $this->isChanged('text', $text);
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getSentCount()
+    {
+        return $this->sentCount;
+    }
+
+    /**
+     * @param DateTime $dateTweeted
+     *
+     * @return $this
+     */
+    public function setSentCount($sentCount)
+    {
+        $this->isChanged('sentCount', $sentCount);
+        $this->sentCount = $sentCount;
+
+        return $this;
+    }
+
+    /**
+     * Add 1 to sentCount.
+     *
+     * @return $this
+     */
+    public function sentCountUp()
+    {
+        $this->setSentCount($this->getSentCount() + 1);
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFavoriteCount()
+    {
+        return $this->favoriteCount;
+    }
+
+    /**
+     * @param int $favoriteCount
+     *
+     * @return $this
+     */
+    public function setFavoriteCount($favoriteCount)
+    {
+        $this->isChanged('favoriteCount', $favoriteCount);
+        $this->favoriteCount = $favoriteCount;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRetweetCount()
+    {
+        return $this->retweetCount;
+    }
+
+    /**
+     * @param int $retweetCount
+     *
+     * @return $this
+     */
+    public function setRetweetCount($retweetCount)
+    {
+        $this->isChanged('retweetCount', $retweetCount);
+        $this->retweetCount = $retweetCount;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLanguage()
+    {
+        return $this->language;
+    }
+
+    /**
+     * @param string $language
+     *
+     * @return $this
+     */
+    public function setLanguage($language)
+    {
+        $this->isChanged('language', $language);
+        $this->language = $language;
+
+        return $this;
+    }
+
+    /**
+     * @return Asset|null
+     */
+    public function getAsset()
+    {
+        return $this->asset;
+    }
+
+    /**
+     * @param Asset $asset
+     *
+     * @return $this
+     */
+    public function setAsset(Asset $asset)
+    {
+        $this->asset = $asset;
+
+        return $this;
+    }
+
+    /**
+     * @return Page|null
+     */
+    public function getPage()
+    {
+        return $this->page;
+    }
+
+    /**
+     * @param Page $page
+     *
+     * @return $this
+     */
+    public function setPage(Page $page)
+    {
+        $this->page = $page;
+
+        return $this;
+    }
+
+    /**
+     * @return Category|null
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $page
+     *
+     * @return $this
+     */
+    public function setCategory(Category $category)
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStats()
+    {
+        return $this->stats;
+    }
+}
diff --git a/plugins/MauticSocialBundle/Entity/TweetRepository.php b/plugins/MauticSocialBundle/Entity/TweetRepository.php
new file mode 100644
index 00000000000..1bf7e9fc898
--- /dev/null
+++ b/plugins/MauticSocialBundle/Entity/TweetRepository.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Entity;
+
+use Mautic\CoreBundle\Entity\CommonRepository;
+
+class TweetRepository extends CommonRepository
+{
+    /**
+     * @param string $search
+     * @param int    $limit
+     * @param int    $start
+     * @param bool   $viewOther
+     * @param array  $ignoreIds
+     *
+     * @return array
+     */
+    public function getTweetList($search = '', $limit = 10, $start = 0, $viewOther = false, array $ignoreIds = [])
+    {
+        $qb = $this->createQueryBuilder('t');
+        $qb->select('partial t.{id, text, name, language}');
+
+        if (!empty($search)) {
+            if (is_array($search)) {
+                $search = array_map('intval', $search);
+                $qb->andWhere($qb->expr()->in('t.id', ':search'))
+                    ->setParameter('search', $search);
+            } else {
+                $qb->andWhere($qb->expr()->like('t.name', ':search'))
+                    ->setParameter('search', "%{$search}%");
+            }
+        }
+
+        if (!$viewOther) {
+            $qb->andWhere($qb->expr()->eq('t.createdBy', ':id'))
+                ->setParameter('id', $this->currentUser->getId());
+        }
+
+        if (!empty($ignoreIds)) {
+            $qb->andWhere($qb->expr()->notIn('t.id', ':ignoreIds'))
+                ->setParameter('ignoreIds', $ignoreIds);
+        }
+
+        $qb->orderBy('t.name');
+
+        if (!empty($limit)) {
+            $qb->setFirstResult($start)
+                ->setMaxResults($limit);
+        }
+
+        return $qb->getQuery()->getArrayResult();
+    }
+}
diff --git a/plugins/MauticSocialBundle/Entity/TweetStat.php b/plugins/MauticSocialBundle/Entity/TweetStat.php
new file mode 100644
index 00000000000..028ece06e0c
--- /dev/null
+++ b/plugins/MauticSocialBundle/Entity/TweetStat.php
@@ -0,0 +1,414 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
+use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+use Mautic\LeadBundle\Entity\Lead as TheLead;
+
+/**
+ * Class TweetStat.
+ */
+class TweetStat
+{
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * ID of the tweet from Twitter.
+     *
+     * @var string
+     */
+    private $twitterTweetId;
+
+    /**
+     * @var Tweet
+     */
+    private $tweet;
+
+    /**
+     * @var TheLead
+     */
+    private $lead;
+
+    /**
+     * @var string
+     */
+    private $handle;
+
+    /**
+     * @var DateTime
+     */
+    private $dateSent;
+
+    /**
+     * @var bool
+     */
+    private $isFailed = false;
+
+    /**
+     * @var int
+     */
+    private $retryCount = 0;
+
+    /**
+     * @var string
+     */
+    private $source;
+
+    /**
+     * @var int
+     */
+    private $sourceId;
+
+    /**
+     * @var int
+     */
+    private $favoriteCount = 0;
+
+    /**
+     * @var int
+     */
+    private $retweetCount = 0;
+
+    /**
+     * @var array
+     */
+    private $responseDetails = [];
+
+    /**
+     * @param ORM\ClassMetadata $metadata
+     */
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
+    {
+        $builder = new ClassMetadataBuilder($metadata);
+
+        $builder->setTable('tweet_stats')
+            ->setCustomRepositoryClass(TweetStatRepository::class)
+            ->addIndex(['tweet_id', 'lead_id'], 'stat_tweet_search')
+            ->addIndex(['lead_id', 'tweet_id'], 'stat_tweet_search2')
+            ->addIndex(['is_failed'], 'stat_tweet_failed_search')
+            ->addIndex(['source', 'source_id'], 'stat_tweet_source_search')
+            ->addIndex(['favorite_count'], 'favorite_count_index')
+            ->addIndex(['retweet_count'], 'retweet_count_index')
+            ->addIndex(['date_sent'], 'tweet_date_sent')
+            ->addIndex(['twitter_tweet_id'], 'twitter_tweet_id_index');
+
+        $builder->addId();
+
+        $builder->createManyToOne('tweet', 'Tweet')
+            ->inversedBy('stats')
+            ->addJoinColumn('tweet_id', 'id', true, false, 'SET NULL')
+            ->build();
+
+        $builder->createField('twitterTweetId', 'string')
+            ->columnName('twitter_tweet_id')
+            ->nullable()
+            ->build();
+
+        $builder->addLead(true, 'SET NULL');
+
+        $builder->createField('handle', 'string')
+            ->build();
+
+        $builder->createField('dateSent', 'datetime')
+            ->columnName('date_sent')
+            ->nullable()
+            ->build();
+
+        $builder->createField('isFailed', 'boolean')
+            ->columnName('is_failed')
+            ->nullable()
+            ->build();
+
+        $builder->createField('retryCount', 'integer')
+            ->columnName('retry_count')
+            ->nullable()
+            ->build();
+
+        $builder->createField('source', 'string')
+            ->nullable()
+            ->build();
+
+        $builder->createField('sourceId', 'integer')
+            ->columnName('source_id')
+            ->nullable()
+            ->build();
+
+        $builder->addNullableField('favoriteCount', 'integer', 'favorite_count');
+        $builder->addNullableField('retweetCount', 'integer', 'retweet_count');
+        $builder->addNullableField('responseDetails', 'json_array', 'response_details');
+    }
+
+    /**
+     * Prepares the metadata for API usage.
+     *
+     * @param $metadata
+     */
+    public static function loadApiMetadata(ApiMetadataDriver $metadata)
+    {
+        $metadata->setGroupPrefix('stat')
+            ->addProperties(
+                [
+                    'id',
+                    'tweetId',
+                    'handle',
+                    'dateSent',
+                    'isFailed',
+                    'retryCount',
+                    'favoriteCount',
+                    'retweetCount',
+                    'source',
+                    'sourceId',
+                    'lead',
+                    'tweet',
+                    'responseDetails',
+                ]
+            )
+            ->build();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getTwitterTweetId()
+    {
+        return $this->twitterTweetId;
+    }
+
+    /**
+     * @param string $twitterTweetId
+     *
+     * @return $this
+     */
+    public function setTwitterTweetId($twitterTweetId)
+    {
+        $this->twitterTweetId = $twitterTweetId;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDateSent()
+    {
+        return $this->dateSent;
+    }
+
+    /**
+     * @param mixed $dateSent
+     */
+    public function setDateSent($dateSent)
+    {
+        $this->dateSent = $dateSent;
+    }
+
+    /**
+     * @return Tweet
+     */
+    public function getTweet()
+    {
+        return $this->tweet;
+    }
+
+    /**
+     * @param mixed $tweet
+     */
+    public function setTweet(Tweet $tweet = null)
+    {
+        $this->tweet = $tweet;
+    }
+
+    /**
+     * @return TheLead
+     */
+    public function getLead()
+    {
+        return $this->lead;
+    }
+
+    /**
+     * @param mixed $lead
+     */
+    public function setLead(TheLead $lead = null)
+    {
+        $this->lead = $lead;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRetryCount()
+    {
+        return $this->retryCount;
+    }
+
+    /**
+     * @param mixed $retryCount
+     */
+    public function setRetryCount($retryCount)
+    {
+        $this->retryCount = $retryCount;
+    }
+
+    /**
+     * @param mixed $retryCount
+     */
+    public function retryCountUp()
+    {
+        $this->setRetryCount($this->getRetryCount() + 1);
+    }
+
+    /**
+     * @return int
+     */
+    public function getFavoriteCount()
+    {
+        return $this->favoriteCount;
+    }
+
+    /**
+     * @param int $favoriteCount
+     *
+     * @return $this
+     */
+    public function setFavoriteCount($favoriteCount)
+    {
+        $this->favoriteCount = $favoriteCount;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRetweetCount()
+    {
+        return $this->retweetCount;
+    }
+
+    /**
+     * @param int $retweetCount
+     *
+     * @return $this
+     */
+    public function setRetweetCount($retweetCount)
+    {
+        $this->retweetCount = $retweetCount;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getIsFailed()
+    {
+        return $this->isFailed;
+    }
+
+    /**
+     * @param mixed $isFailed
+     */
+    public function setIsFailed($isFailed)
+    {
+        $this->isFailed = $isFailed;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function isFailed()
+    {
+        return $this->getIsFailed();
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getHandle()
+    {
+        return $this->handle;
+    }
+
+    /**
+     * @param mixed $handle
+     */
+    public function setHandle($handle)
+    {
+        $this->handle = $handle;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    /**
+     * @param mixed $source
+     */
+    public function setSource($source)
+    {
+        $this->source = $source;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSourceId()
+    {
+        return $this->sourceId;
+    }
+
+    /**
+     * @param mixed $sourceId
+     */
+    public function setSourceId($sourceId)
+    {
+        $this->sourceId = (int) $sourceId;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getResponseDetails()
+    {
+        return $this->responseDetails;
+    }
+
+    /**
+     * @param mixed $responseDetails
+     *
+     * @return Stat
+     */
+    public function setResponseDetails($responseDetails)
+    {
+        $this->responseDetails = $responseDetails;
+
+        return $this;
+    }
+}
diff --git a/plugins/MauticSocialBundle/Entity/TweetStatRepository.php b/plugins/MauticSocialBundle/Entity/TweetStatRepository.php
new file mode 100644
index 00000000000..5716e2e68a8
--- /dev/null
+++ b/plugins/MauticSocialBundle/Entity/TweetStatRepository.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Entity;
+
+use Mautic\CoreBundle\Entity\CommonRepository;
+
+class TweetStatRepository extends CommonRepository
+{
+}
diff --git a/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php b/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
index 5e339ef983f..02b14fd4438 100644
--- a/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
+++ b/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
@@ -56,12 +56,13 @@ public static function getSubscribedEvents()
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
         $action = [
-            'label'       => 'mautic.social.twitter.tweet.event.open',
-            'description' => 'mautic.social.twitter.tweet.event.open_desc',
-            'eventName'   => SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION,
-            'formType'    => 'twitter_tweet',
-            'formTheme'   => 'MauticSocialBundle:FormTheme',
-            'channel'     => 'social.tweet',
+            'label'           => 'mautic.social.twitter.tweet.event.open',
+            'description'     => 'mautic.social.twitter.tweet.event.open_desc',
+            'eventName'       => SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION,
+            'formTypeOptions' => ['update_select' => 'campaignevent_properties_channelId'],
+            'formType'        => 'tweetsend_list',
+            'channel'         => 'social.tweet',
+            'channelIdField'  => 'channelId',
         ];
 
         $event->addAction('twitter.tweet', $action);
diff --git a/plugins/MauticSocialBundle/EventListener/ChannelSubscriber.php b/plugins/MauticSocialBundle/EventListener/ChannelSubscriber.php
index 83b917d4dc3..bed56e5c32d 100644
--- a/plugins/MauticSocialBundle/EventListener/ChannelSubscriber.php
+++ b/plugins/MauticSocialBundle/EventListener/ChannelSubscriber.php
@@ -64,9 +64,8 @@ public function onAddChannel(ChannelEvent $event)
                             'asset.download',
                             'form.submit',
                         ],
-                        'propertiesFormType' => 'twitter_tweet',
-                        'channelTemplate'    => 'MauticSocialBundle:SubscribedEvents\Channel:message.html.php',
-                        'formTheme'          => 'MauticSocialBundle:FormTheme',
+                        'lookupFormType' => 'tweet_list',
+                        'repository'     => 'MauticSocialBundle:Tweet',
                     ],
                 ]
             );
diff --git a/plugins/MauticSocialBundle/EventListener/StatsSubscriber.php b/plugins/MauticSocialBundle/EventListener/StatsSubscriber.php
new file mode 100644
index 00000000000..5d456961d9c
--- /dev/null
+++ b/plugins/MauticSocialBundle/EventListener/StatsSubscriber.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\EventListener;
+
+use Doctrine\ORM\EntityManager;
+use Mautic\CoreBundle\EventListener\StatsSubscriber as CommonStatsSubscriber;
+
+/**
+ * Class StatsSubscriber.
+ */
+class StatsSubscriber extends CommonStatsSubscriber
+{
+    /**
+     * StatsSubscriber constructor.
+     *
+     * @param EntityManager $em
+     */
+    public function __construct(EntityManager $em)
+    {
+        $repo                      = $em->getRepository('MauticSocialBundle:TweetStat');
+        $this->repositories[]      = $repo;
+        $table                     = $repo->getTableName();
+        $this->permissions[$table] = [
+            'tweet' => 'plugin:mauticSocial:tweets',
+        ];
+    }
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TweetListType.php b/plugins/MauticSocialBundle/Form/Type/TweetListType.php
new file mode 100644
index 00000000000..53d6d615878
--- /dev/null
+++ b/plugins/MauticSocialBundle/Form/Type/TweetListType.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Form\Type;
+
+use Mautic\CoreBundle\Form\Type\EntityLookupType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class TweetListType.
+ */
+class TweetListType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'modal_route'         => 'mautic_tweet_action',
+                'modal_header'        => 'mautic.integration.Twitter.new.tweet',
+                'model'               => 'social.tweet',
+                'model_lookup_method' => 'getLookupResults',
+                'lookup_arguments'    => function (Options $options) {
+                    return [
+                        'type'   => 'tweet',
+                        'filter' => '$data',
+                        'limit'  => 0,
+                        'start'  => 0,
+                    ];
+                },
+                'ajax_lookup_action' => function (Options $options) {
+                    return 'plugin:mauticSocial:getLookupChoiceList';
+                },
+                'multiple' => true,
+                'required' => false,
+            ]
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'tweet_list';
+    }
+
+    /**
+     * @return string
+     */
+    public function getParent()
+    {
+        return EntityLookupType::class;
+    }
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TweetSendType.php b/plugins/MauticSocialBundle/Form/Type/TweetSendType.php
new file mode 100644
index 00000000000..f2f094ad8b5
--- /dev/null
+++ b/plugins/MauticSocialBundle/Form/Type/TweetSendType.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
+
+/**
+ * Class TweetSendType.
+ */
+class TweetSendType extends AbstractType
+{
+    /**
+     * @var RouterInterface
+     */
+    protected $router;
+
+    /**
+     * @param RouterInterface $router
+     */
+    public function __construct(RouterInterface $router)
+    {
+        $this->router = $router;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'channelId',
+            'tweet_list',
+            [
+                'label'      => 'mautic.integration.Twitter.send.selecttweet',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'    => 'form-control',
+                    'tooltip'  => 'mautic.integration.Twitter.send.selecttweet.desc',
+                    'onchange' => 'Mautic.disabledTweetAction()',
+                ],
+                'multiple'    => false,
+                'required'    => true,
+                'constraints' => [
+                    new NotBlank(
+                        ['message' => 'mautic.integration.Twitter.send.selecttweet.notblank']
+                    ),
+                ],
+            ]
+        );
+
+        if (!empty($options['update_select'])) {
+            $windowUrl = $this->router->generate(
+                'mautic_tweet_action',
+                [
+                    'objectAction' => 'new',
+                    'contentOnly'  => 1,
+                    'updateSelect' => $options['update_select'],
+                ]
+            );
+
+            $builder->add(
+                'newTweetButton',
+                'button',
+                [
+                    'attr' => [
+                        'class'   => 'btn btn-primary btn-nospin',
+                        'onclick' => 'Mautic.loadNewWindow({
+                        "windowUrl": "'.$windowUrl.'"
+                    })',
+                        'icon' => 'fa fa-plus',
+                    ],
+                    'label' => 'mautic.integration.Twitter.new.tweet',
+                ]
+            );
+
+            // $tweet = $options['data']['channelId'];
+
+            // create button edit tweet
+            // @todo: this button requires a JS to be injected to the campaign builder
+            // $windowUrlEdit = $this->router->generate(
+            //     'mautic_tweet_action',
+            //     [
+            //         'objectAction' => 'edit',
+            //         'objectId'     => 'tweetId',
+            //         'contentOnly'  => 1,
+            //         'updateSelect' => $options['update_select'],
+            //     ]
+            // );
+
+            // $builder->add(
+            //     'editTweetButton',
+            //     'button',
+            //     [
+            //         'attr' => [
+            //             'class'    => 'btn btn-primary btn-nospin',
+            //             'onclick'  => 'Mautic.loadNewWindow(Mautic.standardTweetUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
+            //             'disabled' => !isset($tweet),
+            //             'icon'     => 'fa fa-edit',
+            //         ],
+            //         'label' => 'mautic.integration.Twitter.edit.tweet',
+            //     ]
+            // );
+        }
+    }
+
+    /**
+     * @param OptionsResolverInterface $resolver
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setOptional(['update_select']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'tweetsend_list';
+    }
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TweetType.php b/plugins/MauticSocialBundle/Form/Type/TweetType.php
index 934b2ab2a4e..11dd7a04d8d 100644
--- a/plugins/MauticSocialBundle/Form/Type/TweetType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TweetType.php
@@ -11,12 +11,28 @@
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
+use Doctrine\ORM\EntityManager;
+use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class TweetType extends AbstractType
 {
+    /**
+     * @var EntityManager
+     */
+    protected $em;
+
+    /**
+     * @param EntityManager $em
+     */
+    public function __construct(EntityManager $em)
+    {
+        $this->em = $em;
+    }
+
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -24,20 +40,20 @@ class TweetType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
-            'tweet_text',
-            'textarea',
+            'name',
+            'text',
             [
-                'label'      => 'mautic.social.monitoring.twitter.tweet.text',
+                'label'      => 'mautic.social.monitoring.twitter.tweet.name',
                 'required'   => true,
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'tooltip' => 'mautic.social.monitoring.twitter.tweet.text.tooltip',
-                    'class'   => 'form-control tweet-message',
+                    'tooltip' => 'mautic.social.monitoring.twitter.tweet.name.tooltip',
+                    'class'   => 'form-control',
                 ],
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required',
+                            'message' => 'mautic.core.name.required',
                         ]
                     ),
                 ],
@@ -45,45 +61,126 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
 
         $builder->add(
-            'asset_link',
-            'asset_list',
+            'description',
+            'textarea',
             [
-                'label'       => 'mautic.social.monitoring.twitter.assets',
-                'empty_value' => 'mautic.social.monitoring.list.choose',
-                'label_attr'  => ['class' => 'control-label'],
-                'multiple'    => false,
-                'attr'        => [
-                    'class'   => 'form-control tweet-insert-asset',
-                    'tooltip' => 'mautic.social.monitoring.twitter.assets.descr',
+                'label'      => 'mautic.social.monitoring.twitter.tweet.description',
+                'required'   => false,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'tooltip' => 'mautic.social.monitoring.twitter.tweet.description.tooltip',
+                    'class'   => 'form-control',
                 ],
             ]
         );
 
         $builder->add(
-            'page_link',
-            'page_list',
+            'text',
+            'textarea',
             [
-                'label'       => 'mautic.social.monitoring.twitter.pages',
-                'empty_value' => 'mautic.social.monitoring.list.choose',
-                'label_attr'  => ['class' => 'control-label'],
-                'multiple'    => false,
-                'attr'        => [
-                    'class'   => 'form-control tweet-insert-page',
-                    'tooltip' => 'mautic.social.monitoring.twitter.pages.descr',
+                'label'      => 'mautic.social.monitoring.twitter.tweet.text',
+                'required'   => true,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'tooltip' => 'mautic.social.monitoring.twitter.tweet.text.tooltip',
+                    'class'   => 'form-control tweet-message',
+                ],
+                'constraints' => [
+                    new NotBlank(
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
                 ],
             ]
         );
 
+        $transformer = new IdToEntityModelTransformer($this->em, 'MauticAssetBundle:Asset', 'id');
+        $builder->add(
+                $builder->create(
+                'asset',
+                'asset_list',
+                [
+                    'label'       => 'mautic.social.monitoring.twitter.assets',
+                    'empty_value' => 'mautic.social.monitoring.list.choose',
+                    'label_attr'  => ['class' => 'control-label'],
+                    'multiple'    => false,
+                    'attr'        => [
+                        'class'   => 'form-control tweet-insert-asset',
+                        'tooltip' => 'mautic.social.monitoring.twitter.assets.descr',
+                    ],
+                ]
+            )->addModelTransformer($transformer)
+        );
+
+        $transformer = new IdToEntityModelTransformer($this->em, 'MauticPageBundle:Page', 'id');
+        $builder->add(
+            $builder->create(
+                'page',
+                'page_list',
+                [
+                    'label'       => 'mautic.social.monitoring.twitter.pages',
+                    'empty_value' => 'mautic.social.monitoring.list.choose',
+                    'label_attr'  => ['class' => 'control-label'],
+                    'multiple'    => false,
+                    'attr'        => [
+                        'class'   => 'form-control tweet-insert-page',
+                        'tooltip' => 'mautic.social.monitoring.twitter.pages.descr',
+                    ],
+                ]
+            )->addModelTransformer($transformer)
+        );
+
         $builder->add(
             'handle',
             'button',
             [
-                'label' => '@',
+                'label' => 'mautic.social.twitter.handle',
                 'attr'  => [
                     'class' => 'form-control btn-primary tweet-insert-handle',
                 ],
             ]
         );
+
+        //add category
+        $builder->add('category', 'category', [
+            'bundle' => 'plugin:mauticSocial',
+        ]);
+
+        if (!empty($options['update_select'])) {
+            $builder->add(
+                'buttons',
+                'form_buttons',
+                [
+                    'apply_text' => false,
+                ]
+            );
+            $builder->add(
+                'updateSelect',
+                'hidden',
+                [
+                    'data'   => $options['update_select'],
+                    'mapped' => false,
+                ]
+            );
+        } else {
+            $builder->add(
+                'buttons',
+                'form_buttons'
+            );
+        }
+
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
+        }
+    }
+
+    /**
+     * @param OptionsResolverInterface $resolver
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setOptional(['update_select']);
     }
 
     public function getName()
diff --git a/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php b/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
index 48e064534a5..d892b92a8ac 100644
--- a/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
+++ b/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
@@ -12,11 +12,13 @@
 namespace MauticPlugin\MauticSocialBundle\Helper;
 
 use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Helper\TokenHelper;
 use Mautic\PageBundle\Entity\Trackable;
 use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
 use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
+use MauticPlugin\MauticSocialBundle\Model\TweetModel;
 
 /**
  * Class CampaignEventHelper.
@@ -43,6 +45,11 @@ class CampaignEventHelper
      */
     protected $assetTokenHelper;
 
+    /**
+     * @var TweetModel
+     */
+    protected $tweetModel;
+
     /**
      * @var array
      */
@@ -53,28 +60,38 @@ class CampaignEventHelper
      *
      * @param IntegrationHelper $integrationHelper
      * @param TrackableModel    $trackableModel
+     * @param PageTokenHelper   $pageTokenHelper
+     * @param AssetTokenHelper  $assetTokenHelper
+     * @param TweetModel        $tweetModel
      */
     public function __construct(
         IntegrationHelper $integrationHelper,
         TrackableModel $trackableModel,
         PageTokenHelper $pageTokenHelper,
-        AssetTokenHelper $assetTokenHelper
+        AssetTokenHelper $assetTokenHelper,
+        TweetModel $tweetModel
     ) {
         $this->integrationHelper = $integrationHelper;
         $this->trackableModel    = $trackableModel;
         $this->pageTokenHelper   = $pageTokenHelper;
         $this->assetTokenHelper  = $assetTokenHelper;
+        $this->tweetModel        = $tweetModel;
     }
 
     /**
-     * @param   $lead
-     * @param   $event
+     * @param Lead  $lead
+     * @param array $event
      *
-     * @return bool
+     * @return array|false
      */
-    public function sendTweetAction($lead, $event)
+    public function sendTweetAction(Lead $lead, array $event)
     {
-        $tweetSent = false;
+        $tweetSent   = false;
+        $tweetEntity = $this->tweetModel->getEntity($event['channelId']);
+
+        if (!$tweetEntity) {
+            return ['failed' => 1, 'response' => 'Tweet entity '.$event['channelId'].' not found'];
+        }
 
         /** @var \MauticPlugin\MauticSocialBundle\Integration\TwitterIntegration $twitterIntegration */
         $twitterIntegration = $this->integrationHelper->getIntegrationObject('Twitter');
@@ -89,26 +106,28 @@ public function sendTweetAction($lead, $event)
             return false;
         }
 
-        $tweetText = $event['properties']['tweet_text'];
-        $tweetText = $this->parseTweetText($tweetText, $leadArray);
+        $tweetText = $tweetEntity->getText();
+        $tweetText = $this->parseTweetText($tweetText, $leadArray, $tweetEntity->getId());
         $tweetUrl  = $twitterIntegration->getApiUrl('statuses/update');
         $status    = ['status' => $tweetText];
 
         // fire the tweet
-        $sendTweet = $twitterIntegration->makeRequest($tweetUrl, $status, 'POST', ['append_callback' => false]);
+        $sendResponse = $twitterIntegration->makeRequest($tweetUrl, $status, 'POST', ['append_callback' => false]);
 
         // verify the tweet was sent by checking for a tweet id
-        if (is_array($sendTweet) && array_key_exists('id_str', $sendTweet)) {
+        if (is_array($sendResponse) && array_key_exists('id_str', $sendResponse)) {
             $tweetSent = true;
         }
 
         if ($tweetSent) {
-            return ['timeline' => $tweetText, 'response' => $sendTweet];
+            $this->tweetModel->registerSend($tweetEntity, $lead, $sendResponse, 'campaign.event', $event['id']);
+
+            return ['timeline' => $tweetText, 'response' => $sendResponse];
         }
 
-        $response = ['failed' => 1, 'response' => $sendTweet];
-        if (!empty($sendTweet['error']['message'])) {
-            $response['reason'] = $sendTweet['error']['message'];
+        $response = ['failed' => 1, 'response' => $sendResponse];
+        if (!empty($sendResponse['error']['message'])) {
+            $response['reason'] = $sendResponse['error']['message'];
         }
 
         return $response;
@@ -117,12 +136,13 @@ public function sendTweetAction($lead, $event)
     /**
      * PreParse the twitter message and replace placeholders with values.
      *
-     * @param $tweet
-     * @param $lead
+     * @param string $text
+     * @param array  $lead
+     * @param int    $channelId
      *
-     * @return mixed
+     * @return string
      */
-    protected function parseTweetText($tweet, $lead)
+    protected function parseTweetText($text, $lead, $channelId = -1)
     {
         $tweetHandle = $lead['twitter'];
         $tokens      = [
@@ -131,16 +151,16 @@ protected function parseTweetText($tweet, $lead)
 
         $tokens = array_merge(
             $tokens,
-            TokenHelper::findLeadTokens($tweet, $lead),
-            $this->pageTokenHelper->findPageTokens($tweet, $this->clickthrough),
-            $this->assetTokenHelper->findAssetTokens($tweet, $this->clickthrough)
+            TokenHelper::findLeadTokens($text, $lead),
+            $this->pageTokenHelper->findPageTokens($text, $this->clickthrough),
+            $this->assetTokenHelper->findAssetTokens($text, $this->clickthrough)
         );
 
-        list($tweet, $trackables) = $this->trackableModel->parseContentForTrackables(
-            $tweet,
+        list($text, $trackables) = $this->trackableModel->parseContentForTrackables(
+            $text,
             $tokens,
             'social_twitter',
-            -1 // No specific id associated with this so just send something
+            $channelId
         );
 
         /**
@@ -151,6 +171,6 @@ protected function parseTweetText($tweet, $lead)
             $tokens[$token] = $this->trackableModel->generateTrackableUrl($trackable, $this->clickthrough);
         }
 
-        return str_replace(array_keys($tokens), array_values($tokens), $tweet);
+        return str_replace(array_keys($tokens), array_values($tokens), $text);
     }
 }
diff --git a/plugins/MauticSocialBundle/Model/TweetModel.php b/plugins/MauticSocialBundle/Model/TweetModel.php
new file mode 100644
index 00000000000..6fc632c4b01
--- /dev/null
+++ b/plugins/MauticSocialBundle/Model/TweetModel.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace MauticPlugin\MauticSocialBundle\Model;
+
+use Mautic\CoreBundle\Model\AjaxLookupModelInterface;
+use Mautic\CoreBundle\Model\FormModel;
+use Mautic\LeadBundle\Entity\Lead;
+use MauticPlugin\MauticSocialBundle\Entity\Tweet;
+use MauticPlugin\MauticSocialBundle\Entity\TweetStat;
+use MauticPlugin\MauticSocialBundle\Event as Events;
+use MauticPlugin\MauticSocialBundle\SocialEvents;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+
+/**
+ * Class TweetModel
+ * {@inheritdoc}
+ */
+class TweetModel extends FormModel implements AjaxLookupModelInterface
+{
+    /**
+     * @param        $type
+     * @param string $filter
+     * @param int    $limit
+     * @param int    $start
+     * @param array  $options
+     *
+     * @return array
+     */
+    public function getLookupResults($type, $filter = '', $limit = 10, $start = 0, $options = [])
+    {
+        $results = [];
+
+        switch ($type) {
+            case 'social.tweet':
+            case 'tweet':
+
+                if (isset($filter['tweet_text'])) {
+                    // This tweet was created as the campaign action param and these params are not the filter. Clear the filter.
+                    $filter = '';
+                }
+
+                $tweetRepo = $this->getRepository();
+                $tweetRepo->setCurrentUser($this->userHelper->getUser());
+                $entities = $tweetRepo->getTweetList(
+                    $filter,
+                    $limit,
+                    $start,
+                    $this->security->isGranted($this->getPermissionBase().':viewother')
+                );
+
+                foreach ($entities as $entity) {
+                    $results[$entity['language']][$entity['id']] = $entity['name'];
+                }
+
+                //sort by language
+                ksort($results);
+
+                unset($entities);
+
+                break;
+        }
+
+        return $results;
+    }
+
+    /**
+     * Create/update Tweet Stat and update sent count for Tweet.
+     *
+     * @param Tweet  $tweet
+     * @param Lead   $lead
+     * @param array  $sendResponse
+     * @param string $source
+     * @param int    $sourceId
+     *
+     * @return $this
+     */
+    public function registerSend(Tweet $tweet, Lead $lead, array $sendResponse, $source = null, $sourceId = null)
+    {
+        $statRepo = $this->getStatRepository();
+
+        // Update failed tweet
+        $stat = $statRepo->findOneBy(
+            [
+                'lead'     => $lead->getId(),
+                'tweet'    => $tweet->getId(),
+                'source'   => $source,
+                'sourceId' => $sourceId,
+                'isFailed' => true,
+            ]
+        );
+
+        if (!$stat) {
+            // Create new entity
+            $stat = new TweetStat();
+        } else {
+            // Or add 1 to the retry count
+            $stat->retryCountUp();
+        }
+
+        $stat->setTweet($tweet);
+        $stat->setLead($lead);
+        $stat->setResponseDetails($sendResponse);
+        $stat->setSource($source);
+        $stat->setSourceId($sourceId);
+
+        $fields = $lead->getProfileFields();
+        if (!empty($fields['twitter'])) {
+            $stat->setHandle($fields['twitter']);
+        }
+
+        if (!empty($sendResponse['id_str'])) {
+            $stat->setDateSent(new \DateTime());
+            $stat->setTwitterTweetId($sendResponse['id_str']);
+
+            $tweet->sentCountUp();
+            $this->saveEntity($tweet);
+        } else {
+            $stat->setIsFailed(true);
+        }
+
+        $statRepo->saveEntity($stat);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param Tweet $entity
+     * @param       $formFactory
+     * @param null  $action
+     * @param array $options
+     *
+     * @return mixed
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+     */
+    public function createForm($entity, $formFactory, $action = null, $params = [])
+    {
+        if (!$entity instanceof Tweet) {
+            throw new MethodNotAllowedHttpException(['Tweet']);
+        }
+
+        if (!empty($action)) {
+            $params['action'] = $action;
+        }
+
+        return $formFactory->create('twitter_tweet', $entity, $params);
+    }
+
+    /**
+     * Get a specific entity or generate a new one if id is empty.
+     *
+     * @param int $id
+     *
+     * @return null|Tweet
+     */
+    public function getEntity($id = null)
+    {
+        if ($id === null) {
+            $entity = new Tweet();
+        } else {
+            $entity = parent::getEntity($id);
+        }
+
+        return $entity;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param $action
+     * @param $event
+     * @param $entity
+     * @param $isNew
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
+     */
+    protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
+    {
+        if (!$entity instanceof Tweet) {
+            throw new MethodNotAllowedHttpException(['Tweet']);
+        }
+
+        switch ($action) {
+            case 'pre_save':
+                $name = SocialEvents::TWEET_PRE_SAVE;
+                break;
+            case 'post_save':
+                $name = SocialEvents::TWEET_POST_SAVE;
+                break;
+            case 'pre_delete':
+                $name = SocialEvents::TWEET_PRE_DELETE;
+                break;
+            case 'post_delete':
+                $name = SocialEvents::TWEET_POST_DELETE;
+                break;
+            default:
+                return null;
+        }
+
+        if ($this->dispatcher->hasListeners($name)) {
+            if (empty($event)) {
+                $event = new Events\SocialEvent($entity, $isNew);
+            }
+
+            $this->dispatcher->dispatch($name, $event);
+
+            return $event;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRepository()
+    {
+        return $this->em->getRepository('MauticSocialBundle:Tweet');
+    }
+
+    /**
+     * @return TweetStatRepository
+     */
+    public function getStatRepository()
+    {
+        return $this->em->getRepository('MauticSocialBundle:TweetStat');
+    }
+
+    /**
+     * @return string
+     */
+    public function getPermissionBase()
+    {
+        return 'plugin:mauticSocial:tweets';
+    }
+}
diff --git a/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php b/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
index bd344b9b1c4..ae10345f0ec 100644
--- a/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
+++ b/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
@@ -27,6 +27,7 @@ public function __construct($params)
         parent::__construct($params);
         $this->addStandardPermissions('categories');
         $this->addStandardPermissions('monitoring');
+        $this->addExtendedPermissions('tweets');
     }
 
     /**
@@ -49,5 +50,6 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
     {
         $this->addStandardFormFields('mauticSocial', 'categories', $builder, $data);
         $this->addStandardFormFields('mauticSocial', 'monitoring', $builder, $data);
+        $this->addExtendedFormFields('mauticSocial', 'tweets', $builder, $data);
     }
 }
diff --git a/plugins/MauticSocialBundle/SocialEvents.php b/plugins/MauticSocialBundle/SocialEvents.php
index 48a4eb235e7..c254e4577e3 100644
--- a/plugins/MauticSocialBundle/SocialEvents.php
+++ b/plugins/MauticSocialBundle/SocialEvents.php
@@ -68,6 +68,46 @@ final class SocialEvents
      */
     const MONITOR_POST_PROCESS = 'mautic.monitor_post_process';
 
+    /**
+     * The mautic.tweet_pre_save event is dispatched right before a tweet is persisted.
+     *
+     * The event listener receives a
+     * MauticPlugin\MauticSocialBundle\Event\SocialEvent instance.
+     *
+     * @var string
+     */
+    const TWEET_PRE_SAVE = 'mautic.tweet_pre_save';
+
+    /**
+     * The mautic.tweet_post_save event is dispatched right after a tweet is persisted.
+     *
+     * The event listener receives a
+     * MauticPlugin\MauticSocialBundle\Event\SocialEvent instance.
+     *
+     * @var string
+     */
+    const TWEET_POST_SAVE = 'mautic.tweet_post_save';
+
+    /**
+     * The mautic.tweet_pre_delete event is dispatched before a tweet item is deleted.
+     *
+     * The event listener receives a
+     * MauticPlugin\MauticSocialBundle\Event\SocialEvent instance.
+     *
+     * @var string
+     */
+    const TWEET_PRE_DELETE = 'mautic.tweet_pre_delete';
+
+    /**
+     * The mautic.tweet_post_delete event is dispatched after a tweet is deleted.
+     *
+     * The event listener receives a
+     * MauticPlugin\MauticSocialBundle\Event\SocialEvent instance.
+     *
+     * @var string
+     */
+    const TWEET_POST_DELETE = 'mautic.tweet_post_delete';
+
     /**
      * The mautic.social.on_campaign_trigger_action event is fired when the campaign action triggers.
      *
diff --git a/plugins/MauticSocialBundle/Translations/en_US/messages.ini b/plugins/MauticSocialBundle/Translations/en_US/messages.ini
index a6c9a1d6346..a6fd6c9058d 100644
--- a/plugins/MauticSocialBundle/Translations/en_US/messages.ini
+++ b/plugins/MauticSocialBundle/Translations/en_US/messages.ini
@@ -136,12 +136,27 @@ mautic.integration.Twitter.share.username="username"
 mautic.integration.Twitter.share.via="Via"
 mautic.integration.Twitter.time_zone="Timezone"
 mautic.integration.Twitter.url="URLs - Website"
+mautic.integration.Twitter.text.required="Tweet text is required"
+mautic.integration.Twitter.send.selecttweet="Select Tweet"
+mautic.integration.Twitter.send.selecttweet.desc="Sends a tweet to the contact."
+mautic.integration.Twitter.send.selecttweet.notblank="The tweet list cannot be empty. Select one."
+mautic.social.tweets="Tweets"
+mautic.social.monitoring.twitter.tweet.name="Name"
+mautic.social.monitoring.twitter.tweet.name.tooltip="Internal Mautic name of the Tweet"
+mautic.integration.Twitter.new.tweet="New Tweet"
+mautic.integration.Twitter.edit.tweet="Edit Tweet"
 mautic.plugin.actions.socialLogin="Social login"
 mautic.mauticSocial.permissions.header="Social Permissions"
 mautic.mauticSocial.permissions.monitoring="Monitoring - User has access to"
+mautic.mauticSocial.permissions.tweet="Tweet - User has access to"
 mautic.mautic.social.monitoring.form.confirmdelete="Delete monitor?"
+mautic.mautic.integration.Twitter.form.confirmdelete="Delete tweet?"
 mautic.mautic.social.monitoring.form.confirmbatchdelete="Delete selected monitors?"
 mautic.mautic.social.monitoring.noresults.tip="Get started by adding your first monitor record. Make sure you've configured the twitter integration!"
+mautic.mautic.social.tweet.noresults.tip="Get started by adding your first tweet record. Make sure you've configured the twitter integration!"
+mautic.social.tweet.menu.edit="Edit tweet %name%"
+mautic.social.tweet.menu.new="New tweet"
+mautic.social.twitter.handle="@handle"
 mautic.social.config.twitter.field.label="Twitter Handle Field"
 mautic.social.monitoring="Social Monitoring"
 mautic.social.monitoring.list.choose="Choose an option"
@@ -164,6 +179,8 @@ mautic.social.monitoring.twitter.pages="Insert Page Link"
 mautic.social.monitoring.twitter.pages.descr="Select a page link from the list to insert a placeholder into the tweet"
 mautic.social.monitoring.twitter.tweet.text="Tweet Message"
 mautic.social.monitoring.twitter.tweet.text.tooltip="The text of the tweet. Placeholders supported: {twitter_handle}, {pagelink=X}, and {assetlink=X}"
+mautic.social.monitoring.twitter.tweet.description="Description"
+mautic.social.monitoring.twitter.tweet.description.tooltip="Internal description of the tweet"
 mautic.social.monitoring.type.list="Monitoring Methods"
 mautic.social.monitoring.type.list.twitter.custom="Twitter Custom Search"
 mautic.social.monitoring.type.list.twitter.handle="Twitter Mention"
@@ -175,6 +192,6 @@ mautic.social.twitter.error.handle_not_found="Handle not found"
 mautic.social.twitter.tweet.event.open="Tweet contact"
 mautic.social.twitter.tweet.event.open_desc="Send tweets automatically to contacts. This must be in compliance with  <a href='https://support.twitter.com/articles/76915#Tweets' target='_blank'>Twitter's Automation Rules</a>."
 mautic.social.twitter.tweet.count="Count"
-mautic.social.twitter.tweet.handle="Handle"
+mautic.social.twitter.tweet.handle="Insert Contact Handle"
 mautic.monitoring.form.confirmdelete="Delete the social monitoring, %name%?"
 mautic.campaign.twitter.tweet="Tweet contact"
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Monitoring/details.html.php b/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
index 2ee81a47f14..2e17aa6bb5b 100644
--- a/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
+++ b/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
@@ -111,18 +111,8 @@
 
     <!-- right section -->
     <div class="col-md-3 bg-white bdr-l height-auto">
-        <!-- preview URL -->
-        <div class="panel bg-transparent shd-none bdr-rds-0 bdr-w-0 mt-sm mb-0">
-            <div class="panel-heading">
-                <div class="panel-title">
-                    <!-- recent activity -->
-                    <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
-                </div>
-            </div>
-            <div class="panel-body pt-xs">
-
-            </div>
-        </div>
+        <!-- recent activity -->
+        <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
     </div>
     <!--/ right section -->
 
diff --git a/plugins/MauticSocialBundle/Views/Tweet/form.html.php b/plugins/MauticSocialBundle/Views/Tweet/form.html.php
new file mode 100644
index 00000000000..af895cc751f
--- /dev/null
+++ b/plugins/MauticSocialBundle/Views/Tweet/form.html.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+
+$view['slots']->set('mauticContent', 'tweet');
+echo $view['assets']->includeScript('plugins/MauticSocialBundle/Assets/js/social.js', 'composeSocialWatcher', 'composeSocialWatcher');
+?>
+
+<?php
+    $header = ($entity->getId()) ?
+    $view['translator']->trans('mautic.social.tweet.menu.edit',
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
+        $view['translator']->trans('mautic.social.tweet.menu.new');
+
+        $view['slots']->set('headerTitle', $header);
+?>
+
+<?php echo $view['form']->start($form); ?>
+
+<!-- start: box layout -->
+<div class="box-layout">
+    <!-- container -->
+    <div class="col-md-9 bg-auto height-auto bdr-r">
+        <div class="pa-md">
+            <div class="row">
+                <div class="col-md-4">
+                    <?php echo $view['form']->row($form['name']); ?>
+                    <?php echo $view['form']->row($form['description']); ?>
+                </div>
+
+                <div class="col-md-8">
+                    <?php echo $view['form']->row($form['text']); ?>
+                    
+                    <div class="row">
+                        <div class="col-md-3">
+                            <label class="control-label">
+                                <?php echo $view['translator']->trans('mautic.social.twitter.tweet.handle'); ?>
+                            </label>
+                            <?php echo $view['form']->row($form['handle']); ?>
+                        </div>
+                        <div class="col-md-3">
+                            <?php echo $view['form']->row($form['asset']); ?>
+                        </div>
+                        <div class="col-md-3">
+                            <?php echo $view['form']->row($form['page']); ?>
+                        </div>
+                        <div class="col-md-3">
+                            <div id="character-count" class="text-right small">
+                                <?php echo $view['translator']->trans('mautic.social.twitter.tweet.count'); ?>
+                                <span></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-3 bg-white height-auto">
+        <div class="pr-lg pl-lg pt-md pb-md">
+            <?php echo $view['form']->row($form['category']); ?>
+        </div>
+    </div>
+</div>
+
+<?php echo $view['form']->end($form); ?>
diff --git a/plugins/MauticSocialBundle/Views/Tweet/form.modal.html.php b/plugins/MauticSocialBundle/Views/Tweet/form.modal.html.php
new file mode 100644
index 00000000000..ce467ad0e5d
--- /dev/null
+++ b/plugins/MauticSocialBundle/Views/Tweet/form.modal.html.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+
+$view['slots']->set('mauticContent', 'tweet');
+echo $view['assets']->includeScript('plugins/MauticSocialBundle/Assets/js/social.js', 'composeSocialWatcher', 'composeSocialWatcher');
+?>
+
+<?php echo $view['form']->start($form); ?>
+<?php echo $view['form']->row($form['name']); ?>
+<?php echo $view['form']->row($form['text']); ?>
+<div id="character-count" class="text-right small">
+    <?php echo $view['translator']->trans('mautic.social.twitter.tweet.count'); ?>
+    <span></span>
+</div>
+
+<div class="row">
+    <div class="col-md-4">
+        <label class="control-label">
+            <?php echo $view['translator']->trans('mautic.social.twitter.tweet.handle'); ?>
+        </label>
+        <?php echo $view['form']->row($form['handle']); ?>
+    </div>
+    <div class="col-md-4">
+        <?php echo $view['form']->row($form['asset']); ?>
+    </div>
+    <div class="col-md-4">
+        <?php echo $view['form']->row($form['page']); ?>
+    </div>
+</div>
+
+<?php echo $view['form']->row($form['description']); ?>
+<?php echo $view['form']->row($form['category']); ?>
+<?php echo $view['form']->end($form); ?>
diff --git a/plugins/MauticSocialBundle/Views/Tweet/index.html.php b/plugins/MauticSocialBundle/Views/Tweet/index.html.php
new file mode 100644
index 00000000000..c9377b1d36d
--- /dev/null
+++ b/plugins/MauticSocialBundle/Views/Tweet/index.html.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+$view->extend('MauticCoreBundle:Default:content.html.php');
+
+$view['slots']->set('mauticContent', 'tweet');
+
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.social.tweets'));
+
+$view['slots']->set(
+    'actions',
+    $view->render(
+        'MauticCoreBundle:Helper:page_actions.html.php',
+        [
+            'templateButtons' => [
+                'new' => $view['security']->isGranted('plugin:mauticSocial:tweet:create'),
+            ],
+            'routeBase' => 'mautic_tweet',
+            'langVar'   => 'tweet',
+        ]
+    )
+);
+?>
+
+<div class="panel panel-default bdr-t-wdh-0 mb-0">
+    <?php echo $view->render(
+        'MauticCoreBundle:Helper:list_toolbar.html.php',
+        [
+            'searchValue' => $searchValue,
+            'action'      => $currentRoute,
+        ]
+    ); ?>
+    <div class="page-list">
+        <?php $view['slots']->output('_content'); ?>
+    </div>
+</div>
diff --git a/plugins/MauticSocialBundle/Views/Tweet/list.html.php b/plugins/MauticSocialBundle/Views/Tweet/list.html.php
new file mode 100644
index 00000000000..5d505946c8f
--- /dev/null
+++ b/plugins/MauticSocialBundle/Views/Tweet/list.html.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * @copyright   2016 Mautic, Inc. All rights reserved
+ * @author      Mautic, Inc
+ *
+ * @link        https://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+if ($tmpl == 'index') {
+    $view->extend('MauticSocialBundle:Tweet:index.html.php');
+}
+?>
+<?php if (count($items)): ?>
+    <div class="table-responsive">
+        <table class="table table-hover table-striped table-bordered tweet-list" id="tweetTable">
+            <thead>
+            <tr>
+                <?php
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'checkall'        => 'true',
+                        'target'          => '#tweetTable',
+                        'langVar'         => 'mautic.social.tweets',
+                        'routeBase'       => 'mautic_tweet',
+                        'templateButtons' => [
+                            'delete' => $view['security']->isGranted('plugin:mauticSocial:tweet:delete'),
+                        ],
+                    ]
+                );
+
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'sessionVar' => 'social.tweet',
+                        'orderBy'    => 'e.name',
+                        'text'       => 'mautic.core.name',
+                        'class'      => 'col-tweet-name',
+                        'default'    => true,
+                    ]
+                );
+
+                echo $view->render(
+                    'MauticCoreBundle:Helper:tableheader.html.php',
+                    [
+                        'sessionVar' => 'social.tweet',
+                        'orderBy'    => 'e.id',
+                        'text'       => 'mautic.core.id',
+                        'class'      => 'visible-md visible-lg col-asset-id',
+                    ]
+                );
+                ?>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($items as $k => $item): ?>
+                <tr>
+                    <td>
+                        <?php
+                        echo $view->render(
+                            'MauticCoreBundle:Helper:list_actions.html.php',
+                            [
+                                'item'            => $item,
+                                'templateButtons' => [
+                                    'edit'   => $view['security']->isGranted('plugin:mauticSocial:tweet:edit'),
+                                    'delete' => $view['security']->isGranted('plugin:mauticSocial:tweet:delete'),
+                                ],
+                                'routeBase'  => 'mautic_tweet',
+                                'langVar'    => 'mautic.integration.Twitter',
+                                'nameGetter' => 'getName',
+                            ]
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <div>
+                            <?php echo $view->render(
+                                'MauticCoreBundle:Helper:publishstatus_icon.html.php',
+                                [
+                                    'item'  => $item,
+                                    'model' => 'social.tweet',
+                                ]
+                            ); ?>
+                            <a href="<?php echo $view['router']->path(
+                                'mautic_tweet_action',
+                                ['objectAction' => 'edit', 'objectId' => $item->getId()]
+                            ); ?>"
+                               data-toggle="ajax">
+                                <?php echo $item->getName(); ?>
+                            </a>
+                        </div>
+                        <?php if ($description = $item->getDescription()): ?>
+                            <div class="text-muted mt-4">
+                                <small><?php echo $description; ?></small>
+                            </div>
+                        <?php endif; ?>
+                    </td>
+                    <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+    <div class="panel-footer">
+        <?php echo $view->render(
+            'MauticCoreBundle:Helper:pagination.html.php',
+            [
+                'totalItems' => count($items),
+                'page'       => $page,
+                'limit'      => $limit,
+                'menuLinkId' => 'mautic_tweet_index',
+                'baseUrl'    => $view['router']->path('mautic_tweet_index'),
+                'sessionVar' => 'social.tweet',
+                'routeBase'  => 'tweet',
+            ]
+        ); ?>
+    </div>
+<?php else: ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.mautic.social.tweet.noresults.tip']); ?>
+<?php endif; ?>
+
diff --git a/robots.txt b/robots.txt
index 5f792d0d36c..163ba5c2154 100644
--- a/robots.txt
+++ b/robots.txt
@@ -2,7 +2,7 @@ User-agent: *
 Disallow: /addons/
 Disallow: /plugins/
 Disallow: /app/
-Disallow: /media/dashboard/
+Disallow: /media/dashboards/
 Disallow: /media/files/
 Disallow: /media/js/mautic-form-src.js
 Disallow: /themes/
diff --git a/themes/blank-big.png b/themes/blank-big.png
new file mode 100644
index 00000000000..aa461d57310
Binary files /dev/null and b/themes/blank-big.png differ
diff --git a/themes/blank/html/email.html.twig b/themes/blank/html/email.html.twig
index 524969249de..c5c605a7f0f 100644
--- a/themes/blank/html/email.html.twig
+++ b/themes/blank/html/email.html.twig
@@ -1,6 +1,21 @@
+<!DOCTYPE html>
 <html>
     <head>
         <title>{subject}</title>
+        <style type="text/css" media="only screen and (max-width: 480px)">
+            /* Mobile styles */
+            @media only screen and (max-width: 480px) {
+
+                [class="w320"] {
+                    width: 320px !important;
+                }
+
+                [class="mobile-block"] {
+                    width: 100% !important;
+                    display: block !important;
+                }
+            }
+        </style>
     </head>
     <body style="margin:0">
         <div data-section-wrapper="1">
diff --git a/themes/goldstar/html/email.html.twig b/themes/goldstar/html/email.html.twig
index 6295394e2a9..eda6fbdd476 100644
--- a/themes/goldstar/html/email.html.twig
+++ b/themes/goldstar/html/email.html.twig
@@ -56,6 +56,20 @@
             div[class='h2'] { font-size: 44px !important; line-height: 48px !important; }
         } 
     </style>
+    <style type="text/css" media="only screen and (max-width: 480px)">
+        /* Mobile styles */
+        @media only screen and (max-width: 480px) {
+
+            [class="w320"] {
+                width: 320px !important;
+            }
+
+            [class="mobile-block"] {
+                width: 100% !important;
+                display: block !important;
+            }
+        }
+    </style>
 </head>
 <body class="body" style="padding:0 !important; margin:0 !important; display:block !important; background:#1e1e1e; -webkit-text-size-adjust:none">
     <div data-section-wrapper="1"  width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#161616">
diff --git a/themes/neopolitan/html/email.html.twig b/themes/neopolitan/html/email.html.twig
index 2fef05f84ae..5ce6584d3d2 100644
--- a/themes/neopolitan/html/email.html.twig
+++ b/themes/neopolitan/html/email.html.twig
@@ -79,15 +79,14 @@
         /* Mobile styles */
         @media only screen and (max-width: 480px) {
 
-            table[class="w320"] {
+            [class="w320"] {
                 width: 320px !important;
             }
 
-            td[class="mobile-block"] {
+            [class="mobile-block"] {
                 width: 100% !important;
                 display: block !important;
             }
-
         }
     </style>
 </head>
diff --git a/themes/oxygen/html/email.html.twig b/themes/oxygen/html/email.html.twig
index 71dd35c1b8c..1e3e2817631 100644
--- a/themes/oxygen/html/email.html.twig
+++ b/themes/oxygen/html/email.html.twig
@@ -2,6 +2,20 @@
 <html>
     <head>
         <title>{subject}</title>
+        <style type="text/css" media="only screen and (max-width: 480px)">
+            /* Mobile styles */
+            @media only screen and (max-width: 480px) {
+
+                [class="w320"] {
+                    width: 320px !important;
+                }
+
+                [class="mobile-block"] {
+                    width: 100% !important;
+                    display: block !important;
+                }
+            }
+        </style>
     </head>
     <body style="font-family: Helvetica, Arial, sans-serif;color: #676767;width: 100%;margin: 0;">
         <div data-section-wrapper="1" style="width:100%;background-color: #f7f7f7;font-family: Helvetica, Arial, sans-serif;font-size: 14px;color: #777777;text-align: center;line-height: 21px;padding: 20px 0 30px;" class="content-padding">
diff --git a/themes/skyline/html/email.html.twig b/themes/skyline/html/email.html.twig
index 6a1302d2a93..0d23dfabd31 100644
--- a/themes/skyline/html/email.html.twig
+++ b/themes/skyline/html/email.html.twig
@@ -93,6 +93,11 @@
                 padding-right: 20px !important;
                 padding-bottom: 20px !important;
             }
+
+            [class="mobile-block"] {
+                width: 100% !important;
+                display: block !important;
+            }
         }
     </style>
 </head>
diff --git a/themes/sunday/html/email.html.twig b/themes/sunday/html/email.html.twig
index b9b33daed24..e7e350f1062 100644
--- a/themes/sunday/html/email.html.twig
+++ b/themes/sunday/html/email.html.twig
@@ -128,6 +128,11 @@
                 padding-top: 20px !important;
             }
 
+            [class="mobile-block"] {
+                width: 100% !important;
+                display: block !important;
+            }
+
         }
     </style>
 </head>
diff --git a/upgrade.php b/upgrade.php
index 565f78c36ed..4a0154e6406 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -12,7 +12,7 @@
 date_default_timezone_set('UTC');
 
 define('MAUTIC_MINIMUM_PHP', '5.6.19');
-define('MAUTIC_MAXIMUM_PHP', '7.1.999');
+define('MAUTIC_MAXIMUM_PHP', '7.0.999');
 
 // Are we running the minimum version?
 if (version_compare(PHP_VERSION, MAUTIC_MINIMUM_PHP, 'lt')) {