Customizeable / Extendable Visitor Profile & Visitor Log (#11579)

* move setting visitor details into own classes instead of using an event

* move manipulating actions to VisitorDetails classes

* move some more parts to plugins

* update test files as order of columns changed

* implement new VisitorDetails method to provide actions

* move rendering actions to visitordetail classes

* render visitor properties in new classes

* makes it possible to attach icons to visitor log

* moves rendering of action tooltip into new visitordetails method

* adds event for extending custom action dimension fields

* small improvements

* fetch log_link_visit_action.idpageview for actions

* improve variable name

* started to improve/change visitor profile

* show devices summary in visitor profile

* also remove empty xml tags for api tests

* hide actions in visitor profile by default

* move all icons to the middle of visitor log

* small change

* move rendering referrer information to referrers plugin

* move provider logic to provider plugin

* show content interactions in visitor log

* improve look of content interactions/impressions in visitor log / profile

* hide idpageview from tests

* update changelog

* move rendering events to Events plugin

* do not hide duplicate page views in visitor log, but show them with a refresh icon instead

* show top visited pages in visitor profile

* always show visitor profile link in visitor log

Still hidden in a widget by default, as it might overlay some other content

* Show info about not shown actions

truncated due to config setting

* use bulk queries to fetch actions instead of fetching them for each visit

* small adjustments

* improve some loops to improve memory usage

* move gathering visitor profile informations to VisitorDetails classes

* update screenshots

* update test files

* move rendering of visitor profile summary to visitor details classes

* improve templates

* Makes VisitorDetailsAbstract class api and improves comments

* show visit details in visitor profile

* improve css

* reverse enumeration of visits in visitor profile

* improve css

* Show visit id in IP tooltip

* Small CSS improvements

* further adjustments

* sort devices by count

* adds UI tests for visitor log and profile

* Show bandwidth in visitor profile test

* show actions by default and add button to toggle all together

* CSS cleanup

* remove border around refresh icon

* add tooltip for refresh icon in profile

* move first/last visit before top visited pages

* Improve text shown for unique pageviews

* link urls in top visited pages

* improve sorting of device list

* improve tests

* Improve device overview in visitor profile

* only render top pages if at least one page was visited more than once

* make visitor id non bold

* hide visitor type icon in profile, and show latest visits icons in overview

* fix search engine icon in visitor details

* small improvements

* only render view if required

* show visit icons only on hover in profile

* remove from again

* test improves

* show text besides icon in profile header

* improve tests

* Removes unused CSS and JS

* Reformats CSS

* Removes invisible paper clip

* Removes unused profile images from Live plugin

* raise test timeouts

* Improve UI tests splitting for travis

* show device type in profile header if no resolution is available

* prevent text overlapping

* no retries

* fix test

* change summary order

* fix position of export icon

* fixes tooltip text

* improve pages overview

* visitor details order

* action tooltip order

* show only ecommerce icon if no goals where converted

* show custom variables summary in profile

* show user id in same size as headline

* link referer urls for first/last visit in profile

* make profile xml compatible

* try to improve ui test

* increase bottom marign

* increase version number

* small adjustments

* CSS Rewrite for visitor profile

* center action icons in visitor log and profile

* improve widgetized visitor profile

* small layout fix

* always populate raw referrer url for visitor details

* update expected test files

* Refactor profile summaries into additional classes

* update screenshots

* submodule update

* update piwik-icons submodule (#11904)

* update piwik-icons submodule

* fix some system tests

* update screenshots

* make device list xml compatible

* improve translation

* improve icon position

* improves spacings

* update test files

* small css improvement

* update screenshots

169 files changed, 12298 insertions, 7221 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a77192ed05..d1f281a0da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ The Product Changelog at **[piwik.org/changelog](https://piwik.org/changelog)**
 
 ## Piwik 3.0.5
 
+### Breaking Changes
+* The event `Live.getAllVisitorDetails` has been deprecated and will be removed in Piwik 4. Use a `VisitorDetails` class instead (see Live plugin). 
+
 ### New Features
 * New method `setSecureCookie` that sets the cookie's secure parameter
 
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 409940d495..35c673e716 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -30,19 +30,11 @@ class Actions extends \Piwik\Plugin
             'ViewDataTable.configure'         => 'configureViewDataTable',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'Insights.addReportToOverview'    => 'addReportToInsightsOverview',
-            'Live.getAllVisitorDetails'       => 'extendVisitorDetails',
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
             'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations',
         );
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $visitor['searches'] = $details['visit_total_searches'];
-        $visitor['actions']  = $details['visit_total_actions'];
-        $visitor['interactions']  = $details['visit_total_interactions'];
-    }
-
     public function addMetricTranslations(&$translations)
     {
         $metrics = array(
diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php
new file mode 100644
index 0000000000..7292bd87f5
--- /dev/null
+++ b/plugins/Actions/VisitorDetails.php
@@ -0,0 +1,373 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Actions;
+
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Site;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\PageUrl;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    const EVENT_VALUE_PRECISION = 3;
+
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['searches']     = $this->details['visit_total_searches'];
+        $visitor['actions']      = $this->details['visit_total_actions'];
+        $visitor['interactions'] = $this->details['visit_total_interactions'];
+    }
+
+    public function provideActionsForVisitIds(&$actions, $visitIds)
+    {
+        $actionDetails = $this->queryActionsForVisits($visitIds);
+        // use while / array_shift combination instead of foreach to save memory
+        while (is_array($actionDetails) && count($actionDetails)) {
+            $action  = array_shift($actionDetails);
+            $idVisit = $action['idvisit'];
+            unset($action['idvisit']);
+            $actions[$idVisit][] = $action;
+        }
+    }
+
+
+    public function provideActionsForVisit(&$actions, $visitorDetails)
+    {
+        $actionDetails = $actions;
+
+        $formatter = new Formatter();
+
+        $actionTypesToHandle = array(
+            Action::TYPE_PAGE_URL,
+            Action::TYPE_SITE_SEARCH,
+            Action::TYPE_EVENT,
+            Action::TYPE_OUTLINK,
+            Action::TYPE_DOWNLOAD
+        );
+
+        // Enrich with time spent per action
+        $nextActionId = 0;
+        foreach ($actionDetails as $idx => &$action) {
+
+            if ($idx < $nextActionId || !in_array($action['type'], $actionTypesToHandle)) {
+                continue; // skip to next action having timeSpentRef
+            }
+
+            // search for next action with timeSpentRef
+            $nextActionId = $idx + 1;
+            $nextAction   = null;
+
+            while (isset($actionDetails[$nextActionId]) &&
+                (!in_array($actionDetails[$nextActionId]['type'], $actionTypesToHandle) ||
+                    !array_key_exists('timeSpentRef', $actionDetails[$nextActionId]))) {
+                $nextActionId++;
+            }
+            $nextAction = isset($actionDetails[$nextActionId]) ? $actionDetails[$nextActionId] : null;
+
+            // Set the time spent for this action (which is the timeSpentRef of the next action)
+            if ($nextAction) {
+                $action['timeSpent'] = $nextAction['timeSpentRef'];
+            } else {
+
+                // Last action of a visit.
+                // By default, Piwik does not know how long the user stayed on the page
+                // If enableHeartBeatTimer() is used in piwik.js then we can find the accurate time on page for the last pageview
+                $visitTotalTime   = $visitorDetails['visitDuration'];
+                $timeOfLastAction = Date::factory($action['serverTimePretty'])->getTimestamp();
+
+                $timeSpentOnAllActionsApartFromLastOne = ($timeOfLastAction - $visitorDetails['firstActionTimestamp']);
+                $timeSpentOnPage                       = $visitTotalTime - $timeSpentOnAllActionsApartFromLastOne;
+
+                // Safe net, we assume the time is correct when it's more than 10 seconds
+                if ($timeSpentOnPage > 10) {
+                    $action['timeSpent'] = $timeSpentOnPage;
+                }
+            }
+
+            if (isset($action['timeSpent'])) {
+                $action['timeSpentPretty'] = $formatter->getPrettyTimeFromSeconds($action['timeSpent'], true);
+            }
+
+            unset($action['timeSpentRef']); // not needed after timeSpent is added
+        }
+
+        $actions = $actionDetails;
+    }
+
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+        $formatter = new Formatter();
+
+        if ($action['type'] == Action::TYPE_EVENT) {
+            // Handle Event
+            if (strlen($action['pageTitle']) > 0) {
+                $action['eventName'] = $action['pageTitle'];
+            }
+
+            unset($action['pageTitle']);
+
+        } else {
+            if ($action['type'] == Action::TYPE_SITE_SEARCH) {
+                // Handle Site Search
+                $action['siteSearchKeyword'] = $action['pageTitle'];
+                unset($action['pageTitle']);
+            }
+        }
+
+        // Event value / Generation time
+        if ($action['type'] == Action::TYPE_EVENT) {
+            if (strlen($action['custom_float']) > 0) {
+                $action['eventValue'] = round($action['custom_float'], self::EVENT_VALUE_PRECISION);
+            }
+        } elseif (isset($action['custom_float']) && $action['custom_float'] > 0) {
+            $action['generationTimeMilliseconds'] = $action['custom_float'];
+            $action['generationTime'] = $formatter->getPrettyTimeFromSeconds($action['custom_float'] / 1000, true);
+        }
+        unset($action['custom_float']);
+
+        if ($action['type'] != Action::TYPE_EVENT) {
+            unset($action['eventCategory']);
+            unset($action['eventAction']);
+        }
+
+        if (array_key_exists('interaction_position', $action)) {
+            $action['interactionPosition'] = $action['interaction_position'];
+            unset($action['interaction_position']);
+        }
+
+        // Reconstruct url from prefix
+        if (array_key_exists('url', $action) && array_key_exists('url_prefix', $action)) {
+            $url = PageUrl::reconstructNormalizedUrl($action['url'], $action['url_prefix']);
+            $url = Common::unsanitizeInputValue($url);
+
+            $action['url'] = $url;
+            unset($action['url_prefix']);
+        }
+
+        switch ($action['type']) {
+            case 'goal':
+                $action['icon'] = 'plugins/Morpheus/images/goal.png';
+                break;
+            case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER:
+            case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART:
+                $action['icon'] = 'plugins/Morpheus/images/' . $action['type'] . '.png';
+                break;
+            case Action::TYPE_DOWNLOAD:
+                $action['type'] = 'download';
+                $action['icon'] = 'plugins/Morpheus/images/download.png';
+                break;
+            case Action::TYPE_OUTLINK:
+                $action['type'] = 'outlink';
+                $action['icon'] = 'plugins/Morpheus/images/link.png';
+                break;
+            case Action::TYPE_SITE_SEARCH:
+                $action['type'] = 'search';
+                $action['icon'] = 'plugins/Morpheus/images/search_ico.png';
+                break;
+            case Action::TYPE_PAGE_URL:
+            case '':
+                $action['type'] = 'action';
+                $action['icon'] = null;
+                break;
+        }
+
+        // Convert datetimes to the site timezone
+        $dateTimeVisit              = Date::factory($action['serverTimePretty'],
+            Site::getTimezoneFor($visitorDetails['idSite']));
+        $action['serverTimePretty'] = $dateTimeVisit->getLocalized(Date::DATETIME_FORMAT_SHORT);
+        $action['timestamp']        = $dateTimeVisit->getTimestamp();
+
+        unset($action['idlink_va']);
+    }
+
+    /**
+     * @param $idVisit
+     * @return array
+     * @throws \Exception
+     */
+    protected function queryActionsForVisits($idVisits)
+    {
+        $customFields = array();
+        $customJoins  = array();
+
+        Piwik::postEvent('Actions.getCustomActionDimensionFieldsAndJoins', array(&$customFields, &$customJoins));
+
+        $customFields = array_filter($customFields);
+        array_unshift($customFields, ''); // add empty element at first
+        $customActionDimensionFields = implode(', ', $customFields);
+
+        // The second join is a LEFT join to allow returning records that don't have a matching page title
+        // eg. Downloads, Outlinks. For these, idaction_name is set to 0
+        $sql           = "
+				SELECT
+					log_link_visit_action.idvisit,
+					COALESCE(log_action_event_category.type, log_action.type, log_action_title.type) AS type,
+					log_action.name AS url,
+					log_action.url_prefix,
+					log_action_title.name AS pageTitle,
+					log_action.idaction AS pageIdAction,
+					log_link_visit_action.idpageview,
+					log_link_visit_action.idlink_va,
+					log_link_visit_action.server_time as serverTimePretty,
+					log_link_visit_action.time_spent_ref_action as timeSpentRef,
+					log_link_visit_action.idlink_va AS pageId,
+					log_link_visit_action.custom_float,
+					log_link_visit_action.interaction_position
+					" . $customActionDimensionFields . "
+				FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action
+					ON  log_link_visit_action.idaction_url = log_action.idaction
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_title
+					ON  log_link_visit_action.idaction_name = log_action_title.idaction
+					" . implode(" ", $customJoins) . "
+				WHERE log_link_visit_action.idvisit IN ('" . implode("','", $idVisits) . "')
+				ORDER BY log_link_visit_action.idvisit, server_time ASC
+				 ";
+        $actionDetails = Db::fetchAll($sql);
+        return $actionDetails;
+    }
+
+
+    private $visitedPageUrls         = array();
+    private $siteSearchKeywords      = array();
+    private $pageGenerationTimeTotal = 0;
+
+    public function initProfile($visits, &$profile)
+    {
+        $this->visitedPageUrls               = array();
+        $this->siteSearchKeywords            = array();
+        $this->pageGenerationTimeTotal       = 0;
+        $profile['totalActions']             = 0;
+        $profile['totalOutlinks']            = 0;
+        $profile['totalDownloads']           = 0;
+        $profile['totalSearches']            = 0;
+        $profile['totalPageViews']           = 0;
+        $profile['totalUniquePageViews']     = 0;
+        $profile['totalRevisitedPages']      = 0;
+        $profile['totalPageViewsWithTiming'] = 0;
+        $profile['searches']                 = array();
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        $profile['totalActions'] += $visit->getColumn('actions');
+    }
+
+    public function handleProfileAction($action, &$profile)
+    {
+        $this->handleIfDownloadAction($action, $profile);
+        $this->handleIfOutlinkAction($action, $profile);
+        $this->handleIfSiteSearchAction($action, $profile);
+        $this->handleIfPageViewAction($action, $profile);
+        $this->handleIfPageGenerationTime($action, $profile);
+    }
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        arsort($this->visitedPageUrls);
+        $profile['visitedPages'] = $this->visitedPageUrls;
+
+        $this->handleSiteSearches($profile);
+        $this->handleAveragePageGenerationTime($profile);
+    }
+
+    /**
+     * @param $action
+     */
+    private function handleIfDownloadAction($action, &$profile)
+    {
+        if ($action['type'] != 'download') {
+            return;
+        }
+        $profile['totalDownloads']++;
+    }
+
+    /**
+     * @param $action
+     */
+    private function handleIfOutlinkAction($action, &$profile)
+    {
+        if ($action['type'] != 'outlink') {
+            return;
+        }
+        $profile['totalOutlinks']++;
+    }
+
+    /**
+     * @param $action
+     */
+    private function handleIfPageViewAction($action, &$profile)
+    {
+        if ($action['type'] != 'action') {
+            return;
+        }
+        $profile['totalPageViews']++;
+        $pageUrl = $action['url'];
+        if (!empty($pageUrl)) {
+            if (!array_key_exists($pageUrl, $this->visitedPageUrls)) {
+                $this->visitedPageUrls[$pageUrl] = 0;
+                $profile['totalUniquePageViews']++;
+            }
+            $this->visitedPageUrls[$pageUrl]++;
+            if ($this->visitedPageUrls[$pageUrl] == 2) {
+                $profile['totalRevisitedPages']++;
+            }
+        }
+    }
+
+    private function handleIfSiteSearchAction($action, &$profile)
+    {
+        if (!isset($action['siteSearchKeyword'])) {
+            return;
+        }
+        $keyword = $action['siteSearchKeyword'];
+
+        if (!isset($this->siteSearchKeywords[$keyword])) {
+            $this->siteSearchKeywords[$keyword] = 0;
+            ++$profile['totalSearches'];
+        }
+        ++$this->siteSearchKeywords[$keyword];
+    }
+
+    private function handleSiteSearches(&$profile)
+    {
+        // sort by visit/action
+        arsort($this->siteSearchKeywords);
+
+        foreach ($this->siteSearchKeywords as $keyword => $searchCount) {
+            $profile['searches'][] = array(
+                'keyword'  => $keyword,
+                'searches' => $searchCount
+            );
+        }
+    }
+
+    private function handleIfPageGenerationTime($action, &$profile)
+    {
+        if (isset($action['generationTimeMilliseconds'])) {
+            $this->pageGenerationTimeTotal += $action['generationTimeMilliseconds'];
+            ++$profile['totalPageViewsWithTiming'];
+        }
+    }
+
+    private function handleAveragePageGenerationTime(&$profile)
+    {
+        if ($profile['totalPageViewsWithTiming']) {
+            $profile['averagePageGenerationTime'] =
+                round($this->pageGenerationTimeTotal / (1000 * $profile['totalPageViewsWithTiming']), $precision = 3);
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index 91d219f81b..ab9fbff5f7 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -42,7 +42,9 @@
         "PagesReportDocumentation": "This report contains information about the page URLs that have been visited. %s The table is organized hierarchically, the URLs are displayed as a folder structure.",
         "PageTitlesReportDocumentation": "This report contains information about the titles of the pages that have been visited. %1$s The page title is the HTML %2$s Tag that most browsers show in their window title.",
         "PageUrls": "Page URLs",
+        "PageViewsByVisitor": "Number of times this page was viewed by this visitor across all visits",
         "PluginDescription": "Reports about the page views and page titles. Lets you measure your internal website's search engine. Automatically tracks clicks on external links and file downloads. ",
+        "RevisitedPages": "Pages viewed more than once",
         "SiteSearchCategories1": "This report lists the Categories that visitors selected when they made a Search on your website.",
         "SiteSearchCategories2": "For example, Ecommerce websites typically have a \"Category\" selector so that visitors can restrict their searches to all products in a specific Category.",
         "SiteSearchFollowingPagesDoc": "When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.",
diff --git a/plugins/Actions/templates/_profileSummary.twig b/plugins/Actions/templates/_profileSummary.twig
new file mode 100644
index 0000000000..fa30e694b8
--- /dev/null
+++ b/plugins/Actions/templates/_profileSummary.twig
@@ -0,0 +1,25 @@
+{% if visitorData.totalPageViews > 0 %}
+    <div class="visitor-profile-summary visitor-profile-pages">
+        <h1>{{ 'Actions_RevisitedPages'|translate }}</h1>
+        <div>
+            <ul>
+                {% for url,count in visitorData.visitedPages %}
+                    {% if loop.index < 6 and count > 1 %}
+                        <li><span class="repeat icon-refresh" title="{{ 'Actions_PageViewsByVisitor'|translate }}">{{ count }}</span>
+                            {% if url|trim|lower starts with 'javascript:' or
+                            url|trim|lower starts with 'vbscript:' or
+                            url|trim|lower starts with 'data:' %}
+                                {{ url }}
+                            {% else %}
+                                <a href="{{ url }}" rel="noreferrer" target="_blank"
+                                   class="action-list-url truncated-text-line">
+                                    {{ url|replace({'http://': '', 'https://': ''}) }}
+                                </a>
+                            {% endif %}
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/plugins/Bandwidth b/plugins/Bandwidth
-Subproject de61c39bd84ed3ba5fd5cf638238d097d41fce7
+Subproject 80960c0091e404db1a50d72ef7c064cd38b9033
diff --git a/plugins/Contents/Contents.php b/plugins/Contents/Contents.php
index 99e47bf8fd..289bdb25ec 100644
--- a/plugins/Contents/Contents.php
+++ b/plugins/Contents/Contents.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Contents;
 
+use Piwik\Common;
 use Piwik\Piwik;
 
 class Contents extends \Piwik\Plugin
@@ -21,6 +22,7 @@ class Contents extends \Piwik\Plugin
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
             'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
+            'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields'
         );
     }
 
@@ -41,4 +43,20 @@ class Contents extends \Piwik\Plugin
         $translations['nb_impressions'] = Piwik::translate('Contents_ImpressionsMetricDocumentation');
         $translations['nb_interactions'] = Piwik::translate('Contents_InteractionsMetricDocumentation');
     }
+
+    public function provideActionDimensionFields(&$fields, &$joins)
+    {
+        $fields[] = 'log_action_content_name.name as contentName';
+        $fields[] = 'log_action_content_piece.name as contentPiece';
+        $fields[] = 'log_action_content_target.name as contentTarget';
+        $fields[] = 'log_action_content_interaction.name as contentInteraction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_name
+					ON  log_link_visit_action.idaction_content_name = log_action_content_name.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_piece
+					ON  log_link_visit_action.idaction_content_piece = log_action_content_piece.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_target
+					ON  log_link_visit_action.idaction_content_target = log_action_content_target.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_interaction
+					ON  log_link_visit_action.idaction_content_interaction = log_action_content_interaction.idaction';
+    }
 }
diff --git a/plugins/Contents/VisitorDetails.php b/plugins/Contents/VisitorDetails.php
new file mode 100644
index 0000000000..acf3363d38
--- /dev/null
+++ b/plugins/Contents/VisitorDetails.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Contents;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Tracker\Action;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            unset($action['contentName']);
+            unset($action['contentPiece']);
+            unset($action['contentTarget']);
+            unset($action['contentInteraction']);
+        }
+    }
+
+    public function renderAction($action, $previousAction, $visitorDetails)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            return;
+        }
+
+        $view                 = new View('@Contents/_actionContent.twig');
+        $view->action         = $action;
+        $view->previousAction = $previousAction;
+        $view->visitInfo      = $visitorDetails;
+        return $view->render();
+    }
+
+    public function renderActionTooltip($action, $visitInfo)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            return [];
+        }
+
+        $view         = new View('@Contents/_actionTooltip');
+        $view->action = $action;
+        return [[ 10, $view->render() ]];
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json
index 915b9d9746..0947590f69 100644
--- a/plugins/Contents/lang/en.json
+++ b/plugins/Contents/lang/en.json
@@ -2,6 +2,7 @@
     "Contents": {
         "PluginDescription": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).",
         "Impressions": "Impressions",
+        "ContentImpression": "Content Impression",
         "ContentInteraction": "Content Interaction",
         "ContentInteractions": "Content Interactions",
         "InteractionRate": "Interaction Rate",
diff --git a/plugins/Contents/templates/_actionContent.twig b/plugins/Contents/templates/_actionContent.twig
new file mode 100644
index 0000000000..138f0e350e
--- /dev/null
+++ b/plugins/Contents/templates/_actionContent.twig
@@ -0,0 +1,15 @@
+<li class="content"
+    title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {% if action.contentInteraction %}
+        <span class="icon-document action-list-action-icon" title="{{ 'Contents_ContentInteraction'|translate }}"></span>
+        {% else %}
+        <span class="icon-show action-list-action-icon" title="{{ 'Contents_ContentImpression'|translate }}"></span>
+        {% endif %}
+        {% if action.contentInteraction %}
+            [{{ action.contentInteraction }}]
+        {% endif %}
+        {{ action.contentName }} -
+        {{ action.contentPiece }}
+    </div>
+</li>
diff --git a/plugins/Contents/templates/_actionTooltip.twig b/plugins/Contents/templates/_actionTooltip.twig
new file mode 100644
index 0000000000..c81c6883b4
--- /dev/null
+++ b/plugins/Contents/templates/_actionTooltip.twig
@@ -0,0 +1,9 @@
+{% if action.contentName %}
+
+{{ 'Contents_ContentName'|translate }}: {{ action.contentName }}{% endif %}{% if action.contentPiece %}
+
+{{ 'Contents_ContentPiece'|translate }}: {{ action.contentPiece }}{% endif %}{% if action.contentTarget %}
+
+{{ 'Contents_ContentTarget'|translate }}: {{ action.contentTarget }}{% endif %}{% if action.contentInteraction %}
+
+{{ 'Contents_ContentInteraction'|translate }}: {{ action.contentInteraction }}{% endif %}
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index fd3e729f74..be56c144f8 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -30,7 +30,6 @@ class CoreHome extends \Piwik\Plugin
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
             'AssetManager.filterMergedJavaScripts'   => 'filterMergedJavaScripts',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
-            'Live.getAllVisitorDetails'              => 'extendVisitorDetails',
         );
     }
 
@@ -39,25 +38,6 @@ class CoreHome extends \Piwik\Plugin
         $mergedContent = preg_replace('/(sourceMappingURL=(.*?).map)/', '', $mergedContent);
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['userId']                      = $instance->getUserId();
-        $visitor['visitorType']                 = $instance->getVisitorReturning();
-        $visitor['visitorTypeIcon']             = $instance->getVisitorReturningIcon();
-        $visitor['visitConverted']              = $instance->isVisitorGoalConverted();
-        $visitor['visitConvertedIcon']          = $instance->getVisitorGoalConvertedIcon();
-        $visitor['visitCount']                  = $instance->getVisitCount();
-        $visitor['firstActionTimestamp']        = $instance->getTimestampFirstAction();
-        $visitor['visitEcommerceStatus']        = $instance->getVisitEcommerceStatus();
-        $visitor['visitEcommerceStatusIcon']    = $instance->getVisitEcommerceStatusIcon();
-        $visitor['daysSinceFirstVisit']         = $instance->getDaysSinceFirstVisit();
-        $visitor['daysSinceLastEcommerceOrder'] = $instance->getDaysSinceLastEcommerceOrder();
-        $visitor['visitDuration']               = $instance->getVisitLength();
-        $visitor['visitDurationPretty']         = $instance->getVisitLengthPretty();
-    }
-
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css";
diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php
deleted file mode 100644
index 962eabce31..0000000000
--- a/plugins/CoreHome/Visitor.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\CoreHome;
-
-use Piwik\Metrics\Formatter;
-use Piwik\Plugins\CoreHome\Columns\VisitGoalBuyer;
-
-class Visitor
-{
-    private $details = array();
-    private $metricsFormatter = null;
-
-    public function __construct($details)
-    {
-        $this->details = $details;
-        $this->metricsFormatter = new Formatter();
-    }
-
-    function getTimestampFirstAction()
-    {
-        return strtotime($this->details['visit_first_action_time']);
-    }
-
-    function getVisitEcommerceStatusIcon()
-    {
-        $status = $this->getVisitEcommerceStatus();
-
-        if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) {
-            return "plugins/Morpheus/images/ecommerceOrder.png";
-        } elseif ($status == 'abandonedCart') {
-            return "plugins/Morpheus/images/ecommerceAbandonedCart.png";
-        }
-        // Note: it is important that there is no icon when there was no ecommerce conversion
-        return null;
-    }
-
-    function getVisitEcommerceStatus()
-    {
-        return VisitGoalBuyer::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']);
-    }
-
-    function isVisitorGoalConverted()
-    {
-        return $this->details['visit_goal_converted'];
-    }
-
-    function getVisitorGoalConvertedIcon()
-    {
-        return $this->isVisitorGoalConverted()
-            ? "plugins/Morpheus/images/goal.png"
-            : null;
-    }
-
-    function getDaysSinceFirstVisit()
-    {
-        return $this->details['visitor_days_since_first'];
-    }
-
-    function getDaysSinceLastEcommerceOrder()
-    {
-        return $this->details['visitor_days_since_order'];
-    }
-
-    function getVisitorReturning()
-    {
-        $type = $this->details['visitor_returning'];
-        return $type == 2
-            ? 'returningCustomer'
-            : ($type == 1
-                ? 'returning'
-                : 'new');
-    }
-
-    function getVisitorReturningIcon()
-    {
-        $type = $this->getVisitorReturning();
-        if ($type == 'returning'
-            || $type == 'returningCustomer'
-        ) {
-            return "plugins/Live/images/returningVisitor.png";
-        }
-        return null;
-    }
-
-    function getVisitCount()
-    {
-        return $this->details['visitor_count_visits'];
-    }
-
-    function getVisitLength()
-    {
-        return $this->details['visit_total_time'];
-    }
-
-    function getVisitLengthPretty()
-    {
-        return $this->metricsFormatter->getPrettyTimeFromSeconds($this->details['visit_total_time'], true);
-    }
-
-    function getUserId()
-    {
-        if (isset($this->details['user_id'])
-            && strlen($this->details['user_id']) > 0) {
-            return $this->details['user_id'];
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/plugins/CoreHome/VisitorDetails.php b/plugins/CoreHome/VisitorDetails.php
new file mode 100644
index 0000000000..88ae63a09c
--- /dev/null
+++ b/plugins/CoreHome/VisitorDetails.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CoreHome;
+
+use Piwik\Metrics\Formatter;
+use Piwik\Plugins\CoreHome\Columns\VisitGoalBuyer;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['userId']                      = $this->getUserId();
+        $visitor['visitorType']                 = $this->getVisitorReturning();
+        $visitor['visitorTypeIcon']             = $this->getVisitorReturningIcon();
+        $visitor['visitConverted']              = $this->isVisitorGoalConverted();
+        $visitor['visitConvertedIcon']          = $this->getVisitorGoalConvertedIcon();
+        $visitor['visitCount']                  = $this->getVisitCount();
+        $visitor['visitEcommerceStatus']        = $this->getVisitEcommerceStatus();
+        $visitor['visitEcommerceStatusIcon']    = $this->getVisitEcommerceStatusIcon();
+        $visitor['daysSinceFirstVisit']         = $this->getDaysSinceFirstVisit();
+        $visitor['daysSinceLastEcommerceOrder'] = $this->getDaysSinceLastEcommerceOrder();
+        $visitor['visitDuration']               = $this->getVisitLength();
+        $visitor['visitDurationPretty']         = $this->getVisitLengthPretty();
+    }
+
+    protected function getVisitEcommerceStatusIcon()
+    {
+        $status = $this->getVisitEcommerceStatus();
+
+        if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) {
+            return "plugins/Morpheus/images/ecommerceOrder.png";
+        } elseif ($status == 'abandonedCart') {
+            return "plugins/Morpheus/images/ecommerceAbandonedCart.png";
+        }
+        // Note: it is important that there is no icon when there was no ecommerce conversion
+        return null;
+    }
+
+    protected function getVisitEcommerceStatus()
+    {
+        return VisitGoalBuyer::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']);
+    }
+
+    protected function isVisitorGoalConverted()
+    {
+        return $this->details['visit_goal_converted'];
+    }
+
+    protected function getVisitorGoalConvertedIcon()
+    {
+        return $this->isVisitorGoalConverted()
+            ? "plugins/Morpheus/images/goal.png"
+            : null;
+    }
+
+    protected function getDaysSinceFirstVisit()
+    {
+        return $this->details['visitor_days_since_first'];
+    }
+
+    protected function getDaysSinceLastEcommerceOrder()
+    {
+        return $this->details['visitor_days_since_order'];
+    }
+
+    protected function getVisitorReturning()
+    {
+        $type = $this->details['visitor_returning'];
+        return $type == 2
+            ? 'returningCustomer'
+            : ($type == 1
+                ? 'returning'
+                : 'new');
+    }
+
+    protected function getVisitorReturningIcon()
+    {
+        $type = $this->getVisitorReturning();
+        if ($type == 'returning'
+            || $type == 'returningCustomer'
+        ) {
+            return "plugins/Live/images/returningVisitor.png";
+        }
+        return null;
+    }
+
+    protected function getVisitCount()
+    {
+        return $this->details['visitor_count_visits'];
+    }
+
+    protected function getVisitLength()
+    {
+        return $this->details['visit_total_time'];
+    }
+
+    protected function getVisitLengthPretty()
+    {
+        $formatter = new Formatter();
+        return $formatter->getPrettyTimeFromSeconds($this->details['visit_total_time'], true);
+    }
+
+    protected function getUserId()
+    {
+        if (isset($this->details['user_id'])
+            && strlen($this->details['user_id']) > 0
+        ) {
+            return $this->details['user_id'];
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
-Subproject 122175590067b87b04010e928a35e85e9c011e2
+Subproject 5679c533d3686b8df955f156d259c3d90fe2f80
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 78a779e5f9..e5a13bc52a 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -20,10 +20,10 @@ class CustomVariables extends \Piwik\Plugin
     public function registerEvents()
     {
         return array(
-            'Live.getAllVisitorDetails'       => 'extendVisitorDetails',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
             'AssetManager.getStylesheetFiles'  => 'getStylesheetFiles',
+            'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields'
         );
     }
 
@@ -37,24 +37,6 @@ class CustomVariables extends \Piwik\Plugin
         Model::uninstall();
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $customVariables = array();
-
-        $maxCustomVariables = self::getNumUsableCustomVariables();
-
-        for ($i = 1; $i <= $maxCustomVariables; $i++) {
-            if (!empty($details['custom_var_k' . $i])) {
-                $customVariables[$i] = array(
-                    'customVariableName' .  $i => $details['custom_var_k' . $i],
-                    'customVariableValue' . $i => $details['custom_var_v' . $i],
-                );
-            }
-        }
-
-        $visitor['customVariables'] = $customVariables;
-    }
-
     /**
      * There are also some hardcoded places in JavaScript
      * @return int
@@ -136,4 +118,13 @@ class CustomVariables extends \Piwik\Plugin
         $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js";
     }
 
+    public function provideActionDimensionFields(&$fields, &$joins)
+    {
+        $maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
+
+        for ($i = 1; $i <= $maxCustomVariables; $i++) {
+            $fields[] = 'custom_var_k' . $i;
+            $fields[] = 'custom_var_v' . $i;
+        }
+    }
 }
diff --git a/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php b/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php
new file mode 100644
index 0000000000..8bab78187e
--- /dev/null
+++ b/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\CustomVariables\ProfileSummary;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugins\CustomVariables\Model;
+use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract;
+use Piwik\View;
+
+/**
+ * Class VisitScopeSummary
+ *
+ * @api
+ */
+class VisitScopeSummary extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('CustomVariables_CustomVariables') . ' ' . Piwik::translate('General_TrackingScopeVisit');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        if (empty($this->profile['customVariables']) || empty($this->profile['customVariables'][Model::SCOPE_VISIT])) {
+            return '';
+        }
+
+        $view              = new View('@CustomVariables/_profileSummary.twig');
+        $view->visitorData = $this->profile;
+        $view->scopeName   = Piwik::translate('General_TrackingScopeVisit');
+        $view->variables   = $this->profile['customVariables'][Model::SCOPE_VISIT];
+        return $view->render();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 15;
+    }
+}
\ No newline at end of file
diff --git a/plugins/CustomVariables/VisitorDetails.php b/plugins/CustomVariables/VisitorDetails.php
new file mode 100644
index 0000000000..e90af8e3c1
--- /dev/null
+++ b/plugins/CustomVariables/VisitorDetails.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CustomVariables;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $customVariables = array();
+
+        $maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
+
+        for ($i = 1; $i <= $maxCustomVariables; $i++) {
+            if (!empty($this->details['custom_var_k' . $i])) {
+                $customVariables[$i] = array(
+                    'customVariableName' . $i  => $this->details['custom_var_k' . $i],
+                    'customVariableValue' . $i => $this->details['custom_var_v' . $i],
+                );
+            }
+        }
+
+        $visitor['customVariables'] = $customVariables;
+    }
+
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+        $maxCustomVariables  = CustomVariables::getNumUsableCustomVariables();
+        $customVariablesPage = array();
+
+        for ($i = 1; $i <= $maxCustomVariables; $i++) {
+            if (!empty($action['custom_var_k' . $i])) {
+                $cvarKey                 = $action['custom_var_k' . $i];
+                $cvarKey                 = static::getCustomVariablePrettyKey($cvarKey);
+                $customVariablesPage[$i] = array(
+                    'customVariablePageName' . $i  => $cvarKey,
+                    'customVariablePageValue' . $i => $action['custom_var_v' . $i],
+                );
+            }
+            unset($action['custom_var_k' . $i]);
+            unset($action['custom_var_v' . $i]);
+        }
+        if (!empty($customVariablesPage)) {
+            $action['customVariables'] = $customVariablesPage;
+        }
+    }
+
+    public function renderActionTooltip($action, $visitInfo)
+    {
+        if (empty($action['customVariables'])) {
+            return [];
+        }
+
+        $view         = new View('@CustomVariables/_actionTooltip');
+        $view->action = $action;
+        return [[ 40, $view->render() ]];
+    }
+
+    public function renderVisitorDetails($visitInfo)
+    {
+        $view            = new View('@CustomVariables/_visitorDetails');
+        $view->visitInfo = $visitInfo;
+        return [[ 50, $view->render() ]];
+    }
+
+    private static function getCustomVariablePrettyKey($key)
+    {
+        $rename = array(
+            ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY => Piwik::translate('Actions_ColumnSearchCategory'),
+            ActionSiteSearch::CVAR_KEY_SEARCH_COUNT    => Piwik::translate('Actions_ColumnSearchResultsCount'),
+        );
+        if (isset($rename[$key])) {
+            return $rename[$key];
+        }
+        return $key;
+    }
+
+
+    protected $customVariables = [];
+
+    public function initProfile($visits, &$profile)
+    {
+        $this->customVariables = [
+            Model::SCOPE_PAGE => [],
+            Model::SCOPE_VISIT  => [],
+        ];
+    }
+
+    public function handleProfileAction($action, &$profile)
+    {
+        if (empty($action['customVariables'])) {
+            return;
+        }
+
+        foreach ($action['customVariables'] as $index => $customVariable) {
+
+            $scope = Model::SCOPE_PAGE;
+            $name = $customVariable['customVariablePageName'.$index];
+            $value = $customVariable['customVariablePageValue'.$index];
+
+            if (empty($value)) {
+                continue;
+            }
+
+            if (!array_key_exists($name, $this->customVariables[$scope])) {
+                $this->customVariables[$scope][$name] = [];
+            }
+
+            if (!array_key_exists($value, $this->customVariables[$scope][$name])) {
+                $this->customVariables[$scope][$name][$value] = 0;
+            }
+
+            $this->customVariables[$scope][$name][$value]++;
+        }
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        if (empty($visit['customVariables'])) {
+            return;
+        }
+
+        foreach ($visit['customVariables'] as $index => $customVariable) {
+
+            $scope = Model::SCOPE_VISIT;
+            $name = $customVariable['customVariableName'.$index];
+            $value = $customVariable['customVariableValue'.$index];
+
+            if (empty($value)) {
+                continue;
+            }
+
+            if (!array_key_exists($name, $this->customVariables[$scope])) {
+                $this->customVariables[$scope][$name] = [];
+            }
+
+            if (!array_key_exists($value, $this->customVariables[$scope][$name])) {
+                $this->customVariables[$scope][$name][$value] = 0;
+            }
+
+            $this->customVariables[$scope][$name][$value]++;
+        }
+    }
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        $customVariables = $this->customVariables;
+        foreach ($customVariables as $scope => &$variables) {
+
+            if (empty($variables)) {
+                unset($customVariables[$scope]);
+                continue;
+            }
+
+            foreach ($variables AS $name => &$values) {
+                arsort($values);
+            }
+        }
+        if (!empty($customVariables)) {
+
+            $profile['customVariables'] = $this->convertForProfile($customVariables);
+        }
+    }
+
+    protected function convertForProfile($customVariables)
+    {
+        $convertedVariables = [];
+
+        foreach ($customVariables as $scope => $scopeVariables) {
+
+            $convertedVariables[$scope] = [];
+
+            foreach ($scopeVariables as $name => $values) {
+
+                $variable = [
+                    'name' => $name,
+                    'values' => []
+                ];
+
+                foreach ($values as $value => $count) {
+                    $variable['values'][] = [
+                        'value' => $value,
+                        'count' => $count
+                    ];
+                }
+
+                $convertedVariables[$scope][] = $variable;
+            }
+        }
+
+        return $convertedVariables;
+    }
+}
\ No newline at end of file
diff --git a/plugins/CustomVariables/templates/_actionTooltip.twig b/plugins/CustomVariables/templates/_actionTooltip.twig
new file mode 100644
index 0000000000..52084a4be5
--- /dev/null
+++ b/plugins/CustomVariables/templates/_actionTooltip.twig
@@ -0,0 +1,10 @@
+{% if action.customVariables is defined %}
+
+    {{ 'CustomVariables_CustomVariables'|translate }}:{% for id,customVariable in action.customVariables %}
+        {% set name = 'customVariablePageName' ~ id %}
+        {% set value = 'customVariablePageValue' ~ id %}
+
+        {# line break above is important #}
+        - {{ customVariable[name]|raw }} {% if customVariable[value]|length > 0 %} = {{ customVariable[value]|raw }}{% endif %}
+    {% endfor %}
+{% endif -%}
\ No newline at end of file
diff --git a/plugins/CustomVariables/templates/_profileSummary.twig b/plugins/CustomVariables/templates/_profileSummary.twig
new file mode 100644
index 0000000000..3540faf5c6
--- /dev/null
+++ b/plugins/CustomVariables/templates/_profileSummary.twig
@@ -0,0 +1,13 @@
+<div class="visitor-profile-summary visitor-profile-customvariables">
+    <h1>{{ 'CustomVariables_CustomVariables'|translate }} ({{ scopeName }})</h1>
+    <div>
+        {%- for variable in variables -%}
+            <p>
+                <span>{{ variable.name }}: </span>
+                {%- for value in variable.values -%}
+                    <strong title="{{ value.count }}x">{{ value.value }}</strong>{% if not loop.last %}, {% endif %}
+                {%- endfor -%}
+            </p>
+        {%- endfor -%}
+    </div>
+</div>
diff --git a/plugins/CustomVariables/templates/_visitorDetails.twig b/plugins/CustomVariables/templates/_visitorDetails.twig
new file mode 100644
index 0000000000..df26da450d
--- /dev/null
+++ b/plugins/CustomVariables/templates/_visitorDetails.twig
@@ -0,0 +1,13 @@
+{% if visitInfo.getColumn('customVariables') %}
+    <div class="visitorCustomVariables">
+    {% for id,customVariable in visitInfo.getColumn('customVariables') %}
+        {% set name='customVariableName' ~ id %}
+        {% set value='customVariableValue' ~ id %}
+        <br/>
+        <abbr class="visitorLogTooltip" title="{{ 'CustomVariables_CustomVariables'|translate }} ({{ 'CustomVariables_Index'|translate }} {{ id }})">
+            {{ customVariable[name]|truncate(30) }}
+        </abbr>
+        {% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %}
+    {% endfor %}
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
index a9d67a0691..5357171fef 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -23,7 +23,12 @@
 				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Name_PAGE_1</customVariablePageName1>
@@ -58,9 +63,7 @@
 						<customVariablePageValue8>Val_PAGE8</customVariablePageValue8>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -91,7 +94,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>this keyword should be ranked</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;source=web&amp;cd=1&amp;ved=0CB4QFjAA&amp;url=http://piwik.org/&amp;rct=j&amp;q=this keyword should be ranked&amp;ei=V8WfTePkKKLfiALrpZWGAw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -112,6 +115,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -177,16 +186,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/DevicePlugins/DevicePlugins.php b/plugins/DevicePlugins/DevicePlugins.php
index fdf91ff464..2d7bab595f 100644
--- a/plugins/DevicePlugins/DevicePlugins.php
+++ b/plugins/DevicePlugins/DevicePlugins.php
@@ -25,18 +25,9 @@ class DevicePlugins extends \Piwik\Plugin
     {
         return array(
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
-            'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
         );
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['plugins']                  = $instance->getPlugins();
-        $visitor['pluginsIcons']             = $instance->getPluginIcons();
-    }
-
     public function addMetricTranslations(&$translations)
     {
         $metrics = array(
diff --git a/plugins/DevicePlugins/Visitor.php b/plugins/DevicePlugins/VisitorDetails.php
index d254265974..04620c0e31 100644
--- a/plugins/DevicePlugins/Visitor.php
+++ b/plugins/DevicePlugins/VisitorDetails.php
@@ -2,26 +2,27 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\DevicePlugins;
 
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
 
-class Visitor
+class VisitorDetails extends VisitorDetailsAbstract
 {
     const DELIMITER_PLUGIN_NAME = ", ";
 
-    private $details = array();
-
-    public function __construct($details)
+    public function extendVisitorDetails(&$visitor)
     {
-        $this->details = $details;
+        $visitor['plugins']      = $this->getPlugins();
+        $visitor['pluginsIcons'] = $this->getPluginIcons();
     }
 
-    function getPlugins()
+    protected function getPlugins()
     {
         $plugins = array();
         $columns = DevicePlugins::getAllPluginColumns();
@@ -42,7 +43,7 @@ class Visitor
         return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames);
     }
 
-    function getPluginIcons()
+    protected function getPluginIcons()
     {
         $pluginNames = $this->getPlugins();
         if (!empty($pluginNames)) {
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 2a3f074017..ab36c9fe2d 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,42 +9,8 @@
 
 namespace Piwik\Plugins\DevicesDetection;
 
-use Piwik\ArchiveProcessor;
-use Piwik\Db;
-
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
 class DevicesDetection extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails' => 'extendVisitorDetails',
-        );
-    }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['deviceType']               = $instance->getDeviceType();
-        $visitor['deviceTypeIcon']           = $instance->getDeviceTypeIcon();
-        $visitor['deviceBrand']              = $instance->getDeviceBrand();
-        $visitor['deviceModel']              = $instance->getDeviceModel();
-        $visitor['operatingSystem']          = $instance->getOperatingSystem();
-        $visitor['operatingSystemName']      = $instance->getOperatingSystemName();
-        $visitor['operatingSystemIcon']      = $instance->getOperatingSystemIcon();
-        $visitor['operatingSystemCode']      = $instance->getOperatingSystemCode();
-        $visitor['operatingSystemVersion']   = $instance->getOperatingSystemVersion();
-        $visitor['browserFamily']            = $instance->getBrowserEngine();
-        $visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription();
-        $visitor['browser']                  = $instance->getBrowser();
-        $visitor['browserName']              = $instance->getBrowserName();
-        $visitor['browserIcon']              = $instance->getBrowserIcon();
-        $visitor['browserCode']              = $instance->getBrowserCode();
-        $visitor['browserVersion']           = $instance->getBrowserVersion();
-    }
 }
diff --git a/plugins/DevicesDetection/ProfileSummary/DevicesSummary.php b/plugins/DevicesDetection/ProfileSummary/DevicesSummary.php
new file mode 100644
index 0000000000..7d61784cf1
--- /dev/null
+++ b/plugins/DevicesDetection/ProfileSummary/DevicesSummary.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\DevicesDetection\ProfileSummary;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract;
+use Piwik\View;
+
+/**
+ * Class DevicesSummary
+ *
+ * @api
+ */
+class DevicesSummary extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('DevicesDetection_Devices');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        if (empty($this->profile['devices'])) {
+            return '';
+        }
+
+        $view              = new View('@DevicesDetection/_profileSummary.twig');
+        $view->visitorData = $this->profile;
+        return $view->render();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 50;
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php
deleted file mode 100644
index af05191995..0000000000
--- a/plugins/DevicesDetection/Visitor.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\DevicesDetection;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
-
-class Visitor
-{
-    private $details = array();
-
-    public function __construct($details)
-    {
-        $this->details = $details;
-    }
-
-    public function getDeviceType()
-    {
-        return getDeviceTypeLabel($this->details['config_device_type']);
-    }
-
-    public function getDeviceTypeIcon()
-    {
-        return getDeviceTypeLogo($this->details['config_device_type']);
-    }
-
-    public function getDeviceBrand()
-    {
-        return getDeviceBrandLabel($this->details['config_device_brand']);
-    }
-
-    public function getDeviceModel()
-    {
-        return $this->details['config_device_model'];
-    }
-
-    public function getOperatingSystemCode()
-    {
-        return $this->details['config_os'];
-    }
-
-    public function getOperatingSystem()
-    {
-        return getOsFullName($this->details['config_os'] . ";" . $this->details['config_os_version']);
-    }
-
-    public function getOperatingSystemName()
-    {
-        return getOsFullName($this->details['config_os']);
-    }
-
-    public function getOperatingSystemVersion()
-    {
-        return $this->details['config_os_version'];
-    }
-
-    public function getOperatingSystemIcon()
-    {
-        return getOsLogo($this->details['config_os']);
-    }
-
-    public function getBrowserEngineDescription()
-    {
-        return getBrowserEngineName($this->getBrowserEngine());
-    }
-
-    public function getBrowserEngine()
-    {
-        return $this->details['config_browser_engine'];
-    }
-
-    public function getBrowserCode()
-    {
-        return $this->details['config_browser_name'];
-    }
-
-    public function getBrowserVersion()
-    {
-        return $this->details['config_browser_version'];
-    }
-
-    public function getBrowser()
-    {
-        return getBrowserNameWithVersion($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
-    }
-
-    public function getBrowserName()
-    {
-        return getBrowserName($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
-    }
-
-    public function getBrowserIcon()
-    {
-        return getBrowserLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
-    }
-}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/VisitorDetails.php b/plugins/DevicesDetection/VisitorDetails.php
new file mode 100644
index 0000000000..d358c2d1ef
--- /dev/null
+++ b/plugins/DevicesDetection/VisitorDetails.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicesDetection;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\View;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['deviceType']               = $this->getDeviceType();
+        $visitor['deviceTypeIcon']           = $this->getDeviceTypeIcon();
+        $visitor['deviceBrand']              = $this->getDeviceBrand();
+        $visitor['deviceModel']              = $this->getDeviceModel();
+        $visitor['operatingSystem']          = $this->getOperatingSystem();
+        $visitor['operatingSystemName']      = $this->getOperatingSystemName();
+        $visitor['operatingSystemIcon']      = $this->getOperatingSystemIcon();
+        $visitor['operatingSystemCode']      = $this->getOperatingSystemCode();
+        $visitor['operatingSystemVersion']   = $this->getOperatingSystemVersion();
+        $visitor['browserFamily']            = $this->getBrowserEngine();
+        $visitor['browserFamilyDescription'] = $this->getBrowserEngineDescription();
+        $visitor['browser']                  = $this->getBrowser();
+        $visitor['browserName']              = $this->getBrowserName();
+        $visitor['browserIcon']              = $this->getBrowserIcon();
+        $visitor['browserCode']              = $this->getBrowserCode();
+        $visitor['browserVersion']           = $this->getBrowserVersion();
+    }
+
+    protected function getDeviceType()
+    {
+        return getDeviceTypeLabel($this->details['config_device_type']);
+    }
+
+    protected function getDeviceTypeIcon()
+    {
+        return getDeviceTypeLogo($this->details['config_device_type']);
+    }
+
+    protected function getDeviceBrand()
+    {
+        return getDeviceBrandLabel($this->details['config_device_brand']);
+    }
+
+    protected function getDeviceModel()
+    {
+        return $this->details['config_device_model'];
+    }
+
+    protected function getOperatingSystemCode()
+    {
+        return $this->details['config_os'];
+    }
+
+    protected function getOperatingSystem()
+    {
+        return getOsFullName($this->details['config_os'] . ";" . $this->details['config_os_version']);
+    }
+
+    protected function getOperatingSystemName()
+    {
+        return getOsFullName($this->details['config_os']);
+    }
+
+    protected function getOperatingSystemVersion()
+    {
+        return $this->details['config_os_version'];
+    }
+
+    protected function getOperatingSystemIcon()
+    {
+        return getOsLogo($this->details['config_os']);
+    }
+
+    protected function getBrowserEngineDescription()
+    {
+        return getBrowserEngineName($this->getBrowserEngine());
+    }
+
+    protected function getBrowserEngine()
+    {
+        return $this->details['config_browser_engine'];
+    }
+
+    protected function getBrowserCode()
+    {
+        return $this->details['config_browser_name'];
+    }
+
+    protected function getBrowserVersion()
+    {
+        return $this->details['config_browser_version'];
+    }
+
+    protected function getBrowser()
+    {
+        return getBrowserNameWithVersion($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
+    }
+
+    protected function getBrowserName()
+    {
+        return getBrowserName($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
+    }
+
+    protected function getBrowserIcon()
+    {
+        return getBrowserLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
+    }
+
+
+    private $devices = array();
+
+    public function initProfile($visits, &$profile)
+    {
+        $this->devices = array();
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        $deviceType     = $visit->getColumn('deviceType');
+        $deviceTypeIcon = $visit->getColumn('deviceTypeIcon');
+        $deviceBrand    = $visit->getColumn('deviceBrand');
+        $deviceModel    = $visit->getColumn('deviceModel');
+        $deviceName     = trim($deviceBrand . " " . $deviceModel);
+
+        if (!isset($this->devices[$deviceType])) {
+            $this->devices[$deviceType] = array(
+                'count'   => 0,
+                'icon'    => $deviceTypeIcon,
+                'devices' => array()
+            );
+        }
+
+        ++$this->devices[$deviceType]['count'];
+
+        if (!isset($this->devices[$deviceType]['devices'][$deviceName])) {
+            $this->devices[$deviceType]['devices'][$deviceName] = 0;
+        }
+
+        ++$this->devices[$deviceType]['devices'][$deviceName];
+    }
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        $devices = $this->devices;
+        uksort($this->devices, function($a, $b) use ($devices) {
+            $cmp = strcmp($devices[$b]['count'], $devices[$a]['count']);
+            if (0 == $cmp) {
+                $cmp = strcmp($a, $b);
+            }
+            return $cmp;
+        });
+
+        foreach ($this->devices as $type => $devicesData) {
+            $typeDevices = [];
+            foreach ($devicesData['devices'] as $name => $count) {
+                $typeDevices[] = [
+                    'name'  => $name,
+                    'count' => $count
+                ];
+            }
+            $this->devices[$type]['devices'] = $typeDevices;
+        }
+
+        $profile['devices'] = $this->devices;
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json
index 1322f582ab..7015cefe04 100644
--- a/plugins/DevicesDetection/lang/en.json
+++ b/plugins/DevicesDetection/lang/en.json
@@ -38,6 +38,7 @@
         "Phablet": "Phablet",
         "TV": "Tv",
         "UserAgent": "User-Agent",
+        "XVisitsFromDevices": "%1$s visits from %2$s devices",
         "WidgetBrowsers": "Visitor Browser",
         "WidgetBrowsersDocumentation": "This report contains information about what kind of browser your visitors were using. Each browser version is listed separately."
     }
diff --git a/plugins/DevicesDetection/templates/_profileSummary.twig b/plugins/DevicesDetection/templates/_profileSummary.twig
new file mode 100644
index 0000000000..05348864c5
--- /dev/null
+++ b/plugins/DevicesDetection/templates/_profileSummary.twig
@@ -0,0 +1,21 @@
+{% if visitorData.devices is defined %}
+    <div class="visitor-profile-summary visitor-profile-devices">
+        <h1>{{ 'DevicesDetection_Devices'|translate }}</h1>
+        <div>
+            {%- for type,entry in visitorData.devices -%}
+                <p>
+                    <img height="16" src="{{ entry.icon }}" />
+                    {% if entry.devices|length == 1 and 'General_Unknown'|translate in entry.devices[0].name %}
+                        <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ type ~ '</strong>')|raw }}
+                    {% else %}
+                    <span>{{ 'DevicesDetection_XVisitsFromDevices'|translate('<strong>' ~ entry.count ~ '</strong>', '<strong>' ~ type ~ '</strong>')|raw }}:
+                        {% for device in entry.devices -%}
+                            {{ device.name }} ({{ device.count }}x){% if not loop.last %}, {% endif %}
+                        {%- endfor -%}
+                    </span>
+                    {% endif %}
+                </p>
+            {%- endfor -%}
+        </div>
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/plugins/Ecommerce/ProfileSummary/EcommerceSummary.php b/plugins/Ecommerce/ProfileSummary/EcommerceSummary.php
new file mode 100644
index 0000000000..5761549aaf
--- /dev/null
+++ b/plugins/Ecommerce/ProfileSummary/EcommerceSummary.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Ecommerce\ProfileSummary;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract;
+use Piwik\View;
+
+/**
+ * Class EcommerceSummary
+ *
+ * @api
+ */
+class EcommerceSummary extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('Goals_Ecommerce');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        if (empty($this->profile['totalEcommerceRevenue'])) {
+            return '';
+        }
+
+        $view              = new View('@Ecommerce/_profileSummary.twig');
+        $view->idSite      = Common::getRequestVar('idSite', null, 'int');
+        $view->visitorData = $this->profile;
+        return $view->render();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 20;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/VisitorDetails.php b/plugins/Ecommerce/VisitorDetails.php
new file mode 100644
index 0000000000..f04f38f01d
--- /dev/null
+++ b/plugins/Ecommerce/VisitorDetails.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce;
+
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\DataAccess\LogAggregator;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Site;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\PageUrl;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $ecommerceMetrics                     = $this->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($visitor['idSite'],
+            $visitor['visitorId']);
+        $visitor['totalEcommerceRevenue']     = $ecommerceMetrics['totalEcommerceRevenue'];
+        $visitor['totalEcommerceConversions'] = $ecommerceMetrics['totalEcommerceConversions'];
+        $visitor['totalEcommerceItems']       = $ecommerceMetrics['totalEcommerceItems'];
+
+        $visitor['totalAbandonedCartsRevenue'] = $ecommerceMetrics['totalAbandonedCartsRevenue'];
+        $visitor['totalAbandonedCarts']        = $ecommerceMetrics['totalAbandonedCarts'];
+        $visitor['totalAbandonedCartsItems']   = $ecommerceMetrics['totalAbandonedCartsItems'];
+    }
+
+    public function provideActionsForVisitIds(&$actions, $idVisits)
+    {
+        $ecommerceDetails = $this->queryEcommerceConversionsForVisits($idVisits);
+
+        // use while / array_shift combination instead of foreach to save memory
+        while (is_array($ecommerceDetails) && count($ecommerceDetails)) {
+            $ecommerceDetail = array_shift($ecommerceDetails);
+
+            $idVisit = $ecommerceDetail['idvisit'];
+
+            unset($ecommerceDetail['idvisit']);
+
+            if ($ecommerceDetail['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
+                unset($ecommerceDetail['orderId']);
+                unset($ecommerceDetail['revenueSubTotal']);
+                unset($ecommerceDetail['revenueTax']);
+                unset($ecommerceDetail['revenueShipping']);
+                unset($ecommerceDetail['revenueDiscount']);
+            }
+
+            // 25.00 => 25
+            foreach ($ecommerceDetail as $column => $value) {
+                if (strpos($column, 'revenue') !== false) {
+                    if ($value == round($value)) {
+                        $ecommerceDetail[$column] = round($value);
+                    }
+                }
+            }
+
+            $idOrder = isset($ecommerceDetail['orderId']) ? $ecommerceDetail['orderId'] : GoalManager::ITEM_IDORDER_ABANDONED_CART;
+
+            $itemsDetails = $this->queryEcommerceItemsForOrder($idVisit, $idOrder);
+            foreach ($itemsDetails as &$detail) {
+                if ($detail['price'] == round($detail['price'])) {
+                    $detail['price'] = round($detail['price']);
+                }
+            }
+            $ecommerceDetail['itemDetails'] = $itemsDetails;
+
+            $actions[$idVisit][] = $ecommerceDetail;
+        }
+    }
+
+    /**
+     * @param $idSite
+     * @param $idVisitor
+     * @return array
+     * @throws \Exception
+     */
+    protected function queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($idSite, $idVisitor)
+    {
+        $sql             = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_ORDER);
+        $ecommerceOrders = Db::fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor)));
+
+        $sql            = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_CART);
+        $abandonedCarts = Db::fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor)));
+
+        return array(
+            'totalEcommerceRevenue'      => $ecommerceOrders['lifeTimeRevenue'],
+            'totalEcommerceConversions'  => $ecommerceOrders['lifeTimeConversions'],
+            'totalEcommerceItems'        => $ecommerceOrders['lifeTimeEcommerceItems'],
+            'totalAbandonedCartsRevenue' => $abandonedCarts['lifeTimeRevenue'],
+            'totalAbandonedCarts'        => $abandonedCarts['lifeTimeConversions'],
+            'totalAbandonedCartsItems'   => $abandonedCarts['lifeTimeEcommerceItems']
+        );
+    }
+
+
+    /**
+     * @param $ecommerceIdGoal
+     * @return string
+     */
+    protected function getSqlEcommerceConversionsLifeTimeMetricsForIdGoal($ecommerceIdGoal)
+    {
+        $sql = "SELECT
+                    COALESCE(SUM(" . LogAggregator::getSqlRevenue('revenue') . "), 0) as lifeTimeRevenue,
+                    COUNT(*) as lifeTimeConversions,
+                    COALESCE(SUM(" . LogAggregator::getSqlRevenue('items') . "), 0)  as lifeTimeEcommerceItems
+					FROM  " . Common::prefixTable('log_visit') . " AS log_visit
+					    LEFT JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion
+					    ON log_visit.idvisit = log_conversion.idvisit
+					WHERE
+					        log_visit.idsite = ?
+					    AND log_visit.idvisitor = ?
+						AND log_conversion.idgoal = " . $ecommerceIdGoal . "
+        ";
+        return $sql;
+    }
+
+    /**
+     * @param $idVisit
+     * @param $limit
+     * @return array
+     * @throws \Exception
+     */
+    protected function queryEcommerceConversionsForVisits($idVisits)
+    {
+        $sql              = "SELECT
+						idvisit,
+						case idgoal when " . GoalManager::IDGOAL_CART
+            . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART
+            . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type,
+						idorder as orderId,
+						" . LogAggregator::getSqlRevenue('revenue') . " as revenue,
+						" . LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
+						" . LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
+						" . LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
+						" . LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
+						items as items,
+						log_conversion.server_time as serverTimePretty,
+						log_conversion.idlink_va
+					FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
+					WHERE idvisit IN ('" . implode("','", $idVisits) . "')
+						AND idgoal <= " . GoalManager::IDGOAL_ORDER . "
+					ORDER BY idvisit, server_time ASC";
+        $ecommerceDetails = Db::fetchAll($sql);
+        return $ecommerceDetails;
+    }
+
+    /**
+     * @param $idVisit
+     * @param $idOrder
+     * @param $actionsLimit
+     * @return array
+     * @throws \Exception
+     */
+    protected function queryEcommerceItemsForOrder($idVisit, $idOrder)
+    {
+        $sql = "SELECT
+							log_action_sku.name as itemSKU,
+							log_action_name.name as itemName,
+							log_action_category.name as itemCategory,
+							" . LogAggregator::getSqlRevenue('price') . " as price,
+							quantity as quantity
+						FROM " . Common::prefixTable('log_conversion_item') . "
+							INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku
+							ON  idaction_sku = log_action_sku.idaction
+							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_name
+							ON  idaction_name = log_action_name.idaction
+							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_category
+							ON idaction_category = log_action_category.idaction
+						WHERE idvisit = ?
+							AND idorder = ?
+							AND deleted = 0
+				";
+
+        $bind = array($idVisit, $idOrder);
+
+        $itemsDetails = Db::fetchAll($sql, $bind);
+        return $itemsDetails;
+    }
+
+    public function initProfile($visits, &$profile)
+    {
+        if (Site::isEcommerceEnabledFor($visits->getFirstRow()->getColumn('idSite'))) {
+            $profile['totalEcommerceRevenue']      = 0;
+            $profile['totalEcommerceConversions']  = 0;
+            $profile['totalEcommerceItems']        = 0;
+            $profile['totalAbandonedCarts']        = 0;
+            $profile['totalAbandonedCartsRevenue'] = 0;
+            $profile['totalAbandonedCartsItems']   = 0;
+        }
+    }
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        $lastVisit = $visits->getLastRow();
+        if ($lastVisit && Site::isEcommerceEnabledFor($lastVisit->getColumn('idSite'))) {
+            $profile['totalEcommerceRevenue']      = $lastVisit->getColumn('totalEcommerceRevenue');
+            $profile['totalEcommerceConversions']  = $lastVisit->getColumn('totalEcommerceConversions');
+            $profile['totalEcommerceItems']        = $lastVisit->getColumn('totalEcommerceItems');
+            $profile['totalAbandonedCartsRevenue'] = $lastVisit->getColumn('totalAbandonedCartsRevenue');
+            $profile['totalAbandonedCarts']        = $lastVisit->getColumn('totalAbandonedCarts');
+            $profile['totalAbandonedCartsItems']   = $lastVisit->getColumn('totalAbandonedCartsItems');
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/templates/_profileSummary.twig b/plugins/Ecommerce/templates/_profileSummary.twig
new file mode 100644
index 0000000000..b3865096ac
--- /dev/null
+++ b/plugins/Ecommerce/templates/_profileSummary.twig
@@ -0,0 +1,14 @@
+<div class="visitor-profile-summary visitor-profile-lifetimevalue">
+    <h1>{{ 'Goals_Ecommerce'|translate }}</h1>
+    <div>
+        <p title="{{ 'Ecommerce_LifeTimeValueDescription'|translate(visitorData.visitorId) }}">
+            {{ 'Ecommerce_VisitorProfileLTV'|translate( "<strong>" ~ visitorData.totalEcommerceRevenue|money(idSite) ~ "</strong>")|raw }}
+            {{ 'Ecommerce_VisitorProfileItemsAndOrders'|translate("<strong>" ~ visitorData.totalEcommerceItems ~ "</strong>", "<strong>" ~ visitorData.totalEcommerceConversions ~ "</strong>")|raw }}
+        </p>
+        <p>
+            {%- if visitorData.totalAbandonedCarts|default(0) > 0 %}
+                {{ 'Ecommerce_VisitorProfileAbandonedCartSummary'|translate('<strong>' ~ visitorData.totalAbandonedCarts ~ '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsItems ~ '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsRevenue|money(idSite) ~ '</strong>')|raw }}
+            {%- endif -%}
+        </p>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php
index 8ae0f5cb2e..eee4ce7f52 100644
--- a/plugins/Events/Events.php
+++ b/plugins/Events/Events.php
@@ -27,16 +27,11 @@ class Events extends \Piwik\Plugin
             'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations',
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
             'ViewDataTable.configure'   => 'configureViewDataTable',
-            'Live.getAllVisitorDetails' => 'extendVisitorDetails',
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+            'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields'
         );
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $visitor['events'] = $details['visit_total_events'];
-    }
-
     public function addMetricTranslations(&$translations)
     {
         $translations = array_merge($translations, $this->getMetricTranslations());
@@ -265,4 +260,14 @@ class Events extends \Piwik\Plugin
     {
         $stylesheets[] = "plugins/Events/stylesheets/datatable.less";
     }
+
+    public function provideActionDimensionFields(&$fields, &$joins)
+    {
+        $fields[] = 'log_action_event_category.name AS eventCategory';
+        $fields[] = 'log_action_event_action.name as eventAction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_event_action
+					ON  log_link_visit_action.idaction_event_action = log_action_event_action.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_event_category
+					ON  log_link_visit_action.idaction_event_category = log_action_event_category.idaction';
+    }
 }
diff --git a/plugins/Events/VisitorDetails.php b/plugins/Events/VisitorDetails.php
new file mode 100644
index 0000000000..76dfd37806
--- /dev/null
+++ b/plugins/Events/VisitorDetails.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Tracker\Action;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+        if ($action['type'] == Action::TYPE_EVENT) {
+            $action['type'] = 'event';
+            $action['icon'] = 'plugins/Morpheus/images/event.png';
+        }
+    }
+
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['events'] = $this->details['visit_total_events'];
+    }
+
+    public function renderAction($action, $previousAction, $visitorDetails)
+    {
+        if ($action['type'] != 'event') {
+            return;
+        }
+
+        $view                 = new View('@Events/_actionEvent.twig');
+        $view->action         = $action;
+        $view->previousAction = $previousAction;
+        $view->visitInfo      = $visitorDetails;
+        return $view->render();
+    }
+
+
+    public function initProfile($visits, &$profile)
+    {
+        $profile['totalEvents'] = 0;
+    }
+
+    public function handleProfileAction($action, &$profile)
+    {
+        if ($action['type'] != 'event') {
+            return;
+        }
+        $profile['totalEvents']++;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Events/templates/_actionEvent.twig b/plugins/Events/templates/_actionEvent.twig
new file mode 100644
index 0000000000..6fa44108b1
--- /dev/null
+++ b/plugins/Events/templates/_actionEvent.twig
@@ -0,0 +1,25 @@
+<li class="action" title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {% if action.pageTitle|default(false) is not empty %}
+            <span class="truncated-text-line">{{ action.pageTitle|rawSafeDecoded }}</span>
+        {% endif %}
+        <img src='plugins/Morpheus/images/event.png' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon event">
+        <span class="truncated-text-line event">{{ action.eventCategory|rawSafeDecoded }}
+            - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
+        {% if action.url is not empty %}
+            {% if previousAction.url|default(false) == action.url %}
+                {# For events, do not show (url) if the Event URL is the same as the URL last displayed #}
+            {% else %}
+                {% if action.url|trim|lower starts with 'javascript:' or
+                action.url|trim|lower starts with 'vbscript:' or
+                action.url|trim|lower starts with 'data:' %}
+                    {{ action.url }}
+                {% else %}
+                    <a href="{{ action.url }}" rel="noreferrer" target="_blank" class="truncated-text-line">
+                        {{ action.url|replace({'http://': '', 'https://': ''}) }}
+                    </a>
+                {% endif %}
+            {% endif %}
+        {% endif %}
+    </div>
+</li>
diff --git a/plugins/Goals/VisitorDetails.php b/plugins/Goals/VisitorDetails.php
new file mode 100644
index 0000000000..0d45b06367
--- /dev/null
+++ b/plugins/Goals/VisitorDetails.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Goals;
+
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Plugins\CustomVariables\CustomVariables;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Site;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\PageUrl;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    const EVENT_VALUE_PRECISION = 3;
+
+    protected $lastGoalResults = array();
+    protected $lastVisitIds    = array();
+
+    public function extendVisitorDetails(&$visitor)
+    {
+        $idVisit = $visitor['idVisit'];
+
+        if (in_array($idVisit, $this->lastVisitIds)) {
+            $goalConversionDetails = isset($this->lastGoalResults[$idVisit]) ? $this->lastGoalResults[$idVisit] : array();
+        } else {
+            $goalConversionDetails = $this->queryGoalConversionsForVisits(array($idVisit));
+        }
+
+        $visitor['goalConversions'] = count($goalConversionDetails);
+    }
+
+    public function provideActionsForVisitIds(&$actions, $idVisits)
+    {
+        $this->lastVisitIds    = $idVisits;
+        $this->lastGoalResults = array();
+        $goalConversionDetails = $this->queryGoalConversionsForVisits($idVisits);
+
+        // use while / array_shift combination instead of foreach to save memory
+        while (is_array($goalConversionDetails) && count($goalConversionDetails)) {
+            $goalConversionDetail = array_shift($goalConversionDetails);
+            $idVisit              = $goalConversionDetail['idvisit'];
+
+            unset($goalConversionDetail['idvisit']);
+
+            $this->lastGoalResults[$idVisit][] = $actions[$idVisit][] = $goalConversionDetail;
+        }
+    }
+
+    /**
+     * @param $idVisit
+     * @return array
+     * @throws \Exception
+     */
+    protected function queryGoalConversionsForVisits($idVisits)
+    {
+        $sql = "
+				SELECT
+						log_conversion.idvisit,
+						'goal' as type,
+						goal.name as goalName,
+						goal.idgoal as goalId,
+						log_conversion.revenue as revenue,
+						log_conversion.idlink_va,
+						log_conversion.idlink_va as goalPageId,
+						log_conversion.server_time as serverTimePretty,
+						log_conversion.url as url
+				FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
+				LEFT JOIN " . Common::prefixTable('goal') . " AS goal
+					ON (goal.idsite = log_conversion.idsite
+						AND
+						goal.idgoal = log_conversion.idgoal)
+					AND goal.deleted = 0
+				WHERE log_conversion.idvisit IN ('" . implode("','", $idVisits) . "')
+					AND log_conversion.idgoal > 0
+                ORDER BY log_conversion.idvisit, server_time ASC
+			";
+        return Db::fetchAll($sql);
+    }
+
+
+    public function initProfile($visits, &$profile)
+    {
+        $profile['totalGoalConversions']   = 0;
+        $profile['totalConversionsByGoal'] = array();
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        $profile['totalGoalConversions'] += $visit->getColumn('goalConversions');
+    }
+
+    public function handleProfileAction($action, &$profile)
+    {
+        if ($action['type'] != 'goal') {
+            return;
+        }
+
+        $idGoal    = $action['goalId'];
+        $idGoalKey = 'idgoal=' . $idGoal;
+
+        if (!isset($profile['totalConversionsByGoal'][$idGoalKey])) {
+            $profile['totalConversionsByGoal'][$idGoalKey] = 0;
+        }
+        ++$profile['totalConversionsByGoal'][$idGoalKey];
+
+        if (!empty($action['revenue'])) {
+            if (!isset($profile['totalRevenueByGoal'][$idGoalKey])) {
+                $profile['totalRevenueByGoal'][$idGoalKey] = 0;
+            }
+            $profile['totalRevenueByGoal'][$idGoalKey] += $action['revenue'];
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 8d1649746f..ba655ec1be 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -227,6 +227,8 @@ class API extends \Piwik\Plugin\API
          * Triggered in the Live.getVisitorProfile API method. Plugins can use this event
          * to discover and add extra data to visitor profiles.
          *
+         * This event is deprecated, use [VisitorDetails](/api-reference/Piwik/Plugins/Live/VisitorDetailsAbstract#extendVisitorDetails) classes instead.
+         *
          * For example, if an email address is found in a custom variable, a plugin could load the
          * gravatar for the email and add it to the visitor profile, causing it to display in the
          * visitor profile popup.
@@ -237,6 +239,7 @@ class API extends \Piwik\Plugin\API
          * - **visitorDescription**: Text to be used as the tooltip of the avatar image.
          *
          * @param array &$visitorProfile The unaugmented visitor profile info.
+         * @deprecated
          */
         Piwik::postEvent('Live.getExtraVisitorDetails', array(&$result));
 
@@ -313,40 +316,33 @@ class API extends \Piwik\Plugin\API
 
         $dataTable->$filter(function ($table) use ($idSite, $flat, $doNotFetchActions) {
             /** @var DataTable $table */
-            $actionsLimit = (int)Config::getInstance()->General['visitor_log_maximum_actions_per_visit'];
-
             $visitorFactory = new VisitorFactory();
-            $website        = new Site($idSite);
-            $timezone       = $website->getTimezone();
-            $currency       = $website->getCurrency();
-            $currencies     = APISitesManager::getInstance()->getCurrencySymbols();
 
             // live api is not summable, prevents errors like "Unexpected ECommerce status value"
             $table->deleteRow(DataTable::ID_SUMMARY_ROW);
 
-            foreach ($table->getRows() as $visitorDetailRow) {
-                $visitorDetailsArray = Visitor::cleanVisitorDetails($visitorDetailRow->getColumns());
+            $actionsByVisitId = array();
 
-                $visitor = $visitorFactory->create($visitorDetailsArray);
-                $visitorDetailsArray = $visitor->getAllVisitorDetails();
+            if (!$doNotFetchActions) {
+                $visitIds = $table->getColumn('idvisit');
 
-                $visitorDetailsArray['siteCurrency'] = $currency;
-                $visitorDetailsArray['siteCurrencySymbol'] = @$currencies[$visitorDetailsArray['siteCurrency']];
-                $visitorDetailsArray['serverTimestamp'] = $visitorDetailsArray['lastActionTimestamp'];
+                $visitorDetailsManipulators = Visitor::getAllVisitorDetailsInstances();
 
-                $dateTimeVisit = Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone);
-                if ($dateTimeVisit) {
-                    $visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized(Date::TIME_FORMAT);
-                    $visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Date::DATE_FORMAT_LONG);
+                foreach ($visitorDetailsManipulators as $instance) {
+                    $instance->provideActionsForVisitIds($actionsByVisitId, $visitIds);
                 }
+            }
+
+            foreach ($table->getRows() as $visitorDetailRow) {
+                $visitorDetailsArray = Visitor::cleanVisitorDetails($visitorDetailRow->getColumns());
 
-                $dateTimeVisitFirstAction = Date::factory($visitorDetailsArray['firstActionTimestamp'], $timezone);
-                $visitorDetailsArray['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Date::DATE_FORMAT_LONG);
-                $visitorDetailsArray['serverTimePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Date::TIME_FORMAT);
+                $visitor = $visitorFactory->create($visitorDetailsArray);
+                $visitorDetailsArray = $visitor->getAllVisitorDetails();
 
                 $visitorDetailsArray['actionDetails'] = array();
                 if (!$doNotFetchActions) {
-                    $visitorDetailsArray = Visitor::enrichVisitorArrayWithActions($visitorDetailsArray, $actionsLimit, $idSite, $timezone);
+                    $bulkFetchedActions  = isset($actionsByVisitId[$visitorDetailsArray['idVisit']]) ? $actionsByVisitId[$visitorDetailsArray['idVisit']] : array();
+                    $visitorDetailsArray = Visitor::enrichVisitorArrayWithActions($visitorDetailsArray, $bulkFetchedActions);
                 }
 
                 if ($flat) {
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 3a87d75559..cdcbea995c 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -9,10 +9,14 @@
 namespace Piwik\Plugins\Live;
 
 use Piwik\API\Request;
+use Piwik\Cache;
+use Piwik\CacheId;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Piwik;
+use Piwik\Plugin;
 use Piwik\Plugins\Goals\API as APIGoals;
+use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract;
 use Piwik\Url;
 use Piwik\View;
 
@@ -111,41 +115,39 @@ class Controller extends \Piwik\Plugin\Controller
         $view->visitorData = Request::processRequest('Live.getVisitorProfile');
         $view->exportLink = $this->getVisitorProfileExportLink();
 
-        if (Common::getRequestVar('showMap', 1) == 1
-            && !empty($view->visitorData['hasLatLong'])
-            && \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('UserCountryMap')
-        ) {
-            $view->userCountryMapUrl = $this->getUserCountryMapUrlForVisitorProfile();
+        $this->setWidgetizedVisitorProfileUrl($view);
+
+        $summaryEntries = array();
+
+        $profileSummaries = self::getAllProfileSummaryInstances();
+        foreach ($profileSummaries as $profileSummary) {
+            $profileSummary->setProfile($view->visitorData);
+            $summaryEntries[] = [$profileSummary->getOrder(), $profileSummary->render()];
         }
 
-        $this->setWidgetizedVisitorProfileUrl($view);
+        usort($summaryEntries, function($a, $b) {
+            return version_compare($a[0], $b[0]);
+        });
 
-        return $view->render();
-    }
+        $summary = '';
+
+        foreach ($summaryEntries AS $summaryEntry) {
+            $summary .= $summaryEntry[1];
+        }
+
+        $view->profileSummary = $summary;
 
-    public function getSingleVisitSummary()
-    {
-        $view = new View('@Live/getSingleVisitSummary.twig');
-        $visits = Request::processRequest('Live.getLastVisitsDetails', array(
-                                                                            'segment' => 'visitId==' . Common::getRequestVar('visitId'),
-                                                                            'period'  => false,
-                                                                            'date'    => false
-                                                                       ));
-        $view->visitData = $visits->getFirstRow()->getColumns();
-        $view->visitReferralSummary = VisitorProfile::getReferrerSummaryForVisit($visits->getFirstRow());
-        $view->showLocation =  \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('UserCountry');
-        $this->setWidgetizedVisitorProfileUrl($view);
-        $view->exportLink = $this->getVisitorProfileExportLink();
         return $view->render();
     }
 
     public function getVisitList()
     {
-        $startCounter = Common::getRequestVar('filter_offset', 0, 'int');
+        $filterLimit = Common::getRequestVar('filter_offset', 0, 'int');
+        $startCounter = Common::getRequestVar('start_number', 0, 'int');
         $nextVisits = Request::processRequest('Live.getLastVisitsDetails', array(
                                                                                 'segment'                 => self::getSegmentWithVisitorId(),
                                                                                 'filter_limit'            => VisitorProfile::VISITOR_PROFILE_MAX_VISITS_TO_SHOW,
-                                                                                'filter_offset'           => $startCounter,
+                                                                                'filter_offset'           => $filterLimit,
                                                                                 'period'                  => false,
                                                                                 'date'                    => false
                                                                            ));
@@ -158,7 +160,7 @@ class Controller extends \Piwik\Plugin\Controller
 
         $view = new View('@Live/getVisitList.twig');
         $view->idSite = $idSite;
-        $view->startCounter = $startCounter + 1;
+        $view->startCounter = $startCounter < count($nextVisits) ? count($nextVisits) : $startCounter;
         $view->visits = $nextVisits;
         return $view->render();
     }
@@ -186,24 +188,7 @@ class Controller extends \Piwik\Plugin\Controller
         }
     }
 
-    private function getUserCountryMapUrlForVisitorProfile()
-    {
-        $params = array(
-            'module'             => 'UserCountryMap',
-            'action'             => 'realtimeMap',
-            'segment'            => self::getSegmentWithVisitorId(),
-            'visitorId'          => false,
-            'changeVisitAlpha'   => 0,
-            'removeOldVisits'    => 0,
-            'realtimeWindow'     => 'false',
-            'showFooterMessage'  => 0,
-            'showDateTime'       => 0,
-            'doNotRefreshVisits' => 1
-        );
-        return Url::getCurrentQueryStringWithParametersModified($params);
-    }
-
-    private static function getSegmentWithVisitorId()
+    public static function getSegmentWithVisitorId()
     {
         static $cached = null;
         if ($cached === null) {
@@ -221,4 +206,41 @@ class Controller extends \Piwik\Plugin\Controller
         }
         return $cached;
     }
+
+
+    /**
+     * Returns all available profile summaries
+     *
+     * @return ProfileSummaryAbstract[]
+     * @throws \Exception
+     */
+    public static function getAllProfileSummaryInstances()
+    {
+        $cacheId = CacheId::pluginAware('ProfileSummaries');
+        $cache   = Cache::getTransientCache();
+
+        if (!$cache->contains($cacheId)) {
+            $instances = [];
+
+            foreach (self::getAllProfileSummaryClasses() as $className) {
+                $instance = new $className();
+                $instances[] = $instance;
+            }
+
+            $cache->save($cacheId, $instances);
+        }
+
+        return $cache->fetch($cacheId);
+    }
+
+    /**
+     * Returns class names of all VisitorDetails classes.
+     *
+     * @return string[]
+     * @api
+     */
+    protected static function getAllProfileSummaryClasses()
+    {
+        return Plugin\Manager::getInstance()->findMultipleComponents('ProfileSummary', 'Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract');
+    }
 }
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index 367d19c3a7..4381adecf2 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -2,14 +2,12 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\Live;
 
-use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
-
 /**
  *
  */
@@ -17,14 +15,18 @@ class Live extends \Piwik\Plugin
 {
 
     /**
-     * @see Piwik\Plugin::registerEvents
+     * @see \Piwik\Plugin::registerEvents
      */
     public function registerEvents()
     {
         return array(
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
-            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+            'Live.renderAction'                      => 'renderAction',
+            'Live.renderActionTooltip'               => 'renderActionTooltip',
+            'Live.renderVisitorDetails'              => 'renderVisitorDetails',
+            'Live.renderVisitorIcons'                => 'renderVisitorIcons',
         );
     }
 
@@ -58,4 +60,56 @@ class Live extends \Piwik\Plugin
         $translationKeys[] = "General_Segment";
         $translationKeys[] = "General_And";
     }
+
+    public function renderAction(&$renderedAction, $action, $previousAction, $visitorDetails)
+    {
+        $visitorDetailsInstances = Visitor::getAllVisitorDetailsInstances();
+        foreach ($visitorDetailsInstances as $instance) {
+            $renderedAction .= $instance->renderAction($action, $previousAction, $visitorDetails);
+        }
+    }
+
+    public function renderActionTooltip(&$tooltip, $action, $visitInfo)
+    {
+        $detailEntries = [];
+        $visitorDetailsInstances = Visitor::getAllVisitorDetailsInstances();
+
+        foreach ($visitorDetailsInstances as $instance) {
+            $detailEntries = array_merge($detailEntries, $instance->renderActionTooltip($action, $visitInfo));
+        }
+
+        usort($detailEntries, function($a, $b) {
+            return version_compare($a[0], $b[0]);
+        });
+
+        foreach ($detailEntries AS $detailEntry) {
+            $tooltip .= $detailEntry[1];
+        }
+    }
+
+    public function renderVisitorDetails(&$renderedDetails, $visitorDetails)
+    {
+        $detailEntries = [];
+        $visitorDetailsInstances = Visitor::getAllVisitorDetailsInstances();
+
+        foreach ($visitorDetailsInstances as $instance) {
+            $detailEntries = array_merge($detailEntries, $instance->renderVisitorDetails($visitorDetails));
+        }
+
+        usort($detailEntries, function($a, $b) {
+            return version_compare($a[0], $b[0]);
+        });
+
+        foreach ($detailEntries AS $detailEntry) {
+            $renderedDetails .= $detailEntry[1];
+        }
+    }
+
+    public function renderVisitorIcons(&$renderedDetails, $visitorDetails)
+    {
+        $visitorDetailsInstances = Visitor::getAllVisitorDetailsInstances();
+        foreach ($visitorDetailsInstances as $instance) {
+            $renderedDetails .= $instance->renderIcons($visitorDetails);
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php
index e19054b4d7..a475536da5 100644
--- a/plugins/Live/Model.php
+++ b/plugins/Live/Model.php
@@ -24,177 +24,6 @@ use Piwik\Tracker\GoalManager;
 
 class Model
 {
-
-    /**
-     * @param $idVisit
-     * @param $actionsLimit
-     * @return array
-     * @throws \Exception
-     */
-    public function queryActionsForVisit($idVisit, $actionsLimit)
-    {
-        $maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
-
-        $sqlCustomVariables = '';
-        for ($i = 1; $i <= $maxCustomVariables; $i++) {
-            $sqlCustomVariables .= ', custom_var_k' . $i . ', custom_var_v' . $i;
-        }
-        // The second join is a LEFT join to allow returning records that don't have a matching page title
-        // eg. Downloads, Outlinks. For these, idaction_name is set to 0
-        $sql = "
-				SELECT
-					COALESCE(log_action_event_category.type, log_action.type, log_action_title.type) AS type,
-					log_action.name AS url,
-					log_action.url_prefix,
-					log_action_title.name AS pageTitle,
-					log_action.idaction AS pageIdAction,
-					log_link_visit_action.idlink_va,
-					log_link_visit_action.server_time as serverTimePretty,
-					log_link_visit_action.time_spent_ref_action as timeSpentRef,
-					log_link_visit_action.idlink_va AS pageId,
-					log_link_visit_action.custom_float,
-					log_link_visit_action.interaction_position
-					" . $sqlCustomVariables . ",
-					log_action_event_category.name AS eventCategory,
-					log_action_event_action.name as eventAction
-				FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action
-					ON  log_link_visit_action.idaction_url = log_action.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_title
-					ON  log_link_visit_action.idaction_name = log_action_title.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_category
-					ON  log_link_visit_action.idaction_event_category = log_action_event_category.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_action
-					ON  log_link_visit_action.idaction_event_action = log_action_event_action.idaction
-				WHERE log_link_visit_action.idvisit = ?
-				ORDER BY server_time ASC
-				LIMIT 0, $actionsLimit
-				 ";
-        $actionDetails = Db::fetchAll($sql, array($idVisit));
-        return $actionDetails;
-    }
-
-    /**
-     * @param $idVisit
-     * @param $limit
-     * @return array
-     * @throws \Exception
-     */
-    public function queryGoalConversionsForVisit($idVisit, $limit)
-    {
-        $sql = "
-				SELECT
-						'goal' as type,
-						goal.name as goalName,
-						goal.idgoal as goalId,
-						log_conversion.revenue as revenue,
-						log_conversion.idlink_va,
-						log_conversion.idlink_va as goalPageId,
-						log_conversion.server_time as serverTimePretty,
-						log_conversion.url as url
-				FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
-				LEFT JOIN " . Common::prefixTable('goal') . " AS goal
-					ON (goal.idsite = log_conversion.idsite
-						AND
-						goal.idgoal = log_conversion.idgoal)
-					AND goal.deleted = 0
-				WHERE log_conversion.idvisit = ?
-					AND log_conversion.idgoal > 0
-                ORDER BY server_time ASC
-				LIMIT 0, $limit
-			";
-        $goalDetails = Db::fetchAll($sql, array($idVisit));
-        return $goalDetails;
-    }
-
-    /**
-     * @param $idVisit
-     * @param $limit
-     * @return array
-     * @throws \Exception
-     */
-    public function queryEcommerceConversionsForVisit($idVisit, $limit)
-    {
-        $sql = "SELECT
-						case idgoal when " . GoalManager::IDGOAL_CART
-            . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART
-            . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type,
-						idorder as orderId,
-						" . LogAggregator::getSqlRevenue('revenue') . " as revenue,
-						" . LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
-						" . LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
-						" . LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
-						" . LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
-						items as items,
-						log_conversion.server_time as serverTimePretty,
-						log_conversion.idlink_va
-					FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
-					WHERE idvisit = ?
-						AND idgoal <= " . GoalManager::IDGOAL_ORDER . "
-					ORDER BY server_time ASC
-					LIMIT 0, $limit";
-        $ecommerceDetails = Db::fetchAll($sql, array($idVisit));
-        return $ecommerceDetails;
-    }
-
-    /**
-     * @param $idSite
-     * @param $idVisit
-     * @return array
-     * @throws \Exception
-     */
-    public function queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($idSite, $idVisitor)
-    {
-        $sql = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_ORDER);
-        $ecommerceOrders = Db::fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor)));
-
-        $sql = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_CART);
-        $abandonedCarts = Db::fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor)));
-
-        return array(
-            'totalEcommerceRevenue'      => $ecommerceOrders['lifeTimeRevenue'],
-            'totalEcommerceConversions'  => $ecommerceOrders['lifeTimeConversions'],
-            'totalEcommerceItems'        => $ecommerceOrders['lifeTimeEcommerceItems'],
-            'totalAbandonedCartsRevenue' => $abandonedCarts['lifeTimeRevenue'],
-            'totalAbandonedCarts'        => $abandonedCarts['lifeTimeConversions'],
-            'totalAbandonedCartsItems'   => $abandonedCarts['lifeTimeEcommerceItems']
-        );
-    }
-
-    /**
-     * @param $idVisit
-     * @param $idOrder
-     * @param $actionsLimit
-     * @return array
-     * @throws \Exception
-     */
-    public function queryEcommerceItemsForOrder($idVisit, $idOrder, $actionsLimit)
-    {
-        $sql = "SELECT
-							log_action_sku.name as itemSKU,
-							log_action_name.name as itemName,
-							log_action_category.name as itemCategory,
-							" . LogAggregator::getSqlRevenue('price') . " as price,
-							quantity as quantity
-						FROM " . Common::prefixTable('log_conversion_item') . "
-							INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku
-							ON  idaction_sku = log_action_sku.idaction
-							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_name
-							ON  idaction_name = log_action_name.idaction
-							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_category
-							ON idaction_category = log_action_category.idaction
-						WHERE idvisit = ?
-							AND idorder = ?
-							AND deleted = 0
-						LIMIT 0, $actionsLimit
-				";
-
-        $bind = array($idVisit, $idOrder);
-
-        $itemsDetails = Db::fetchAll($sql, $bind);
-        return $itemsDetails;
-    }
-
     /**
      * @param $idSite
      * @param $period
@@ -538,25 +367,4 @@ class Model
         }
         return array($whereBind, $where);
     }
-
-    /**
-     * @param $ecommerceIdGoal
-     * @return string
-     */
-    private function getSqlEcommerceConversionsLifeTimeMetricsForIdGoal($ecommerceIdGoal)
-    {
-        $sql = "SELECT
-                    COALESCE(SUM(" . LogAggregator::getSqlRevenue('revenue') . "), 0) as lifeTimeRevenue,
-                    COUNT(*) as lifeTimeConversions,
-                    COALESCE(SUM(" . LogAggregator::getSqlRevenue('items') . "), 0)  as lifeTimeEcommerceItems
-					FROM  " . Common::prefixTable('log_visit') . " AS log_visit
-					    LEFT JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion
-					    ON log_visit.idvisit = log_conversion.idvisit
-					WHERE
-					        log_visit.idsite = ?
-					    AND log_visit.idvisitor = ?
-						AND log_conversion.idgoal = " . $ecommerceIdGoal . "
-        ";
-        return $sql;
-    }
-} 
+}
diff --git a/plugins/Live/ProfileSummary/ImportantVisits.php b/plugins/Live/ProfileSummary/ImportantVisits.php
new file mode 100644
index 0000000000..afb290b505
--- /dev/null
+++ b/plugins/Live/ProfileSummary/ImportantVisits.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Live\ProfileSummary;
+
+use Piwik\Piwik;
+use Piwik\View;
+
+/**
+ * Class ImportantVisits
+ *
+ * @api
+ */
+class ImportantVisits extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('General_Summary');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        $viewVisits              = new View('@Live/_profileSummaryVisits.twig');
+        $viewVisits->visitorData = $this->profile;
+        return $viewVisits->render();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 30;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/ProfileSummary/ProfileSummaryAbstract.php b/plugins/Live/ProfileSummary/ProfileSummaryAbstract.php
new file mode 100644
index 0000000000..e1e0f7d0bb
--- /dev/null
+++ b/plugins/Live/ProfileSummary/ProfileSummaryAbstract.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Live\ProfileSummary;
+
+/**
+ * Class ProfileSummaryAbstract
+ *
+ * This class can be implemented in a plugin to provide a new profile summary
+ *
+ * @api
+ */
+abstract class ProfileSummaryAbstract
+{
+    /**
+     * Visitor profile information
+     *
+     * @var array
+     */
+    protected $profile = [];
+
+    /**
+     * Set profile information
+     *
+     * @param array $profile
+     */
+    public function setProfile($profile)
+    {
+        $this->profile = $profile;
+    }
+
+    /**
+     * Returns the unique ID
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return static::class;
+    }
+
+    /**
+     * Returns the descriptive name
+     *
+     * @return string
+     */
+    abstract function getName();
+
+    /**
+     * Renders and returns the summary
+     *
+     * @return string
+     */
+    abstract function render();
+
+    /**
+     * Returns order indicator used to sort all summaries before displaying them
+     *
+     * @return int
+     */
+    abstract function getOrder();
+}
\ No newline at end of file
diff --git a/plugins/Live/ProfileSummary/Summary.php b/plugins/Live/ProfileSummary/Summary.php
new file mode 100644
index 0000000000..db81a8e127
--- /dev/null
+++ b/plugins/Live/ProfileSummary/Summary.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Live\ProfileSummary;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\View;
+use Piwik\Plugins\Goals\API as APIGoals;
+
+/**
+ * Class ProfileSummaryAbstract
+ *
+ * This class can be implemented in a plugin to provide a new profile summary
+ *
+ * @api
+ */
+class Summary extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('General_Summary');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        $idSite            = Common::getRequestVar('idSite', null, 'int');
+        $view              = new View('@Live/_profileSummary.twig');
+        $view->goals       = APIGoals::getInstance()->getGoals($idSite);
+        $view->visitorData = $this->profile;
+        return $view->render();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 19844f0f71..4984c262ca 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -8,24 +8,18 @@
  */
 namespace Piwik\Plugins\Live;
 
-use Piwik\Common;
+use Piwik\Cache;
+use Piwik\CacheId;
+use Piwik\Config;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\Date;
-use Piwik\Db;
 use Piwik\Metrics\Formatter;
-use Piwik\Network\IPUtils;
+use Piwik\Plugin;
 use Piwik\Piwik;
-use Piwik\Plugins\CustomVariables\CustomVariables;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
-use Piwik\Tracker;
-use Piwik\Tracker\Action;
 use Piwik\Tracker\GoalManager;
 
 class Visitor implements VisitorInterface
 {
-    const EVENT_VALUE_PRECISION = 3;
-
     private $details = array();
 
     function __construct($visitorRawData)
@@ -35,24 +29,14 @@ class Visitor implements VisitorInterface
 
     function getAllVisitorDetails()
     {
-        $visitor = array(
-            'idSite'                      => $this->getIdSite(),
-            'idVisit'                     => $this->getIdVisit(),
-            'visitIp'                     => $this->getIp(),
-            'visitorId'                   => $this->getVisitorId(),
-
-            // => false are placeholders to be filled in API later
-            'actionDetails'               => false,
-            'goalConversions'             => false,
-            'siteCurrency'                => false,
-            'siteCurrencySymbol'          => false,
-
-            // all time entries
-            'serverDate'                  => $this->getServerDate(),
-            'visitServerHour'             => $this->getVisitServerHour(),
-            'lastActionTimestamp'         => $this->getTimestampLastAction(),
-            'lastActionDateTime'          => $this->getDateTimeLastAction(),
-        );
+        $visitor = array();
+
+        $instances = self::getAllVisitorDetailsInstances();
+
+        foreach ($instances as $instance) {
+            $instance->setDetails($this->details);
+            $instance->extendVisitorDetails($visitor);
+        }
 
         /**
          * This event can be used to add any details to a visitor. The visitor's details are for instance used in
@@ -70,56 +54,63 @@ class Visitor implements VisitorInterface
          *
          * @param array &visitor You can add or remove fields to the visitor array and it will reflected in the API output
          * @param array $details The details array contains all visit dimensions (columns of log_visit table)
+         *
+         * @deprecated  will be removed in Piwik 4
          */
         Piwik::postEvent('Live.getAllVisitorDetails', array(&$visitor, $this->details));
 
         return $visitor;
     }
 
-    function getVisitorId()
+    /**
+     * Returns all available visitor details instances
+     *
+     * @return VisitorDetailsAbstract[]
+     * @throws \Exception
+     */
+    public static function getAllVisitorDetailsInstances()
     {
-        if (isset($this->details['idvisitor'])) {
-            return bin2hex($this->details['idvisitor']);
-        }
-        return false;
-    }
+        $cacheId = CacheId::pluginAware('VisitorDetails');
+        $cache   = Cache::getTransientCache();
 
-    function getVisitServerHour()
-    {
-        return date('G', strtotime($this->details['visit_last_action_time']));
-    }
+        if (!$cache->contains($cacheId)) {
+            $instances = [
+                new VisitorDetails() // needs to be first
+            ];
 
-    function getServerDate()
-    {
-        return date('Y-m-d', strtotime($this->details['visit_last_action_time']));
-    }
+            foreach (self::getAllVisitorDetailsClasses() as $className) {
+                $instance = new $className();
 
-    function getIp()
-    {
-        if (isset($this->details['location_ip'])) {
-            return IPUtils::binaryToStringIP($this->details['location_ip']);
-        }
-        return null;
-    }
+                if ($instance instanceof VisitorDetails) {
+                    continue;
+                }
 
-    function getIdVisit()
-    {
-        return $this->details['idvisit'];
-    }
+                $instances[] = $instance;
+            }
 
-    function getIdSite()
-    {
-        return $this->details['idsite'];
+            $cache->save($cacheId, $instances);
+        }
+
+        return $cache->fetch($cacheId);
     }
 
-    function getTimestampLastAction()
+    /**
+     * Returns class names of all VisitorDetails classes.
+     *
+     * @return string[]
+     * @api
+     */
+    protected static function getAllVisitorDetailsClasses()
     {
-        return strtotime($this->details['visit_last_action_time']);
+        return Plugin\Manager::getInstance()->findComponents('VisitorDetails', 'Piwik\Plugins\Live\VisitorDetailsAbstract');
     }
 
-    function getDateTimeLastAction()
+    function getVisitorId()
     {
-        return date('Y-m-d H:i:s', strtotime($this->details['visit_last_action_time']));
+        if (isset($this->details['idvisitor'])) {
+            return bin2hex($this->details['idvisitor']);
+        }
+        return false;
     }
 
     /**
@@ -246,232 +237,48 @@ class Visitor implements VisitorInterface
     }
 
     /**
-     * @param $visitorDetailsArray
-     * @param $actionsLimit
-     * @param $timezone
+     * @param array $visitorDetailsArray
+     * @param array $actionDetails  preset action details
+     *
      * @return array
      */
-    public static function enrichVisitorArrayWithActions($visitorDetailsArray, $actionsLimit, $idSite, $timezone)
+    public static function enrichVisitorArrayWithActions($visitorDetailsArray, $actionDetails = array())
     {
-        $idVisit = $visitorDetailsArray['idVisit'];
-
-        $model = new Model();
-        $actionDetails = $model->queryActionsForVisit($idVisit, $actionsLimit);
-
-        $formatter = new Formatter();
-        $maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
+        $actionsLimit = (int)Config::getInstance()->General['visitor_log_maximum_actions_per_visit'];
+        $visitorDetailsManipulators = self::getAllVisitorDetailsInstances();
 
-        foreach ($actionDetails as $actionIdx => &$actionDetail) {
-            $actionDetail =& $actionDetails[$actionIdx];
-            $customVariablesPage = array();
-
-            for ($i = 1; $i <= $maxCustomVariables; $i++) {
-                if (!empty($actionDetail['custom_var_k' . $i])) {
-                    $cvarKey = $actionDetail['custom_var_k' . $i];
-                    $cvarKey = static::getCustomVariablePrettyKey($cvarKey);
-                    $customVariablesPage[$i] = array(
-                        'customVariablePageName' . $i  => $cvarKey,
-                        'customVariablePageValue' . $i => $actionDetail['custom_var_v' . $i],
-                    );
-                }
-                unset($actionDetail['custom_var_k' . $i]);
-                unset($actionDetail['custom_var_v' . $i]);
-            }
-            if (!empty($customVariablesPage)) {
-                $actionDetail['customVariables'] = $customVariablesPage;
-            }
-
-            if ($actionDetail['type'] == Action::TYPE_CONTENT) {
-
-                unset($actionDetails[$actionIdx]);
-                continue;
-
-            } elseif ($actionDetail['type'] == Action::TYPE_EVENT) {
-                // Handle Event
-                if (strlen($actionDetail['pageTitle']) > 0) {
-                    $actionDetail['eventName'] = $actionDetail['pageTitle'];
-                }
-
-                unset($actionDetail['pageTitle']);
-
-            } else if ($actionDetail['type'] == Action::TYPE_SITE_SEARCH) {
-                // Handle Site Search
-                $actionDetail['siteSearchKeyword'] = $actionDetail['pageTitle'];
-                unset($actionDetail['pageTitle']);
-            }
-
-            // Event value / Generation time
-            if ($actionDetail['type'] == Action::TYPE_EVENT) {
-                if (strlen($actionDetail['custom_float']) > 0) {
-                    $actionDetail['eventValue'] = round($actionDetail['custom_float'], self::EVENT_VALUE_PRECISION);
-                }
-            } elseif ($actionDetail['custom_float'] > 0) {
-                $actionDetail['generationTimeMilliseconds'] = $actionDetail['custom_float'];
-                $actionDetail['generationTime'] = $formatter->getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000, true);
-            }
-            unset($actionDetail['custom_float']);
-
-            if ($actionDetail['type'] != Action::TYPE_EVENT) {
-                unset($actionDetail['eventCategory']);
-                unset($actionDetail['eventAction']);
-            }
-
-            $actionDetail['interactionPosition'] = $actionDetail['interaction_position'];
-            unset($actionDetail['interaction_position']);
-
-            // Reconstruct url from prefix
-            $url = Tracker\PageUrl::reconstructNormalizedUrl($actionDetail['url'], $actionDetail['url_prefix']);
-            $url = Common::unsanitizeInputValue($url);
-
-            $actionDetail['url'] = $url;
-            unset($actionDetail['url_prefix']);
+        foreach ($visitorDetailsManipulators as $instance) {
+            $instance->provideActionsForVisit($actionDetails, $visitorDetailsArray);
         }
 
-        // If the visitor converted a goal, we shall select all Goals
-        $goalDetails = $model->queryGoalConversionsForVisit($idVisit, $actionsLimit);
-
-        $ecommerceMetrics = $model->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($idSite, $visitorDetailsArray['visitorId']);
-        $visitorDetailsArray['totalEcommerceRevenue'] = $ecommerceMetrics['totalEcommerceRevenue'];
-        $visitorDetailsArray['totalEcommerceConversions'] = $ecommerceMetrics['totalEcommerceConversions'];
-        $visitorDetailsArray['totalEcommerceItems'] = $ecommerceMetrics['totalEcommerceItems'];
-
-        $visitorDetailsArray['totalAbandonedCartsRevenue'] = $ecommerceMetrics['totalAbandonedCartsRevenue'];
-        $visitorDetailsArray['totalAbandonedCarts'] = $ecommerceMetrics['totalAbandonedCarts'];
-        $visitorDetailsArray['totalAbandonedCartsItems'] = $ecommerceMetrics['totalAbandonedCartsItems'];
-
-        $ecommerceDetails = $model->queryEcommerceConversionsForVisit($idVisit, $actionsLimit);
-        foreach ($ecommerceDetails as &$ecommerceDetail) {
-            if ($ecommerceDetail['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
-                unset($ecommerceDetail['orderId']);
-                unset($ecommerceDetail['revenueSubTotal']);
-                unset($ecommerceDetail['revenueTax']);
-                unset($ecommerceDetail['revenueShipping']);
-                unset($ecommerceDetail['revenueDiscount']);
-            }
-
-            // 25.00 => 25
-            foreach ($ecommerceDetail as $column => $value) {
-                if (strpos($column, 'revenue') !== false) {
-                    if ($value == round($value)) {
-                        $ecommerceDetail[$column] = round($value);
-                    }
-                }
-            }
+        foreach ($visitorDetailsManipulators as $instance) {
+            $instance->filterActions($actionDetails, $visitorDetailsArray);
         }
 
-        // Enrich ecommerce carts/orders with the list of products
-        usort($ecommerceDetails, array('static', 'sortByServerTime'));
-        foreach ($ecommerceDetails as &$ecommerceConversion) {
-            $idOrder = isset($ecommerceConversion['orderId']) ? $ecommerceConversion['orderId'] : GoalManager::ITEM_IDORDER_ABANDONED_CART;
-
-            $itemsDetails = $model->queryEcommerceItemsForOrder($idVisit, $idOrder, $actionsLimit);
-            foreach ($itemsDetails as &$detail) {
-                if ($detail['price'] == round($detail['price'])) {
-                    $detail['price'] = round($detail['price']);
-                }
-            }
-            $ecommerceConversion['itemDetails'] = $itemsDetails;
-        }
+        usort($actionDetails, array('static', 'sortByServerTime'));
 
         $actionDetails = array_values($actionDetails);
 
-        // Enrich with time spent per action
-        foreach($actionDetails as $actionIdx => &$actionDetail) {
-
-            // Set the time spent for this action (which is the timeSpentRef of the next action)
-            $nextActionFound = isset($actionDetails[$actionIdx + 1]);
-            if ($nextActionFound) {
-                $actionDetail['timeSpent'] = $actionDetails[$actionIdx + 1]['timeSpentRef'];
-            } else {
-
-                // Last action of a visit.
-                // By default, Piwik does not know how long the user stayed on the page
-                // If enableHeartBeatTimer() is used in piwik.js then we can find the accurate time on page for the last pageview
-                $visitTotalTime = $visitorDetailsArray['visitDuration'];
-                $timeOfLastAction = Date::factory($actionDetail['serverTimePretty'])->getTimestamp();
-
-                $timeSpentOnAllActionsApartFromLastOne = ($timeOfLastAction - $visitorDetailsArray['firstActionTimestamp']);
-                $timeSpentOnPage = $visitTotalTime - $timeSpentOnAllActionsApartFromLastOne;
-
-                // Safe net, we assume the time is correct when it's more than 10 seconds
-                if ($timeSpentOnPage > 10) {
-                    $actionDetail['timeSpent'] = $timeSpentOnPage;
-                }
-
-            }
-
-            if (isset($actionDetail['timeSpent'])) {
-                $actionDetail['timeSpentPretty'] = $formatter->getPrettyTimeFromSeconds($actionDetail['timeSpent'], true);
-            }
-
-            unset($actionDetails[$actionIdx]['timeSpentRef']); // not needed after timeSpent is added
-
+        // limit actions
+        if ($actionsLimit < count($actionDetails)) {
+            $visitorDetailsArray['truncatedActionsCount'] = count($actionDetails) - $actionsLimit;
+            $actionDetails = array_slice($actionDetails, 0, $actionsLimit);
         }
 
-        $actions = array_merge($actionDetails, $goalDetails, $ecommerceDetails);
-        usort($actions, array('static', 'sortByServerTime'));
-
-        foreach ($actions as &$action) {
-            unset($action['idlink_va']);
-        }
+        foreach ($actionDetails as $actionIdx => &$actionDetail) {
+            $actionDetail =& $actionDetails[$actionIdx];
+            $nextAction = isset($actionDetails[$actionIdx+1]) ? $actionDetails[$actionIdx+1] : null;
 
-        $visitorDetailsArray['goalConversions'] = count($goalDetails);
-
-        $visitorDetailsArray['actionDetails'] = $actions;
-
-        foreach ($visitorDetailsArray['actionDetails'] as &$details) {
-            switch ($details['type']) {
-                case 'goal':
-                    $details['icon'] = 'plugins/Morpheus/images/goal.png';
-                    break;
-                case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER:
-                case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART:
-                    $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.png';
-                    break;
-                case Action::TYPE_DOWNLOAD:
-                    $details['type'] = 'download';
-                    $details['icon'] = 'plugins/Morpheus/images/download.png';
-                    break;
-                case Action::TYPE_OUTLINK:
-                    $details['type'] = 'outlink';
-                    $details['icon'] = 'plugins/Morpheus/images/link.png';
-                    break;
-                case Action::TYPE_SITE_SEARCH:
-                    $details['type'] = 'search';
-                    $details['icon'] = 'plugins/Morpheus/images/search_ico.png';
-                    break;
-                case Action::TYPE_EVENT:
-                    $details['type'] = 'event';
-                    $details['icon'] = 'plugins/Morpheus/images/event.png';
-                    break;
-                default:
-                    $details['type'] = 'action';
-                    $details['icon'] = null;
-                    break;
+            foreach ($visitorDetailsManipulators as $instance) {
+                $instance->extendActionDetails($actionDetail, $nextAction, $visitorDetailsArray);
             }
-
-            // Convert datetimes to the site timezone
-            $dateTimeVisit = Date::factory($details['serverTimePretty'], $timezone);
-            $details['serverTimePretty'] = $dateTimeVisit->getLocalized(Date::DATETIME_FORMAT_SHORT);
-            $details['timestamp'] = $dateTimeVisit->getTimestamp();
         }
 
+        $visitorDetailsArray['actionDetails'] = $actionDetails;
 
         return $visitorDetailsArray;
     }
 
-    private static function getCustomVariablePrettyKey($key)
-    {
-        $rename = array(
-            ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY => Piwik::translate('Actions_ColumnSearchCategory'),
-            ActionSiteSearch::CVAR_KEY_SEARCH_COUNT    => Piwik::translate('Actions_ColumnSearchResultsCount'),
-        );
-        if (isset($rename[$key])) {
-            return $rename[$key];
-        }
-        return $key;
-    }
-
     private static function sortByServerTime($a, $b)
     {
         $ta = strtotime($a['serverTimePretty']);
diff --git a/plugins/Live/VisitorDetails.php b/plugins/Live/VisitorDetails.php
new file mode 100644
index 0000000000..91be2f543b
--- /dev/null
+++ b/plugins/Live/VisitorDetails.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Live;
+
+use Piwik\Date;
+use Piwik\DataTable;
+use Piwik\Metrics\Formatter;
+use Piwik\Network\IPUtils;
+use Piwik\Piwik;
+use Piwik\Site;
+use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Plugins\Referrers\API as APIReferrers;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $idSite     = $this->getIdSite();
+        $website    = new Site($idSite);
+        $timezone   = $website->getTimezone();
+        $currency   = $website->getCurrency();
+        $currencies = APISitesManager::getInstance()->getCurrencySymbols();
+
+        $visitor += array(
+            'idSite'              => $idSite,
+            'idVisit'             => $this->getIdVisit(),
+            'visitIp'             => $this->getIp(),
+            'visitorId'           => $this->getVisitorId(),
+
+            // => false are placeholders to be filled in API later
+            'actionDetails'       => false,
+            'goalConversions'     => false,
+            'siteCurrency'        => false,
+            'siteCurrencySymbol'  => false,
+
+            // all time entries
+            'serverDate'          => $this->getServerDate(),
+            'visitServerHour'     => $this->getVisitServerHour(),
+            'lastActionTimestamp' => $this->getTimestampLastAction(),
+            'lastActionDateTime'  => $this->getDateTimeLastAction(),
+        );
+
+        $visitor['siteCurrency']         = $currency;
+        $visitor['siteCurrencySymbol']   = @$currencies[$visitor['siteCurrency']];
+        $visitor['serverTimestamp']      = $visitor['lastActionTimestamp'];
+        $visitor['firstActionTimestamp'] = strtotime($this->details['visit_first_action_time']);
+
+        $dateTimeVisit = Date::factory($visitor['lastActionTimestamp'], $timezone);
+        if ($dateTimeVisit) {
+            $visitor['serverTimePretty'] = $dateTimeVisit->getLocalized(Date::TIME_FORMAT);
+            $visitor['serverDatePretty'] = $dateTimeVisit->getLocalized(Date::DATE_FORMAT_LONG);
+        }
+
+        $dateTimeVisitFirstAction               = Date::factory($visitor['firstActionTimestamp'], $timezone);
+        $visitor['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Date::DATE_FORMAT_LONG);
+        $visitor['serverTimePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Date::TIME_FORMAT);
+    }
+
+    public function renderAction($action, $previousAction, $visitorDetails)
+    {
+        switch ($action['type']) {
+            case 'ecommerceOrder':
+            case 'ecommerceAbandonedCart':
+                $template = '@Live/_actionEcommerce.twig';
+                break;
+            case 'goal':
+                $template = '@Live/_actionGoal.twig';
+                break;
+            case 'action':
+            case 'search':
+            case 'outlink':
+            case 'download':
+                $template = '@Live/_actionCommon.twig';
+                break;
+        }
+
+        if (empty($template)) {
+            return;
+        }
+
+        $view                 = new View($template);
+        $view->action         = $action;
+        $view->previousAction = $previousAction;
+        $view->visitInfo      = $visitorDetails;
+        return $view->render();
+    }
+
+    public function renderActionTooltip($action, $visitInfo)
+    {
+        $view            = new View('@Live/_actionTooltip');
+        $view->action    = $action;
+        $view->visitInfo = $visitInfo;
+        return [[ 0, $view->render() ]];
+    }
+
+    public function renderVisitorDetails($visitorDetails)
+    {
+        $view            = new View('@Live/_visitorDetails.twig');
+        $view->visitInfo = $visitorDetails;
+        return [[ 0, $view->render() ]];
+    }
+
+    public function renderIcons($visitorDetails)
+    {
+        $view          = new View('@Live/_visitorLogIcons.twig');
+        $view->visitor = $visitorDetails;
+        return $view->render();
+    }
+
+    function getVisitorId()
+    {
+        if (isset($this->details['idvisitor'])) {
+            return bin2hex($this->details['idvisitor']);
+        }
+        return false;
+    }
+
+    function getVisitServerHour()
+    {
+        return date('G', strtotime($this->details['visit_last_action_time']));
+    }
+
+    function getServerDate()
+    {
+        return date('Y-m-d', strtotime($this->details['visit_last_action_time']));
+    }
+
+    function getIp()
+    {
+        if (isset($this->details['location_ip'])) {
+            return IPUtils::binaryToStringIP($this->details['location_ip']);
+        }
+        return null;
+    }
+
+    function getIdVisit()
+    {
+        return $this->details['idvisit'];
+    }
+
+    function getIdSite()
+    {
+        return $this->details['idsite'];
+    }
+
+    function getTimestampLastAction()
+    {
+        return strtotime($this->details['visit_last_action_time']);
+    }
+
+    function getDateTimeLastAction()
+    {
+        return date('Y-m-d H:i:s', strtotime($this->details['visit_last_action_time']));
+    }
+
+
+    public function initProfile($visits, &$profile)
+    {
+        $profile['totalVisits']        = 0;
+        $profile['totalVisitDuration'] = 0;
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        ++$profile['totalVisits'];
+
+        $profile['totalVisitDuration'] += $visit->getColumn('visitDuration');
+    }
+
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        $formatter                           = new Formatter();
+        $profile['totalVisitDurationPretty'] = $formatter->getPrettyTimeFromSeconds($profile['totalVisitDuration'], true);
+
+        $rows                        = $visits->getRows();
+        $profile['userId']           = $visits->getLastRow()->getColumn('userId');
+        $profile['firstVisit']       = $this->getVisitorProfileVisitSummary(end($rows));
+        $profile['lastVisit']        = $this->getVisitorProfileVisitSummary(reset($rows));
+        $profile['visitsAggregated'] = count($rows);
+    }
+
+    /**
+     * Returns a summary for an important visit. Used to describe the first & last visits of a visitor.
+     *
+     * @param DataTable\Row $visit
+     * @return array
+     */
+    private function getVisitorProfileVisitSummary($visit)
+    {
+        $today = Date::today();
+
+        $serverDate = $visit->getColumn('firstActionTimestamp');
+        return array(
+            'date'            => $serverDate,
+            'prettyDate'      => Date::factory($serverDate)->getLocalized(Date::DATE_FORMAT_LONG),
+            'daysAgo'         => (int)Date::secondsToDays($today->getTimestamp() - Date::factory($serverDate)->getTimestamp()),
+            'referrerType'    => $visit->getColumn('referrerType'),
+            'referrerUrl'     => $visit->getColumn('referrerUrl') ?: '',
+            'referralSummary' => self::getReferrerSummaryForVisit($visit),
+        );
+    }
+
+
+    /**
+     * Returns a summary for a visit's referral.
+     *
+     * @param DataTable\Row $visit
+     * @return bool|mixed|string
+     */
+    public static function getReferrerSummaryForVisit($visit)
+    {
+        $referrerType = $visit->getColumn('referrerType');
+        if ($referrerType === false
+            || $referrerType == 'direct'
+        ) {
+            return Piwik::translate('Referrers_DirectEntry');
+        }
+
+        if ($referrerType == 'search') {
+            $referrerName = $visit->getColumn('referrerName');
+
+            $keyword = $visit->getColumn('referrerKeyword');
+            if ($keyword !== false
+                && $keyword != APIReferrers::getKeywordNotDefinedString()
+            ) {
+                $referrerName .= ' (' . $keyword . ')';
+            }
+            return $referrerName;
+        }
+
+        if ($referrerType == 'campaign') {
+
+            $summary = Piwik::translate('Referrers_ColumnCampaign') . ': ' . $visit->getColumn('referrerName');
+            $keyword = $visit->getColumn('referrerKeyword');
+            if (!empty($keyword)) {
+                $summary .= ' - ' . $keyword;
+            }
+
+            return $summary;
+        }
+
+        return $visit->getColumn('referrerName');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/VisitorDetailsAbstract.php b/plugins/Live/VisitorDetailsAbstract.php
new file mode 100644
index 0000000000..19ae14f685
--- /dev/null
+++ b/plugins/Live/VisitorDetailsAbstract.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Live;
+
+use Piwik\DataTable;
+
+/**
+ * Class VisitorDetailsAbstract
+ *
+ * This class can be implemented in a plugin to extend the Live reports, visitor log and profile
+ *
+ * @api
+ */
+abstract class VisitorDetailsAbstract
+{
+    protected $details = array();
+
+    /**
+     * Set details of current visit
+     *
+     * @param array $details
+     */
+    public function setDetails($details)
+    {
+        $this->details = $details;
+    }
+
+    /**
+     * Makes it possible to extend the visitor details returned from API
+     *
+     * **Example**
+     *
+     *    public function extendVisitorDetails(&$visitor) {
+     *        $crmData = Model::getCRMData($visitor['userid']);
+     *
+     *        foreach ($crmData as $prop => $value) {
+     *            $visitor[$prop] = $value;
+     *        }
+     *    }
+     *
+     * @param array $visitor
+     * @return void
+     */
+    public function extendVisitorDetails(&$visitor)
+    {
+    }
+
+    /**
+     * Makes it possible to enrich the action set for a single visit
+     *
+     * **Example**
+     *
+     *    public function provideActionsForVisit(&$actions, $visitorDetails) {
+     *        $adviews = Model::getAdviews($visitorDetails['visitid']);
+     *        $actions += $adviews;
+     *    }
+     *
+     * @param array $actions List of action to manipulate
+     * @param array $visitorDetails
+     * @return void
+     */
+    public function provideActionsForVisit(&$actions, $visitorDetails)
+    {
+    }
+
+    /**
+     * Makes it possible to enrich the action set for multiple visits identified by given visit ids
+     *
+     * action set to enrich needs to have the following structure
+     *
+     * $actions = array (
+     *     'idvisit' => array ( list of actions for this visit id ),
+     *     'idvisit' => array ( list of actions for this visit id ),
+     *     ...
+     * )
+     *
+     * **Example**
+     *
+     *    public function provideActionsForVisitIds(&$actions, $visitIds) {
+     *        $adviews = Model::getAdviewsByVisitIds($visitIds);
+     *        foreach ($adviews as $idVisit => $adView) {
+     *            $actions[$idVisit][] = $adView;
+     *        }
+     *    }
+     *
+     * @param array $actions   action set to enrich
+     * @param array $visitIds  list of visit ids
+     */
+    public function provideActionsForVisitIds(&$actions, $visitIds)
+    {
+    }
+
+    /**
+     * Allows filtering the provided actions
+     *
+     * **Example:**
+     *
+     *     public function filterActions(&$actions, $visitorDetailsArray) {
+     *         foreach ($actions as $idx => $action) {
+     *             if ($action['type'] == 'customaction') {
+     *                 unset($actions[$idx]);
+     *                 continue;
+     *             }
+     *         }
+     *     }
+     *
+     * @param array $actions
+     * @param array $visitorDetailsArray
+     */
+    public function filterActions(&$actions, $visitorDetailsArray)
+    {
+    }
+
+    /**
+     * Allows extended each action with additional information
+     *
+     * @param array $action
+     * @param array $nextAction
+     * @param array $visitorDetails
+     */
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+    }
+
+    /**
+     * Called when rendering a single Action
+     *
+     * @param array $action
+     * @param array $previousAction
+     * @param array $visitorDetails
+     * @return string
+     */
+    public function renderAction($action, $previousAction, $visitorDetails)
+    {
+    }
+
+    /**
+     * Called for rendering the tooltip on actions
+     * returned array needs to look like this:
+     * array (
+     *          20,   // order id
+     *          'rendered html content'
+     * )
+     *
+     * @param array $action
+     * @param array $visitInfo
+     * @return array
+     */
+    public function renderActionTooltip($action, $visitInfo)
+    {
+        return [];
+    }
+
+    /**
+     * Called when rendering the Icons in visitor log
+     *
+     * @param array $visitorDetails
+     * @return string
+     */
+    public function renderIcons($visitorDetails)
+    {
+    }
+
+    /**
+     * Called when rendering the visitor details in visitor log
+     * returned array needs to look like this:
+     * array (
+     *          20,   // order id
+     *          'rendered html content'
+     * )
+     *
+     * **Example**
+     *    public function renderVisitorDetails($visitorDetails) {
+     *        $view            = new View('@MyPlugin/_visitorDetails.twig');
+     *        $view->visitInfo = $visitorDetails;
+     *        return $view->render();
+     *    }
+     *
+     * @param array $visitorDetails
+     * @return array
+     */
+    public function renderVisitorDetails($visitorDetails)
+    {
+        return array();
+    }
+
+    /**
+     * Allows manipulating the visitor profile properties
+     * Will be called when visitor profile is initialized
+     *
+     * **Example**
+     *
+     *    public function initProfile($visit, &$profile) {
+     *        // initialize properties that will be filled based on visits or actions
+     *        $profile['totalActions']         = 0;
+     *        $profile['totalActionsOfMyType'] = 0;
+     *    }
+     *
+     * @param DataTable $visits
+     * @param array $profile
+     * @return void
+     */
+    public function initProfile($visits, &$profile)
+    {
+    }
+
+    /**
+     * Allows manipulating the visitor profile properties based on included visits
+     * Will be called for every action within the profile
+     *
+     * **Example**
+     *
+     *    public function handleProfileVisit($visit, &$profile) {
+     *        $profile['totalActions'] += $visit->getColumn('actions');
+     *    }
+     *
+     * @param DataTable\Row $visit
+     * @param array $profile
+     * @return void
+     */
+    public function handleProfileVisit($visit, &$profile)
+    {
+    }
+
+    /**
+     * Allows manipulating the visitor profile properties based on included actions
+     * Will be called for every action within the profile
+     *
+     * **Example**
+     *
+     *    public function handleProfileAction($action, &$profile)
+     *    {
+     *        if ($action['type'] != 'myactiontype') {
+     *            return;
+     *        }
+     *
+     *        $profile['totalActionsOfMyType']++;
+     *    }
+     *
+     * @param array $action
+     * @param array $profile
+     * @return void
+     */
+    public function handleProfileAction($action, &$profile)
+    {
+    }
+
+    /**
+     * Will be called after iterating over all actions
+     * Can be used to set profile information that requires data that was set while iterating over visits & actions
+     *
+     * **Example**
+     *
+     *    public function finalizeProfile($visits, &$profile) {
+     *        $profile['isPowerUser'] = false;
+     *
+     *        if ($profile['totalActionsOfMyType'] > 20) {
+     *            $profile['isPowerUser'] = true;
+     *        }
+     *    }
+     *
+     * @param DataTable $visits
+     * @param array $profile
+     * @return void
+     */
+    public function finalizeProfile($visits, &$profile)
+    {
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/VisitorProfile.php b/plugins/Live/VisitorProfile.php
index dcf73413af..f4ea6a660c 100644
--- a/plugins/Live/VisitorProfile.php
+++ b/plugins/Live/VisitorProfile.php
@@ -2,7 +2,7 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
@@ -11,27 +11,16 @@ namespace Piwik\Plugins\Live;
 
 use Exception;
 use Piwik\DataTable;
-use Piwik\Date;
-use Piwik\Metrics\Formatter;
-use Piwik\Piwik;
-use Piwik\Site;
-use Piwik\Plugins\Referrers\API as APIReferrers;
 
 class VisitorProfile
 {
     const VISITOR_PROFILE_MAX_VISITS_TO_SHOW = 10;
 
     protected $profile = array();
-    private $siteSearchKeywords = array();
-    private $continents = array();
-    private $countries = array();
-    private $cities = array();
-    private $pageGenerationTimeTotal = 0;
 
     public function __construct($idSite)
     {
         $this->idSite = $idSite;
-        $this->isEcommerceEnabled = Site::isEcommerceEnabledFor($this->idSite);
     }
 
     /**
@@ -44,345 +33,57 @@ class VisitorProfile
      */
     public function makeVisitorProfile(DataTable $visits, $visitorId, $segment, $numLastVisits)
     {
-        $this->initVisitorProfile();
+        $visitorDetailsManipulators = Visitor::getAllVisitorDetailsInstances();
+
+        $this->profile['visitorId'] = $visitorId;
+
+        foreach ($visitorDetailsManipulators as $instance) {
+            $instance->initProfile($visits, $this->profile);
+        }
 
         /** @var DataTable\Row $visit */
         foreach ($visits->getRows() as $visit) {
-            ++$this->profile['totalVisits'];
-
-            $this->profile['totalVisitDuration'] += $visit->getColumn('visitDuration');
-            $this->profile['totalActions'] += $visit->getColumn('actions');
-            $this->profile['totalGoalConversions'] += $visit->getColumn('goalConversions');
+            foreach ($visitorDetailsManipulators as $instance) {
+                $instance->handleProfileVisit($visit, $this->profile);
+            }
 
-            // individual goal conversions are stored in action details
             foreach ($visit->getColumn('actionDetails') as $action) {
-                $this->handleIfGoalAction($action);
-                $this->handleIfEventAction($action);
-                $this->handleIfDownloadAction($action);
-                $this->handleIfOutlinkAction($action);
-                $this->handleIfSiteSearchAction($action);
-                $this->handleIfPageViewAction($action);
-                $this->handleIfPageGenerationTime($action);
+                foreach ($visitorDetailsManipulators as $instance) {
+                    $instance->handleProfileAction($action, $this->profile);
+                }
             }
-            $this->handleGeoLocation($visit);
         }
 
-        $this->handleGeoLocationCountries();
-        $this->handleGeoLocationContinents();
-        $this->handleSiteSearches();
-        $this->handleAveragePageGenerationTime();
-
-        $formatter = new Formatter();
-        $this->profile['totalVisitDurationPretty'] = $formatter->getPrettyTimeFromSeconds($this->profile['totalVisitDuration'], true);
-
-        $this->handleVisitsSummary($visits);
-
         // use N most recent visits for last_visits
         $visits->deleteRowsOffset($numLastVisits);
 
         $this->profile['lastVisits'] = $visits;
-
-        $this->profile['userId'] = $visit->getColumn('userId');
-        $this->profile['visitorId'] = $visitorId;
         $this->handleAdjacentVisitorIds($visits, $visitorId, $segment);
 
-        if($this->isEcommerceEnabled()) {
-            $this->profile['totalEcommerceRevenue'] = $visit->getColumn('totalEcommerceRevenue');
-            $this->profile['totalEcommerceConversions'] = $visit->getColumn('totalEcommerceConversions');
-            $this->profile['totalEcommerceItems'] = $visit->getColumn('totalEcommerceItems');
-            $this->profile['totalAbandonedCartsRevenue'] = $visit->getColumn('totalAbandonedCartsRevenue');
-            $this->profile['totalAbandonedCarts'] = $visit->getColumn('totalAbandonedCarts');
-            $this->profile['totalAbandonedCartsItems'] = $visit->getColumn('totalAbandonedCartsItems');
+        foreach ($visitorDetailsManipulators as $instance) {
+            $instance->finalizeProfile($visits, $this->profile);
         }
 
         return $this->profile;
     }
 
     /**
-     * Returns a summary for an important visit. Used to describe the first & last visits of a visitor.
-     *
-     * @param DataTable\Row $visit
-     * @return array
-     */
-    private function getVisitorProfileVisitSummary($visit)
-    {
-        $today = Date::today();
-
-        $serverDate = $visit->getColumn('firstActionTimestamp');
-        return array(
-            'date'            => $serverDate,
-            'prettyDate'      => Date::factory($serverDate)->getLocalized(Date::DATE_FORMAT_LONG),
-            'daysAgo'         => (int)Date::secondsToDays($today->getTimestamp() - Date::factory($serverDate)->getTimestamp()),
-            'referrerType'    => $visit->getColumn('referrerType'),
-            'referralSummary' => self::getReferrerSummaryForVisit($visit),
-        );
-    }
-
-
-    /**
-     * Returns a summary for a visit's referral.
-     *
-     * @param DataTable\Row $visit
-     * @return bool|mixed|string
-     */
-    public static function getReferrerSummaryForVisit($visit)
-    {
-        $referrerType = $visit->getColumn('referrerType');
-        if ($referrerType === false
-            || $referrerType == 'direct'
-        ) {
-            return Piwik::translate('Referrers_DirectEntry');
-        }
-
-        if ($referrerType == 'search') {
-            $referrerName = $visit->getColumn('referrerName');
-
-            $keyword = $visit->getColumn('referrerKeyword');
-            if ($keyword !== false
-                && $keyword != APIReferrers::getKeywordNotDefinedString()
-            ) {
-                $referrerName .= ' (' . $keyword . ')';
-            }
-            return $referrerName;
-        }
-
-        if ($referrerType == 'campaign') {
-
-            $summary = Piwik::translate('Referrers_ColumnCampaign') . ': ' . $visit->getColumn('referrerName');
-            $keyword = $visit->getColumn('referrerKeyword');
-            if (!empty($keyword)) {
-                $summary .= ' - ' . $keyword;
-            }
-
-            return $summary;
-        }
-
-        return $visit->getColumn('referrerName');
-    }
-
-    private function isEcommerceEnabled()
-    {
-        return $this->isEcommerceEnabled;
-    }
-
-    /**
-     * @param $action
-     */
-    private function handleIfEventAction($action)
-    {
-        if ($action['type'] != 'event') {
-            return;
-        }
-        $this->profile['totalEvents']++;
-    }
-
-    /**
-     * @param $action
-     */
-    private function handleIfDownloadAction($action)
-    {
-        if ($action['type'] != 'download') {
-            return;
-        }
-        $this->profile['totalDownloads']++;
-    }
-
-    /**
-     * @param $action
-     */
-    private function handleIfOutlinkAction($action)
-    {
-        if ($action['type'] != 'outlink') {
-            return;
-        }
-        $this->profile['totalOutlinks']++;
-    }
-
-    /**
-     * @param $action
-     */
-    private function handleIfPageViewAction($action)
-    {
-        if ($action['type'] != 'action') {
-            return;
-        }
-        $this->profile['totalPageViews']++;
-    }
-
-    private function handleIfGoalAction($action)
-    {
-        if ($action['type'] != 'goal') {
-            return;
-        }
-        $idGoal = $action['goalId'];
-        $idGoalKey = 'idgoal=' . $idGoal;
-
-        if (!isset($this->profile['totalConversionsByGoal'][$idGoalKey])) {
-            $this->profile['totalConversionsByGoal'][$idGoalKey] = 0;
-        }
-        ++$this->profile['totalConversionsByGoal'][$idGoalKey];
-
-        if (!empty($action['revenue'])) {
-            if (!isset($this->profile['totalRevenueByGoal'][$idGoalKey])) {
-                $this->profile['totalRevenueByGoal'][$idGoalKey] = 0;
-            }
-            $this->profile['totalRevenueByGoal'][$idGoalKey] += $action['revenue'];
-        }
-    }
-
-    private function handleIfSiteSearchAction($action)
-    {
-        if (!isset($action['siteSearchKeyword'])) {
-            return;
-        }
-        $keyword = $action['siteSearchKeyword'];
-
-        if (!isset($this->siteSearchKeywords[$keyword])) {
-            $this->siteSearchKeywords[$keyword] = 0;
-            ++$this->profile['totalSearches'];
-        }
-        ++$this->siteSearchKeywords[$keyword];
-    }
-
-    private function handleGeoLocation(DataTable\Row $visit)
-    {
-        // realtime map only checks for latitude
-        $hasLatitude = $visit->getColumn('latitude') !== false;
-        if ($hasLatitude) {
-            $this->profile['hasLatLong'] = true;
-        }
-
-        $countryCode = $visit->getColumn('countryCode');
-        if (!isset($this->countries[$countryCode])) {
-            $this->countries[$countryCode] = 0;
-        }
-        ++$this->countries[$countryCode];
-
-        $continentCode = $visit->getColumn('continentCode');
-        if (!isset($this->continents[$continentCode])) {
-            $this->continents[$continentCode] = 0;
-        }
-        ++$this->continents[$continentCode];
-
-        if ($countryCode && !array_key_exists($countryCode, $this->cities)) {
-            $this->cities[$countryCode] = array();
-        }
-        $city = $visit->getColumn('city');
-        if (!empty($city)) {
-            $this->cities[$countryCode][] = $city;
-        }
-    }
-
-    private function handleSiteSearches()
-    {
-        // sort by visit/action
-        arsort($this->siteSearchKeywords);
-
-        foreach ($this->siteSearchKeywords as $keyword => $searchCount) {
-            $this->profile['searches'][] = array('keyword' => $keyword,
-                'searches' => $searchCount);
-        }
-    }
-
-    private function handleGeoLocationContinents()
-    {
-        // sort by visit/action
-        asort($this->continents);
-        foreach ($this->continents as $continentCode => $nbVisits) {
-            $this->profile['continents'][] = array('continent' => $continentCode,
-                'nb_visits' => $nbVisits,
-                'prettyName' => \Piwik\Plugins\UserCountry\continentTranslate($continentCode));
-        }
-    }
-
-    private function handleGeoLocationCountries()
-    {
-        // sort by visit/action
-        asort($this->countries);
-
-        // transform country/continents/search keywords into something that will look good in XML
-        $this->profile['countries'] = $this->profile['continents'] = $this->profile['searches'] = array();
-
-        foreach ($this->countries as $countryCode => $nbVisits) {
-
-            $countryInfo = array('country' => $countryCode,
-                'nb_visits' => $nbVisits,
-                'flag' => \Piwik\Plugins\UserCountry\getFlagFromCode($countryCode),
-                'prettyName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode));
-            if (!empty($this->cities[$countryCode])) {
-                $countryInfo['cities'] = array_unique($this->cities[$countryCode]);
-            }
-            $this->profile['countries'][] = $countryInfo;
-        }
-    }
-
-    private function initVisitorProfile()
-    {
-        $this->profile['totalVisits'] = 0;
-        $this->profile['totalVisitDuration'] = 0;
-        $this->profile['totalActions'] = 0;
-        $this->profile['totalEvents'] = 0;
-        $this->profile['totalOutlinks'] = 0;
-        $this->profile['totalDownloads'] = 0;
-        $this->profile['totalSearches'] = 0;
-        $this->profile['totalPageViews'] = 0;
-        $this->profile['totalPageViewsWithTiming'] = 0;
-        $this->profile['totalGoalConversions'] = 0;
-        $this->profile['totalConversionsByGoal'] = array();
-        $this->profile['hasLatLong'] = false;
-
-        if ($this->isEcommerceEnabled()) {
-            $this->profile['totalEcommerceRevenue'] = 0;
-            $this->profile['totalEcommerceConversions'] = 0;
-            $this->profile['totalEcommerceItems'] = 0;
-            $this->profile['totalAbandonedCarts'] = 0;
-            $this->profile['totalAbandonedCartsRevenue'] = 0;
-            $this->profile['totalAbandonedCartsItems'] = 0;
-        }
-    }
-
-    private function handleAveragePageGenerationTime()
-    {
-        if ($this->profile['totalPageViewsWithTiming']) {
-            $this->profile['averagePageGenerationTime'] =
-                round($this->pageGenerationTimeTotal / (1000 * $this->profile['totalPageViewsWithTiming']), $precision = 3);
-        }
-    }
-
-    private function handleIfPageGenerationTime($action)
-    {
-        if (isset($action['generationTimeMilliseconds'])) {
-            $this->pageGenerationTimeTotal += $action['generationTimeMilliseconds'];
-            ++$this->profile['totalPageViewsWithTiming'];
-        }
-    }
-
-    /**
      * @param DataTable $visits
-     * @param $visitorId
-     * @param $segment
+     * @param           $visitorId
+     * @param           $segment
      */
     private function handleAdjacentVisitorIds(DataTable $visits, $visitorId, $segment)
     {
         // get visitor IDs that are adjacent to this one in log_visit
         // TODO: make sure order of visitor ids is not changed if a returning visitor visits while the user is
         //       looking at the popup.
-        $rows = $visits->getRows();
+        $rows            = $visits->getRows();
         $latestVisitTime = reset($rows)->getColumn('lastActionDateTime');
 
-        $model = new Model();
-        $this->profile['nextVisitorId'] = $model->queryAdjacentVisitorId($this->idSite, $visitorId, $latestVisitTime, $segment, $getNext = true);
-        $this->profile['previousVisitorId'] = $model->queryAdjacentVisitorId($this->idSite, $visitorId, $latestVisitTime, $segment, $getNext = false);
-    }
-
-    /**
-     * @param DataTable $visits
-     */
-    private function handleVisitsSummary(DataTable $visits)
-    {
-        $rows = $visits->getRows();
-        $this->profile['firstVisit'] = $this->getVisitorProfileVisitSummary(end($rows));
-        $this->profile['lastVisit'] = $this->getVisitorProfileVisitSummary(reset($rows));
-        $this->profile['visitsAggregated'] = count($rows);
+        $model                              = new Model();
+        $this->profile['nextVisitorId']     = $model->queryAdjacentVisitorId($this->idSite, $visitorId,
+            $latestVisitTime, $segment, $getNext = true);
+        $this->profile['previousVisitorId'] = $model->queryAdjacentVisitorId($this->idSite, $visitorId,
+            $latestVisitTime, $segment, $getNext = false);
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/images/avatar_frame.png b/plugins/Live/images/avatar_frame.png
deleted file mode 100644
index 23eccfd5fb..0000000000
--- a/plugins/Live/images/avatar_frame.png
+++ /dev/null
diff --git a/plugins/Live/images/paperclip.png b/plugins/Live/images/paperclip.png
deleted file mode 100644
index b38d33caa1..0000000000
--- a/plugins/Live/images/paperclip.png
+++ /dev/null
diff --git a/plugins/Live/images/visitor_profile_close.png b/plugins/Live/images/visitor_profile_close.png
deleted file mode 100644
index ae132b7b2c..0000000000
--- a/plugins/Live/images/visitor_profile_close.png
+++ /dev/null
diff --git a/plugins/Live/images/visitor_profile_gradient.png b/plugins/Live/images/visitor_profile_gradient.png
deleted file mode 100644
index ac5068b54d..0000000000
--- a/plugins/Live/images/visitor_profile_gradient.png
+++ /dev/null
diff --git a/plugins/Live/javascripts/visitorLog.js b/plugins/Live/javascripts/visitorLog.js
index 74393f7ff7..6e66583ae2 100644
--- a/plugins/Live/javascripts/visitorLog.js
+++ b/plugins/Live/javascripts/visitorLog.js
@@ -63,6 +63,10 @@
                     show: false,
                     hide: false,
                     tooltipClass: 'small',
+                    content: function() {
+                        var title = $(this).attr('title');
+                        return $('<a>').text( title ).html().replace(/\n/g, '<br />');
+                    },
                     open: function () {
                         tooltipIsOpened = true;
                     },
@@ -72,28 +76,27 @@
                 });
             });
 
-            // Replace duplicated page views by a NX count instead of using too much vertical space
+            // show refresh icon for duplicate page views in a row
             $("ol.visitorLog").each(function () {
                 var prevelement;
                 var prevhtml;
-                var counter = 0;
+                var counter = 0, duplicateCounter = 0;
                 $(this).find("> li").each(function () {
                     counter++;
                     $(this).val(counter);
                     var current = $(this).html();
+
                     if (current == prevhtml) {
-                        var repeat = prevelement.find(".repeat");
-                        if (repeat.length) {
-                            repeat.html((parseInt(repeat.html()) + 1) + "x");
-                        } else {
-                            prevelement.find('>div').prepend($("<span>2x</span>").attr({'class': 'repeat', 'title': _pk_translate('Live_PageRefreshed')}));
-                        }
-                        $(this).hide();
+                        $(this).find('>div').prepend($("<span>"+(duplicateCounter+2)+"</span>").attr({'class': 'repeat icon-refresh', 'title': _pk_translate('Live_PageRefreshed')}));
+                        duplicateCounter++;
+
                     } else {
-                        prevhtml = current;
-                        prevelement = $(this);
+                        duplicateCounter = 0;
                     }
 
+                    prevhtml = current;
+                    prevelement = $(this);
+
                     var $this = $(this);
                     var tooltipIsOpened = false;
 
@@ -104,21 +107,22 @@
                         }
                     });
 
-                    $this.tooltip({
-                        track: true,
-                        show: false,
-                        hide: false,
-                        content: function() {
-                            var title = $(this).attr('title');
-                            return $('<a>').text( title ).html().replace(/\n/g, '<br />');
-                        },
-                        tooltipClass: 'small',
-                        open: function() { tooltipIsOpened = true; },
-                        close: function() { tooltipIsOpened = false; }
-                    });
                 });
             });
 
+            $("ol.visitorLog > li").tooltip({
+                track: true,
+                show: false,
+                hide: false,
+                content: function() {
+                    var title = $(this).attr('title');
+                    return $('<a>').text( title ).html().replace(/\n/g, '<br />');
+                },
+                tooltipClass: 'small',
+                open: function() { tooltipIsOpened = true; },
+                close: function() { tooltipIsOpened = false; }
+            });
+
             // launch visitor profile on visitor profile link click
             this.$element.on('click', '.visitor-log-visitor-profile-link', function (e) {
                 e.preventDefault();
diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
index cbe05e0ec7..148ec3b731 100644
--- a/plugins/Live/javascripts/visitorProfile.js
+++ b/plugins/Live/javascripts/visitorProfile.js
@@ -62,9 +62,6 @@
         _setupControl: function () {
             // focus the popup so it will accept key events
             this.$element.focus();
-
-            // highlight the first visit
-            $('.visitor-profile-visits>li:first-child', this.$element).addClass('visitor-profile-current-visit');
         },
 
         _bindEventCallbacks: function () {
@@ -80,20 +77,30 @@
                 return false;
             });
 
-            $element.on('click', '.visitor-profile-more-info>a', function (e) {
+            $element.on('click', '.visitor-profile-toggle-actions', function (e) {
                 e.preventDefault();
-                self._loadMoreVisits();
+                $(this).toggleClass('minimized');
+                if ($(this).hasClass('minimized')) {
+                    $('.visitor-profile-actions', $element).slideUp();
+                } else {
+                    $('.visitor-profile-actions', $element).slideDown();
+                }
                 return false;
             });
 
-            $element.on('click', '.visitor-profile-see-more-cvars>a', function (e) {
+            $element.on('click', '.visitor-profile-more-info>a', function (e) {
                 e.preventDefault();
-                $('.visitor-profile-extra-cvars', $element).slideToggle();
+                self._loadMoreVisits();
                 return false;
             });
 
-            $element.on('click', '.visitor-profile-visit-title-row', function () {
-                self._loadIndividualVisitDetails($('h2', this));
+            $element.on('click', '.visitor-profile-visit-title', function () {
+               $('.visitor-profile-visit-details-extended', $(this).parents('li')).slideToggle();
+            });
+
+            $element.on('click', '.visitor-profile-show-actions', function () {
+                $('.visitor-profile-actions', $(this).parents('li')).slideToggle();
+                return false;
             });
 
             $element.on('click', '.visitor-profile-prev-visitor', function (e) {
@@ -140,10 +147,14 @@
             });
 
             $element.tooltip({
+                items: '[title],.visitorLogIconWithDetails',
                 track: true,
                 show: false,
                 hide: false,
                 content: function() {
+                    if ($(this).hasClass('visitorLogIconWithDetails')) {
+                        return $('<ul>').html($('ul', $(this)).html());
+                    }
                     var title = $(this).attr('title');
                     return $('<a>').text( title ).html().replace(/\n/g, '<br />');
                 },
@@ -207,7 +218,8 @@
                 period: '',
                 date: '',
                 visitorId: $element.attr('data-visitor-id'),
-                filter_offset: $('.visitor-profile-visits>li', $element).length
+                filter_offset: $('.visitor-profile-visits>li', $element).length,
+                start_number: $('.visitor-profile-visits>li:last', $element).data('number') - 1
             }, 'GET');
             ajax.setCallback(function (response) {
                 if (response == "") { // no more visits left
@@ -233,37 +245,6 @@
             $('.visitor-profile-more-info', this.$element).html(noMoreSpan);
         },
 
-        _loadIndividualVisitDetails: function ($visitElement) {
-            var self = this,
-                $element = this.$element,
-                visitId = $visitElement.attr('data-idvisit');
-
-            $('.visitor-profile-avatar .loadingPiwik', $element).css('display', 'inline-block');
-            piwikHelper.lazyScrollTo($('.visitor-profile-avatar', $element)[0], 400);
-
-            var ajax = new ajaxHelper();
-            ajax.addParams({
-                module: 'Live',
-                action: 'getSingleVisitSummary',
-                visitId: visitId,
-                idSite: piwik.idSite
-            }, 'GET');
-            ajax.setCallback(function (response) {
-                $('.visitor-profile-avatar .loadingPiwik', $element).hide();
-
-                $('.visitor-profile-current-visit', $element).removeClass('visitor-profile-current-visit');
-                $visitElement.closest('li').addClass('visitor-profile-current-visit');
-
-                var $latestVisitSection = $('.visitor-profile-latest-visit', $element);
-                $latestVisitSection
-                    .html(response)
-                    .parent()
-                    .effect('highlight', {color: '#FFFFCB'}, 1200);
-            });
-            ajax.setFormat('html');
-            ajax.send();
-        },
-
         _loadPreviousVisitor: function () {
             this._gotoAdjacentVisitor(this.$element.attr('data-prev-visitor'));
         },
diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json
index dafcf66a92..5ce4712ca3 100644
--- a/plugins/Live/lang/en.json
+++ b/plugins/Live/lang/en.json
@@ -24,9 +24,13 @@
         "RealTimeVisitorCount": "Real Time Visitor Count",
         "Referrer_URL": "Referrer URL",
         "ShowMap": "show map",
+        "ActionsAndDuration": "%1$s actions in %2$s",
         "SimpleRealTimeWidget_Message": "%1$s and %2$s in the last %3$s",
         "ViewVisitorProfile": "View visitor profile",
         "VisitedPages": "Visited pages",
+        "RevisitedPages": "Pages viewed more than once",
+        "ToggleActions": "Toggle visibility of all actions",
+        "TopVisitedPages": "Top visited pages",
         "VisitorLog": "Visitor Log",
         "VisitorLogDocumentation": "This table shows the latest visits within the selected date range. You can see when a visitor's last visit occurred by hovering over the date of a visit. %1$s If the date range includes today, you can see your visitors real time! %2$s The data displayed here is always live, regardless of whether and how often you are using the archiving cron job.",
         "VisitorProfile": "Visitor profile",
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 309b93cecc..9be0ca4e75 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -74,7 +74,7 @@
 .ui-dialog.ui-widget {
   .dataTableVizVisitorLog {
     .dataTableFeatures {
-      border-bottom: 0px;
+      border-bottom: 0;
     }
   }
 }
@@ -89,7 +89,8 @@
 }
 
 ol.visitorLog {
-    list-style: decimal inside none;
+  counter-reset: item;
+  list-style-type: none;
 }
 
 .truncated-text-line {
@@ -99,15 +100,27 @@ ol.visitorLog {
     display:inline-block;
     max-width:90%;
     overflow: -moz-hidden-unscrollable;
-
-    &.event {
-      margin-top: 1px;
-      margin-right: 15px;
-    }
 }
 
-ol.visitorLog li {
+ol.visitorLog > li {
     margin-bottom: 7px;
+    line-height: 20px;
+
+  &:before {
+    content: counter(item) " ";
+    counter-increment: item;
+    padding-right: 5px;
+    vertical-align: top;
+  }
+
+  &.more {
+      list-style-type: none;
+      font-weight: bold;
+
+      .icon-info {
+        vertical-align: middle;
+      }
+  }
 }
 
 #visitsLive img {
@@ -148,12 +161,13 @@ ol.visitorLog li {
 
 .repeat {
     font-weight: bold;
-    border: 1px solid @theme-color-text-light;
-    border-radius: 3px;
-    padding: 2px;
     display: block;
-    margin: 0px 5px 0px 5px;
+    margin: 5px 5px 5px 0;
     float: left;
+
+    &.icon-refresh:before {
+      padding-right: 2px;
+    }
 }
 
 .dataTableVizVisitorLog hr {
@@ -201,7 +215,7 @@ ol.visitorLog p {
 .dataTableVizVisitorLog {
 
   .card {
-    padding: 15px 0px;
+    padding: 15px 0;
     font-size: 13px;
     text-align: left;
 
@@ -220,7 +234,7 @@ ol.visitorLog p {
      width:100%;
   }
 
-  .card {
+  .widget & .card {
 
     &:hover .visitor-log-visitor-profile-link {
       display:inline;
@@ -228,6 +242,10 @@ ol.visitorLog p {
   }
 }
 
+.visitor-log-datetime {
+  display: block;
+}
+
 .visitor-log-page-list {
   position:relative;
   margin-top: 7px;
@@ -236,46 +254,45 @@ ol.visitorLog p {
 a.visitor-log-visitor-profile-link {
     z-index: 2;
     position:absolute;
-    display:none;
     right: 15px;
     top: 15px;
     font-style:italic;
     font-size:13px;
     background-color: inherit !important;
 
+    .widget & {
+        display:none;
+    }
+
     img {
         margin-top: -2px;
         margin-bottom: -3px;
     }
 }
 
-.visitorLog,.visitor-profile-actions {
+.visitorLog {
     > li > div {
-        display:inline-block;
-        width:90%;
-        vertical-align:top;
+      display: inline-block;
+      width: 90%;
+
+      > * {
+        vertical-align: top;
+      }
     }
 }
 
 .action-list-action-icon {
-    float:left;
-    margin-right:4px;
+    display: inline;
+    margin: 2px 3px 0 0;
+    max-height: 16px;
 
-    &.event {
-      margin-top: 0;
-    }
     &.outlink {
-      margin-top: 4px;
-      margin-right: 4px;
-      margin-left: 4px;
-    }
-    &.search {
-      margin-right: 4px;
+      margin: 7px 3px 0 0;
     }
 }
 
 .action-list-url {
-    display:block;
+    display: inline-block;
 }
 
 .visitorLogIcons {
@@ -288,18 +305,16 @@ a.visitor-log-visitor-profile-link {
 }
 
 .visitorLogIcons>span>span>img {
-    margin: auto 0 auto 0px;
+    margin: auto 5px auto 0;
 }
 
-.visitorLogIcons .visitorLogIconWithDetails>img {
-    margin: auto 5px auto 0;
-    width: 16px;
+.visitorLogIconWithDetails>img {
+    margin: auto 5px -2px 0;
     height: 16px;
 }
 
 .visitorLogIconWithDetails.flag>img {
     border: 1px solid lightgray;
-    box-sizing: content-box;
 }
 
 .visitorLogIcons>span.visitorRank>img {
@@ -316,7 +331,7 @@ a.visitor-log-visitor-profile-link {
 .own-visitor-column {
   .visitorLogIcons {
     .visitorDetails {
-      margin-top: 0px;
+      margin-top: 0;
     }
     .visitorType {
       margin-top: 8px;
@@ -327,6 +342,10 @@ a.visitor-log-visitor-profile-link {
 .visitorReferrer {
     clear:both;
     padding-top: 1em;
+
+    * {
+      vertical-align: middle;
+    }
 }
 
 .segmentedlog {
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index 5622e42f1a..e6161c2559 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -1,559 +1,440 @@
+.visitor-profile-popup {
+
+  width: 1150px;
+  height: auto;
+  padding: 0;
+
+  > #Piwik_Popover {
+    padding: 0;
+    margin: 0;
+    overflow: visible;
+  }
+
+  > .ui-dialog-titlebar {
+    display: none;
+  }
+}
+
 .visitor-profile {
-    position:relative;
-    width:1150px;
-    border:1px solid #a19e96;
-    border-radius:5px;
-    background:url(../images/visitor_profile_background.jpg) repeat;
-    box-shadow:5px 5px 5px rgba(0,0,0,0.22);
-    text-align:left;
-
-    h1 {
-        font-size:23px;
-        text-shadow:0 1px 0 rgba(255,255,255,1);
-        margin:9px 0 0 0;
-        padding:0;
-        font-weight: normal;
-        color: @theme-color-text;
-
-        a {
-            font-size:12px;
-            margin-left:3px;
-        }
-    }
+  position: relative;
+  width: 1150px;
+  box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.22);
+  text-align: left;
+  font-size: 13px;
+  line-height: 20px;
 
-    h2 {
-        display:inline-block;
-        font-size:23px;
-        margin:0 0 0 5px;
-        padding:15px 17px 15px 22px;
-        color:black;
-        border: none;
-        color: @theme-color-text;
-    }
+  body .widget & {
+    width: auto;
+    box-shadow: none;
 
     p {
-        margin-left: 0;
-        margin-right: 0;
-        .font-default(13px, 18px);
-        color: @color-silver-l60;
-        strong {
-            .font-default(13px, 18px);
-            color: @theme-color-text;
-            font-weight: normal !important;
-        }
-        span {
-            .font-default(13px, 18px);
-        }
+      margin: 0;
     }
+  }
 
-    p {
-        font-size:13px;
-        color:#5e5e5c;
-        line-height:20px;
-    }
+  a {
+    color: #255792;
+  }
 
+  h1 {
+    line-height: 30px;
+    vertical-align: top;
+    font-size: 23px;
+    margin: 0 0 5px 0;
+    color: @theme-color-text;
+  }
 
-    span.truncated-text-line {
-        display:inline-block;
-        &.event {
-          max-width: 89%;
-        }
+  p {
+    color: #5e5e5c;
+
+    body:not(.widgetized) .widget & {
+      padding-bottom: 0;
     }
-}
 
-.visitor-profile-summary,.visitor-profile-important-visits,.visitor-profile-avatar,.visitor-profile-visits-container {
-    span, strong {
-        display:inline;
-        font-size:14px;
-        color:#413838;
-        line-height:19px;
-        padding-left:4px;
+    strong {
+      color: @theme-color-text;
+      font-weight: normal !important;
     }
-}
+  }
 
-.visitor-profile-widget-link {
-    color:#5e5e5c;
+  p.alert {
+    margin: 8px 20px 20px 0 !important;
+    font-size: 13px;
+  }
 }
 
-.visitor-profile-export {
-    vertical-align: middle;
-    margin-top:3px;
+.visitor-profile-options {
+  z-index: 10;
+  position: absolute;
+  right: 6px;
+  height: 28px;
 }
 
-.visitor-profile-close:before {
-  content: "\e60a";
+.visitor-profile-toggle-actions,
+.visitor-profile-help,
+.visitor-profile-close {
+  float: right;
+  text-decoration: none !important;
+  margin-right: 5px;
+
+  &:before {
+    color: #000;
+    background-color: #fff;
+    font-size: 16px;
+    line-height: 16px;
+    font-weight: 400;
+    font-family: piwik;
+    padding: 1px;
+    height: 18px;
+    display: block;
+    margin: 5px 0;
+  }
 }
 
 .visitor-profile-close {
-    z-index: 10;
-    position:absolute;
-    right:6px;
-    top: 4px;
-    height:20px;
-    width:21px;
+  margin-right: 0;
+
+  &:before {
+    padding: 4.5px;
+    content: "\e60a";
     background-color: #d4291f;
-    color: #FFFFFF !important;
+    color: #fff;
     border-radius: 3px;
     font-size: 9px;
-    font-weight: 400;
-    font-family: piwik;
-    text-decoration: none !important;
-    text-align: center !important;
-    padding: 4.5px;
-}
-
-.visitor-profile a {
-    color:#255792;
-}
+    line-height: 9px;
+  }
 
-.visitor-profile > div {
-    width:100%;
+  .widget & {
+    display: none;
+  }
 }
 
-.visitor-profile-info {
-    height:auto;
-    border-top:2px solid #f6f6f6;
-    border-bottom:1px solid #d1cec8;
-    border-radius:5px 5px 0 0;
-    box-shadow:inset 0 25px 15px -10px #e0e0e0, inset 0 -25px 15px -10px #e0e0e0;
-
-    > div { // row
-        border-bottom:1px solid #d1cec8;
-
-        > div { // columns
-            vertical-align:top;
-            height:auto;
-            display:inline-block;
-        }
-    }
+.visitor-profile-toggle-actions {
+  &:before {
+    content: "\e62b";
 
-    .visitor-profile-overview { // first column
-      width:574px;
-      border-left:none;
-      margin:0 -3px 0 0;
-      border-right:1px solid #d1cec8;
-    }
-    .visitor-profile-visits-info { // last column
-      width:573.5px;
-      border-bottom:none;
-      margin:0 0 0 -4px;
-      border-left:1px solid #d1cec8;
+    .minimized& {
+      content: "\e61c";
     }
+  }
 }
 
-.visitor-profile-avatar > div {
-    position:relative;
-    float:left;
-    min-height:145px;
-    margin:6px 15px 0 0;
-    padding-bottom:4px;
+.visitor-profile-help {
+  &:before {
+    content: "\e61f";
+  }
 }
 
-.visitor-profile-avatar > div:first-child {
-    width:166px;
-    margin-right:0;
-    padding-left:7px;
-
-    > .visitor-profile-image-frame {
-        width:149px;
-        height:154px;
-        background:url(../images/avatar_frame.png) no-repeat;
-
-        > img { // avatar image
-            max-width:122px;
-            height:120px;
-            margin:11px 0 0 12px;
-        }
-    }
-
-    > img { // paperclip image
-        position:absolute;
-        top:-20px;
-        left:3px;
-        z-index:2;
-    }
+.visitor-profile-info {
+  overflow: hidden;
 }
 
-.visitor-profile-avatar > div:last-child {
-    margin-right:0;
-}
+.visitor-profile-visits-info,
+.visitor-profile-overview {
+  display: inline-block;
+  vertical-align: top;
+  height: auto;
+  border: none;
+  box-sizing: content-box;
+  float: left;
 
-.visitor-profile-avatar h1 {
-    display:inline-block;
-}
+  body:not(.widgetized) .widget & {
+    width: 100%;
+    border: none;
+    margin: 0;
+  }
 
-.visitor-profile-extra-cvars {
-    border-top: 1px solid #d1cec8;
+  body.widgetized .widget & {
+    width: 50%;
+    box-sizing: border-box;
+  }
 }
 
-.visitor-profile-more-info {
-    height:18px;
-    border-radius:0 0 5px 5px;
-    text-align:center;
-    padding:0 0 13px;
-
-    > a {
-        font-size:14px;
-        text-decoration:none;
-        color:#255792;
-        text-shadow:0 1px 0 rgba(255,255,255,1);
-    }
-
-    > .loadingPiwik {
-        padding:0 0 0 4px;
+@media only screen and (max-width: 1000px) {
+  body.widgetized .widget {
+    .visitor-profile-visits-info,
+    .visitor-profile-overview {
+      width: 100%;
     }
+  }
 }
 
-.visitor-profile-latest-visit {
-    position:relative;
-}
-
-.visitor-profile-latest-visit-column {
-    padding-top:6px;
-    display:inline-block;
-    vertical-align:top;
-}
-
-.visitor-profile-browser {
-    margin-left: 5px;
-    display:inline-block;
-}
-
-.visitor-profile-os {
-    display:inline-block;
+.visitor-profile-widget-link {
+  color: #5e5e5c;
 }
 
-.visitor-profile-latest-visit-column:last-child {
-    margin-left:9px;
-}
+.visitor-profile-overview {
+  margin: 0;
+  border-right: 1px solid #d1cec8;
+  padding: 22px 0 0 22px;
+  width: 553px;
 
-.visitor-profile-avatar ul {
-    width:178px;
+  body:not(.widgetized) .widget & {
+    padding: 0 10px;
+  }
 }
 
-.visitor-profile-avatar ul li {
-    display:inline-block;
-    min-height:24px;
-    border-bottom:1px solid #d1cec8;
-    width:100%;
+.visitor-profile-visits-info {
+  margin: 28px 0 0 -1px;
+  border-left: 1px solid #d1cec8;
+  width: 574px;
 }
 
-.visitor-profile-id {
-    height:24px;
-}
+.visitor-profile-header {
+  overflow: hidden;
+  font-size: 14px;
 
-.visitor-profile-avatar ul li:last-child {
-    border-bottom:none;
-}
+  > div {
+    float: left;
+  }
 
-.visitor-profile-map {
-    padding:0 21px 13px 21px;
+  .visitor-profile-avatar {
+    width: 149px;
+    height: 154px;
 
-    .dataTableFeatures,.no_data {
-        display:none !important;
+    > img {
+      max-width: 122px;
+      height: 120px;
     }
-}
+  }
 
-.visitor-profile-map > div {
-    border-radius:2px;
-    background-color:#fff;
-}
+  .visitor-profile-header-details {
+    width: 376px;
+  }
 
-.visitor-profile-show-map {
-    font-size:13px;
-    font-style:italic;
-}
+  .visitor-profile-prev-visitor {
+    color: #7e7363;
+    display: none;
+    position: absolute;
+    right: 100%;
+    top: 0;
+    margin-right: 2px;
+  }
 
-.visitor-profile-summary,
-.visitor-profile-important-visits,
-.visitor-profile-location,
-.visitor-profile-lifetimevalue
-{
-    overflow:hidden;
-    padding: 5px 0 16px 22px;
+  .visitor-profile-next-visitor {
+    color: #7e7363;
+    display: none;
+  }
 
-    p {
-        font-size:13px;
-        line-height: 20px;
-        margin-top: 6px;
-        margin-right: 1em;
+  &:hover {
+    .visitor-profile-next-visitor,
+    .visitor-profile-prev-visitor {
+      display: inline-block;
     }
-}
-.visitor-profile-location img {
-    border: 1px solid lightgray;
-    box-sizing: content-box;
-}
-
-.visitor-profile-important-visits {
+  }
 
-    > div > div > p:first-child > strong {
-        padding-left:0;
-    }
+  h1 {
+    display: inline-block;
+    word-wrap: break-word;
+    margin: 0;
+    max-width: 355px;
+    color: #0d0d0d;
+  }
 }
 
-.visitor-profile-summary strong {
-    padding-left:0;
+.visitor-profile-headline {
+  position: relative;
+  line-height: 30px;
 }
 
-.visitor-profile-important-visits {
-    > div {
-        float:left;
-        width:265px;
-        height:100%;
-    }
-
-    span {
-        padding-left:0;
-    }
-}
+.visitor-profile-summary {
+  overflow: hidden;
+  padding: 5px 0 16px 0;
 
-.visitor-profile-location>p>.loadingPiwik {
-    padding:0 0 0 4px;
+  p {
+    margin: 6px 1em 0 0;
+  }
 }
 
-.visitor-profile-pages-visited {
-    overflow-y:auto;
-    position:relative;
-    margin-right:10px;
-    border-bottom:none!important;
-    padding: 8px 18px 10px 13px;
-
-    h1 {
-        margin-left:3px;
-    }
+.visitor-profile-pages {
+  li {
+    display: block;
+    clear: both;
+  }
 }
 
-.visitor-profile-visits-container {
-    overflow-y:auto;
-    overflow-x: hidden;
-    position:relative;
-    margin-right:10px;
-    border-bottom:none!important;
-    padding:0 18px 0 13px;
-
-    .action-list-action-icon {
-        margin-right:4px;
-    }
-
-    ol {
-        > li {
-            display:block;
-            font-size:12px;
-            font-weight: normal;
-            line-height:10px;
-            padding:0 0 10px 13px;
-            margin-right: 20px;
-            color: @theme-color-text-lighter;
-
-            span {
-                font-size:13px;
-                font-weight:700;
-                padding-left:0;
-            }
-        }
-    }
-
-    ol.visitor-profile-visits > li {
-        margin:0 0 10px 13px;
-        padding:0;
-
-        > div {
-            margin:0 6px 0 6px;
-        }
-    }
-
-    ol.visitor-profile-actions {
-        counter-reset:item;
-        list-style-type:none;
-
-        > li:before {
-            content:counter(item) "  ";
-            counter-increment:item;
-        }
-    }
-
-    ol li ol {
-        border-top:1px solid #d1cec8;
-    }
-
-    ol > li > ol > li {
-        margin-left:-12px;
-    }
-
-    ol li ol li {
-        display:block;
-        color:#5e5e5c;
-        font-size:13px;
-        line-height:22px;
-        padding-top:1px;
-        padding-bottom:1px;
-    }
-
-    ol li ol li {
-        padding-bottom:4px;
-    }
-
-    ol > li ol li span {
-        padding-left:5px;
-    }
+.visitor-profile-latest-visit {
 
-    ol > li ol li {
-      .action-list-url {
-        margin-left:5px;
-        line-height:15px;
-        font-size:13px;
+  padding-top: 6px;
+
+  .visitorLogIcons {
+    .visitorLogIconWithDetails {
+      display: block;
+      float: left;
+      width: 50%;
+      padding: 6px 0;
+      box-sizing: content-box;
+      height: 16px;
+      position: relative;
+      font-size: 13px;
+
+      img {
+        float: left;
+        margin-left: 2px;
       }
 
-      > div > .action-list-url {
-        line-height:23px;
+      &.flag img {
+        box-sizing: border-box;
+        margin-left: 0;
       }
-    }
 
-    ol > li ol li img {
-        margin-left:7px;
+      &:after {
+        content: attr(profile-header-text);
+        text-overflow: ellipsis;
+        display: block;
+        overflow: hidden;
+        white-space: nowrap;
+        position: absolute;
+        left: 26px;
+      }
     }
 
-    // overrides for _actionsDetails styles
-    strong {
-        font-size:13px;
-        line-height:25px;
+    .visitorType,
+    .visitorTypeIcon {
+      display: none;
     }
+  }
 }
 
-.visitor-profile-current-visit {
-    background-color:#FAFACF;
-}
+.visitor-profile-id {
+  line-height: 24px;
+  font-size: 13px;
 
-.visitor-profile-date {
-    float:right;
-    margin-top:6px;
+  a {
+    color: inherit;
+  }
 }
 
-.visitor-profile-fog {
-    height:25px;
-    width:546px;
-    position:absolute;
-    bottom:51px;
-    right:28px;
-    background:url(../images/visitor_profile_gradient.png) repeat-x;
+.visitor-profile-important-visits > div {
+  float: left;
+  width: 50%;
+  height: 100%;
 }
 
-// popup css
-.visitor-profile-popup {
-    width: 1151px;
-    height: auto;
-    padding: 0;
+.visitor-profile-devices img {
+  height: 16px;
+  float: left;
+  margin-right: 10px;
+  margin-top: 2px;
+}
 
-    > .ui-dialog-titlebar {
-        display: none;
-    }
+.visitor-profile-location {
+  .loadingPiwik {
+    padding: 0 0 0 4px;
+    border: 0;
+  }
 
-    > #Piwik_Popover {
-        padding: 0;
-        margin: 0;
-        overflow: visible;
-    }
+  img {
+    border: 1px solid lightgray;
+    box-sizing: content-box;
+  }
 }
 
-span.visitor-profile-goal-name {
-    font-style:italic;
-    font-size:14px;
+.visitor-profile-map {
+  padding: 10px 21px 13px 2px;
 }
 
-.visitor-profile-see-more-cvars {
-    text-align:center;
+.visitor-profile-visit-title {
+  display: block;
+  font-size: 23px;
+  padding: 13px 15px;
+  border: none;
+  color: @theme-color-text;
+  cursor: pointer;
+  background-color: @color-silver-l95;
 
-    > a {
-        display:inline-block;
-        color:#5e5e5c;
-    }
-}
+  &:hover {
+    background-color: #bfbfbf;
+  }
 
-.visitor-profile-visit-title-row {
-    cursor:pointer;
+  .visitor-profile-date {
+    font-weight: normal;
+    float: right;
+    font-size: 13px;
+    margin-top: 4px;
+  }
 }
 
-.visitor-profile-visit-title-row:hover {
-    background-color:#bfbfbf;
-}
+.visitor-profile-visit-details-extended {
+  display: none;
+  padding: 10px 15px;
+  font-size: 13px;
+  line-height: 1.5em;
+  background-color: @color-silver-l95;
 
-.visitor-profile-avatar .loadingPiwik {
-    padding:0;
-    margin:0;
+  .visitor-log-datetime {
+    display: none;
+  }
 }
 
-.visitor-profile-visits-info {
-    position: relative;
-}
+.visitor-profile-visit-details {
+  padding: 8px 15px;
+  overflow: hidden;
 
-div.visitor-profile-navigation {
-    height:auto;
-    min-height:inherit;
-    font-size:12px;
-    float:none;
-    display:block;
-    padding:0 0 0 22px;
-}
+  .visitorLogIcons {
+    display: inline;
+  }
 
-.visitor-profile-header {
-    position:relative;
+  .visitorLogIconWithDetails {
+    margin-right: 5px;
+  }
 
-    .visitorProfileHelp {
-        display: none;
-        &:hover {
-            text-decoration: none;
-        }
-    }
-}
+  .visitorType {
+    display: inline-block;
+    float: left;
+    margin-right: 15px;
+  }
 
-.visitor-profile-prev-visitor {
-    display:none;
-    position:absolute;
-    right:100%;
-    bottom:0;
-    margin-right:2px;
-}
+  .visitorDetails {
+    display: inline-block;
+    visibility: hidden;
+  }
 
-a.visitor-profile-next-visitor,a.visitor-profile-prev-visitor {
-    display:none;
-    color:#7e7363;
-}
+  &:hover .visitorDetails {
+    visibility: visible;
+  }
 
-.visitor-profile-avatar:hover {
-    .visitor-profile-next-visitor,.visitor-profile-prev-visitor,.visitorProfileHelp {
-        display:inline-block;
-    }
+  .visitorTypeIcon {
+    display: none;
+  }
 }
 
-.visitor-profile-no-visits {
-    color:#999;
-    font-size:13px;
+.visitor-profile-visits-info {
+  position: relative;
 }
 
-.visitor-profile-latest-visit-loc {
-    display:inline-block;
-    position:absolute;
-    right:4px;
-    top:-24px;
+.visitor-profile-show-actions {
+  float: right;
+  display: inline-block;
+  font-size: 13px;
+  line-height: 24px;
 }
 
-// overrides for the widgetized visitor profile
-.widget .visitor-profile {
-    min-width: 100% !important;
+ol.visitor-profile-actions {
+  margin-bottom: 20px;
+
+  li {
+    padding: 0 15px 8px;
+    margin: 0;
 
     p {
-        padding-bottom: 0;
+      line-height: 15px;
     }
+  }
+}
 
-    .visitor-profile-close {
-        display:none;
-    }
+.visitor-profile-more-info {
+  height: 18px;
+  text-align: center;
+  padding: 0 0 13px;
+  margin: 5px 0 15px 0;
 
-    .visitor-profile-info {
-        > div { // row
-            > div { // columns
-                min-width:50% !important;
-            }
-        }
-    }
+  .loadingPiwik {
+    padding: 0 0 0 4px;
+  }
+}
+
+.visitor-profile-no-visits {
+  color: #999;
+  font-size: 13px;
 }
diff --git a/plugins/Live/templates/_actionCommon.twig b/plugins/Live/templates/_actionCommon.twig
new file mode 100644
index 0000000000..a978588527
--- /dev/null
+++ b/plugins/Live/templates/_actionCommon.twig
@@ -0,0 +1,38 @@
+<li class="{% if action.goalName is defined %}goal{% else %}action{% endif %}"
+    title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {# Page view / Download / Outlink #}
+        {% if action.pageTitle|default(false) is not empty %}
+            <span class="truncated-text-line">{{ action.pageTitle|rawSafeDecoded }}</span>
+        {% endif %}
+        {% if action.siteSearchKeyword is defined %}
+            {% if action.type == 'search' %}
+                <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}'
+                     class="action-list-action-icon search">
+            {% endif %}
+            <span class="truncated-text-line">{{ action.siteSearchKeyword|rawSafeDecoded }}</span>
+        {% endif %}
+        {% if action.url is not empty %}
+            {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}
+            {% if action.type == 'download' or action.type == 'outlink' %}
+                <img src='{{ action.icon }}' class="action-list-action-icon {{ action.type }}">
+            {% endif %}
+
+            {% if action.url|trim|lower starts with 'javascript:' or
+            action.url|trim|lower starts with 'vbscript:' or
+            action.url|trim|lower starts with 'data:' %}
+                {{ action.url }}
+            {% else %}
+                <a href="{{ action.url }}" rel="noreferrer" target="_blank"
+                   class="action-list-url truncated-text-line">
+                    {{ action.url|replace({'http://': '', 'https://': ''}) }}
+                </a>
+            {% endif %}
+            {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}</p>{% endif %}
+        {% elseif action.type != 'search' %}
+            <p>
+                <span>{{ 'General_NotDefined'|translate('Actions_ColumnPageURL'|translate) }}</span>
+            </p>
+        {% endif %}
+    </div>
+</li>
diff --git a/plugins/Live/templates/_actionEcommerce.twig b/plugins/Live/templates/_actionEcommerce.twig
new file mode 100644
index 0000000000..a4b9858105
--- /dev/null
+++ b/plugins/Live/templates/_actionEcommerce.twig
@@ -0,0 +1,54 @@
+<li class="action"
+    title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {# Ecommerce Abandoned Cart / Ecommerce Order #}
+        <img src="{{ action.icon }}" class="action-list-action-icon"/>
+        {% if action.type == 'ecommerceOrder' %}
+            <strong>{{ 'Goals_EcommerceOrder'|translate }}</strong>
+            <span style='color:#666;'>({{ action.orderId }})</span>
+        {% else %}
+            <strong>{{ 'Goals_AbandonedCart'|translate }}</strong>
+
+            {# TODO: would be nice to have the icons Orders / Cart in the ecommerce log footer #}
+        {% endif %}
+        <p>
+            <span {% if not isWidget %}style='margin-left:22px;'{% endif %}>
+                {% if action.type == 'ecommerceOrder' %}
+                {# spacing is important for tooltip to look nice #}
+                {% set ecommerceOrderTooltip %}{{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(visitInfo.idSite)|raw }}
+                    {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(visitInfo.idSite)|raw }}{% endif %}
+
+                    {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(visitInfo.idSite)|raw }}{% endif %}
+
+                    {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(visitInfo.idSite)|raw }}{% endif %}
+
+                    {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(visitInfo.idSite)|raw }}{% endif %}
+                {% endset %}
+                <abbr title="{{ ecommerceOrderTooltip }}">{{ 'General_ColumnRevenue'|translate }}:
+                    {% else %}
+                        {% set revenueLeft %}{{ 'General_ColumnRevenue'|translate }}{% endset %}
+                        {{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
+                    {% endif %}
+                    <strong>{{ action.revenue|money(visitInfo.idSite)|raw }}</strong>
+                    {% if action.type == 'ecommerceOrder' %}
+                </abbr>
+                {% endif %}, {{ 'General_Quantity'|translate }}: {{ action.items }}
+
+                {# Ecommerce items in Cart/Order #}
+                {% if action.itemDetails is not empty %}
+                    <ul style='list-style:square;margin-left:{% if isWidget %}15{% else %}50{% endif %}px;'>
+                        {% for product in action.itemDetails %}
+                            <li>
+                                {{ product.itemSKU }}{% if product.itemName is not empty %}: {{ product.itemName }}{% endif %}
+                                {% if product.itemCategory is not empty %} ({{ product.itemCategory }}){% endif %}
+                                ,
+                                {{ 'General_Quantity'|translate }}: {{ product.quantity }},
+                                {{ 'General_Price'|translate }}: {{ product.price|money(visitInfo.idSite)|raw }}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
+            </span>
+        </p>
+    </div>
+</li>
\ No newline at end of file
diff --git a/plugins/Live/templates/_actionGoal.twig b/plugins/Live/templates/_actionGoal.twig
new file mode 100644
index 0000000000..dadfc566e8
--- /dev/null
+++ b/plugins/Live/templates/_actionGoal.twig
@@ -0,0 +1,11 @@
+<li class="action"
+    title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {# Goal conversion #}
+        <img src="{{ action.icon }}" class="action-list-action-icon" />
+        <strong>{{ action.goalName }}</strong>
+        {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}:
+            <strong>{{ action.revenue|money(visitInfo.idSite)|raw }}</strong>
+        {% endif %}
+    </div>
+</li>
\ No newline at end of file
diff --git a/plugins/Live/templates/_actionTooltip.twig b/plugins/Live/templates/_actionTooltip.twig
new file mode 100644
index 0000000000..b0e885a1ae
--- /dev/null
+++ b/plugins/Live/templates/_actionTooltip.twig
@@ -0,0 +1,8 @@
+{{ action.serverTimePretty }}{% if action.url is defined and action.url|trim|length %}
+
+{{ action.url }}{% endif %}{%- if action.generationTime is defined %}
+
+{{ 'General_ColumnGenerationTime'|translate }}: {{ action.generationTime|raw }}{% endif %}
+{%- if action.timeSpentPretty is defined %}
+
+{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif -%}
\ No newline at end of file
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index a36a9da66d..1f6ff3e7c9 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -1,133 +1,14 @@
 {% set previousAction = false %}
 {% for action in actionDetails %}
-    {% set customVariablesTooltip %}
-        {% if action.customVariables is defined %}
-            {{ 'CustomVariables_CustomVariables'|translate }}:
-            {% for id,customVariable in action.customVariables %}
-                {% set name = 'customVariablePageName' ~ id %}
-                {% set value = 'customVariablePageValue' ~ id %}
-                - {{ customVariable[name]|raw }} {% if customVariable[value]|length > 0 %} = {{ customVariable[value]|raw }}{% endif %}
 
-                {# line break above is important #}
-            {% endfor %}
-        {% endif %}
-    {% endset %}
+    {{ postEvent('Live.renderAction', action, previousAction, visitInfo) }}
 
-    <li class="{% if action.goalName is defined %}goal{% else %}action{% endif %}"
-        title="{{ action.serverTimePretty }}{% if action.url is defined and action.url|trim|length %}
+{% set previousAction = action %}
+{% endfor %}
 
-{{ action.url }}{% endif %}{% if customVariablesTooltip|trim|length %}
-
-{{ customVariablesTooltip|trim }}{% endif -%}
-        {%- if action.generationTime is defined %}
-
-{{ 'General_ColumnGenerationTime'|translate }}: {{ action.generationTime|raw }}{% endif %}
-        {%- if action.timeSpentPretty is defined %}
-
-{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif -%}">
-        <div>
-        {% if action.type == 'ecommerceOrder' or action.type == 'ecommerceAbandonedCart' %}
-        {# Ecommerce Abandoned Cart / Ecommerce Order #}
-            <img src="{{ action.icon }}"/>
-            {% if action.type == 'ecommerceOrder' %}
-                <strong>{{ 'Goals_EcommerceOrder'|translate }}</strong>
-                <span style='color:#666;'>({{ action.orderId }})</span>
-            {% else %}
-                <strong>{{'Goals_AbandonedCart'|translate}}</strong>
-
-                {# TODO: would be nice to have the icons Orders / Cart in the ecommerce log footer #}
-            {% endif %}
-            <p>
-            <span {% if not isWidget %}style='margin-left:20px;'{% endif %}>
-                {% if action.type == 'ecommerceOrder' %}
-{# spacing is important for tooltip to look nice #}
-{% set ecommerceOrderTooltip %}{{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(clientSideParameters.idSite)|raw }}
-{% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(clientSideParameters.idSite)|raw }}{% endif %}
-
-{% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(clientSideParameters.idSite)|raw }}{% endif %}
-
-{% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(clientSideParameters.idSite)|raw }}{% endif %}
-
-{% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(clientSideParameters.idSite)|raw }}{% endif %}
-{% endset %}
-                <abbr title="{{ ecommerceOrderTooltip }}">{{ 'General_ColumnRevenue'|translate }}:
-                {% else %}
-                    {% set revenueLeft %}{{ 'General_ColumnRevenue'|translate }}{% endset %}
-                    {{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
-                {% endif %}
-                    <strong>{{ action.revenue|money(clientSideParameters.idSite)|raw }}</strong>
-                {% if action.type == 'ecommerceOrder' %}
-                </abbr>
-                {% endif %}, {{ 'General_Quantity'|translate }}: {{ action.items }}
-
-                {# Ecommerce items in Cart/Order #}
-                {% if action.itemDetails is not empty %}
-                    <ul style='list-style:square;margin-left:{% if isWidget %}15{% else %}50{% endif %}px;'>
-                        {% for product in action.itemDetails %}
-                            <li>
-                                {{ product.itemSKU }}{% if product.itemName is not empty %}: {{ product.itemName }}{% endif %}
-                                {% if product.itemCategory is not empty %} ({{ product.itemCategory }}){% endif %}
-                                ,
-                                {{ 'General_Quantity'|translate }}: {{ product.quantity }},
-                                {{ 'General_Price'|translate }}: {{ product.price|money(clientSideParameters.idSite)|raw }}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                {% endif %}
-            </span>
-            </p>
-        {% elseif action.goalName is not defined%}
-            {# Page view / Download / Outlink / Event #}
-            {% if action.pageTitle|default(false) is not empty %}
-                <span class="truncated-text-line">{{ action.pageTitle|rawSafeDecoded }}</span>
-            {% endif %}
-            {% if action.siteSearchKeyword is defined %}
-                {% if action.type == 'search' %}
-                    <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}' class="action-list-action-icon search">
-                {% endif %}
-                <span class="truncated-text-line">{{ action.siteSearchKeyword|rawSafeDecoded }}</span>
-            {% endif %}
-            {% if action.eventCategory|default(false) is not empty %}
-                <img src='{{ action.icon }}' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon event">
-                <span class="truncated-text-line event">{{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
-            {% endif %}
-            {% if action.url is not empty %}
-                {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}
-                {% if action.type == 'download' or action.type == 'outlink' %}
-                    <img src='{{ action.icon }}' class="action-list-action-icon {{ action.type }}">
-                {% endif %}
-
-                {% if action.eventCategory|default(false) is not empty
-                    and previousAction.url|default(false) == action.url %}
-                    {# For events, do not show (url) if the Event URL is the same as the URL last displayed #}
-                {% else %}
-                    {% if action.url|trim|lower starts with 'javascript:' or
-                          action.url|trim|lower starts with 'vbscript:' or
-                          action.url|trim|lower starts with 'data:' %}
-                        {{ action.url }}
-                    {%  else %}
-                    <a href="{{ action.url }}" rel="noreferrer" target="_blank" class="{% if action.eventCategory|default(false) is empty %}action-list-url{# don't put URL on new line for events #}{% endif %} truncated-text-line"
-                       {% if overrideLinkStyle is not defined or overrideLinkStyle %}style="text-decoration:underline;"{% endif %}>
-                       {{ action.url|replace({'http://': '', 'https://': ''}) }}
-                    </a>
-                    {%  endif %}
-                {% endif %}
-                {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}</p>{% endif %}
-            {% elseif action.type != 'search' and action.type != 'event' %}
-                <p>
-                <span>{{ clientSideParameters.pageUrlNotDefined }}</span>
-                </p>
-            {% endif %}
-        {% else %}
-            {# Goal conversion #}
-            <img src="{{ action.icon }}" />
-            <strong>{{ action.goalName }}</strong>
-            {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}:
-                <strong>{{ action.revenue|money(clientSideParameters.idSite)|raw }}</strong>
-            {% endif %}
-        {% endif %}
-        </div>
+{% if visitInfo.truncatedActionsCount is defined %}
+    <li class="more">
+        <span class="icon-info"></span>
+        {{ 'Live_MorePagesNotDisplayed'|translate }}
     </li>
-
-    {% set previousAction = action %}
-{% endfor %}
\ No newline at end of file
+{% endif %}
\ No newline at end of file
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index 5281f9974f..eb09ee8730 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -2,111 +2,6 @@
 
 {% set cycleIndex=0 %}
 {% for visitor in dataTable.getRows() %}
-    {% set visitHasEcommerceActivity = visitor.getColumn('visitEcommerceStatusIcon') %}
-    {% set breakBeforeVisitorRank = (visitHasEcommerceActivity and visitor.getColumn('visitorTypeIcon')) ? true : false %}
-    {% set visitorColumnContent %}
-
-    <span class="visitorLogIcons">
-
-        <span class="visitorDetails">
-        {% if visitor.getColumn('browserIcon') %}
-            <span class="visitorLogIconWithDetails">
-                <img src="{{ visitor.getColumn('browserIcon') }}"/>
-                <ul class="details">
-                    <li>{{ 'DevicesDetection_ColumnBrowser'|translate }}: {{ visitor.getColumn('browser') }}</li>
-                    <li>{{ 'DevicesDetection_BrowserEngine'|translate }}: {{ visitor.getColumn('browserFamily') }}</li>
-                    {% if visitor.getColumn('pluginsIcons')|length > 0 %}
-                        <li>
-                            {{ 'General_Plugins'|translate }}:
-                            {% for pluginIcon in visitor.getColumn('pluginsIcons') %}
-                                <img width="16px" height="16px" src="{{ pluginIcon.pluginIcon }}" alt="{{ pluginIcon.pluginName|capitalize(true) }}"/>
-                            {% endfor %}
-                        </li>
-                    {% endif %}
-                </ul>
-            </span>
-        {% endif %}
-        {% if visitor.getColumn('operatingSystemIcon') %}
-            <span class="visitorLogIconWithDetails">
-                <img src="{{ visitor.getColumn('operatingSystemIcon') }}"/>
-                <ul class="details">
-                    <li>{{ 'DevicesDetection_ColumnOperatingSystem'|translate }}: {{ visitor.getColumn('operatingSystem') }}</li>
-                </ul>
-            </span>
-        {% endif %}
-        {% if visitor.getColumn('deviceTypeIcon') %}
-            <span class="visitorLogIconWithDetails">
-                <img src="{{ visitor.getColumn('deviceTypeIcon') }}"/>
-                <ul class="details">
-                    <li>{{ 'DevicesDetection_DeviceType'|translate }}: {{ visitor.getColumn('deviceType') }}</li>
-                    {% if visitor.getColumn('deviceBrand') %}<li>{{ 'DevicesDetection_DeviceBrand'|translate }}: {{ visitor.getColumn('deviceBrand') }}</li>{% endif %}
-                    {% if visitor.getColumn('deviceModel') %}<li>{{ 'DevicesDetection_DeviceModel'|translate }}: {{ visitor.getColumn('deviceModel') }}</li>{% endif %}
-                    {% if visitor.getColumn('resolution') %}<li>{{ 'Resolution_ColumnResolution'|translate }}: {{ visitor.getColumn('resolution') }}</li>{% endif %}
-                </ul>
-            </span>
-        {% endif %}
-        </span>
-
-        <span class="visitorType">
-            {# Goals, and/or Ecommerce activity #}
-            {% if visitor.getColumn('visitConverted') %}
-                <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.getColumn('goalConversions')) }}" class='visitorRank visitorLogTooltip'
-                      {% if not displayVisitorsInOwnColumn or breakBeforeVisitorRank %}style="margin-left:0;"{% endif %}>
-                    <img src="{{ visitor.getColumn('visitConvertedIcon') }}"/>
-                    <span class='hash'>#</span>
-                    {{ visitor.getColumn('goalConversions') }}
-                    {% if visitHasEcommerceActivity %}
-                        &nbsp;
-                        <img src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" class='visitorLogTooltip' title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
-                    {% endif %}
-                </span>
-            {# Ecommerce activity only (no goal) #}
-            {% elseif visitHasEcommerceActivity %}
-                <img class="visitorLogTooltip" src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
-            {% endif %}
-        </span>
-    </span>
-
-    {% endset %}
-
-    {% set referrerContent %}
-    <div class="visitorReferrer">
-        {% if visitor.getColumn('referrerType') == 'website' %}
-            {{ 'Referrers_ColumnWebsite'|translate }}:
-            <a href="{{ visitor.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" class="visitorLogTooltip" title="{{ visitor.getColumn('referrerUrl') }}"
-               style="text-decoration:underline;">
-                {{ visitor.getColumn('referrerName') }}
-            </a>
-        {% endif %}
-        {% if visitor.getColumn('referrerType') == 'campaign' %}
-            {{ 'Referrers_ColumnCampaign'|translate }}: {{ visitor.getColumn('referrerName') }}
-            {% if visitor.getColumn('referrerKeyword') is not empty %} - {{ visitor.getColumn('referrerKeyword') }}{% endif %}
-        {% endif %}
-        {% if visitor.getColumn('referrerType') == 'search' %}
-            {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
-            {%- set showKeyword = visitor.getColumn('referrerKeyword') is not empty and visitor.getColumn('referrerKeyword') != keywordNotDefined -%}
-            {% if visitor.getColumn('searchEngineIcon') %}
-                <img src="{{ visitor.getColumn('searchEngineIcon') }}" alt="{{ visitor.getColumn('referrerName') }}"/>
-            {% endif %}
-            <span {% if not showKeyword %}title="{{ keywordNotDefined }}" class="visitorLogTooltip"{% endif %}>{{ visitor.getColumn('referrerName') }}</span>
-            {% if showKeyword %}{{ 'Referrers_Keywords'|translate }}:
-                <a href="{{ visitor.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" style="text-decoration:underline;">
-                    "{{ visitor.getColumn('referrerKeyword') }}"</a>
-            {% endif %}
-            {% set keyword %}{{ visitor.getColumn('referrerKeyword') }}{% endset %}
-            {% set searchName %}{{ visitor.getColumn('referrerName') }}{% endset %}
-            {% set position %}#{{ visitor.getColumn('referrerKeywordPosition') }}{% endset %}
-            {% if visitor.getColumn('referrerKeywordPosition') %}
-                <span title='{{ 'Live_KeywordRankedOnSearchResultForThisVisitor'|translate(keyword,position,searchName) }}' class='visitorRank visitorLogTooltip'>
-                                <span class='hash'>#</span>
-                    {{ visitor.getColumn('referrerKeywordPosition') }}
-                            </span>
-            {% endif %}
-        {% endif %}
-        {% if visitor.getColumn('referrerType') == 'direct' %}{{ 'Referrers_DirectEntry'|translate }}{% endif %}
-    </div>
-    {% endset %}
-
     {% set visitorRow %}
         <div class="card row hoverable">
 
@@ -119,80 +14,12 @@
 
         {% set cycleIndex=cycleIndex+1 %}
             <div class="col s12 m{% if displayVisitorsInOwnColumn %}3{% else %}4{% endif %}">
-                <strong class="visitorLogTooltip" title="{% if visitor.getColumn('visitorType')=='new' %}{{ 'General_NewVisitor'|translate }}{% else %}{{ 'Live_VisitorsLastVisit'|translate(visitor.getColumn('daysSinceLastVisit')) }}{% endif %}">
-                    {{ visitor.getColumn('serverDatePrettyFirstAction') }}
-                    {% if isWidget %}<br/>{% else %}-{% endif %} {{ visitor.getColumn('serverTimePrettyFirstAction') }}</strong>
-                {% if visitor.getColumn('visitIp') is not empty %}
-                    <br/>
-                <span class="visitorLogTooltip" title="{% if visitor.getColumn('userId') is not empty %}{{ 'General_UserId'|translate }}: {{ visitor.getColumn('userId')|raw }}{% endif %}
-
-{% if visitor.getColumn('visitorId') is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitor.getColumn('visitorId') }}{% endif -%}
-{%- if visitor.getColumn('latitude') or visitor.getColumn('longitude') %}
-
-{{ visitor.getColumn('location') }}
-
-GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longitude') }}{% endif %}">
-                    IP: {{ visitor.getColumn('visitIp') }}
-                    {% if visitor.getColumn('userId') is not empty %}<br/><br/>{{ visitor.getColumn('userId')|raw }}{% endif %}
-
-                    </span>{% endif %}
-
-                {% if visitor.getColumn('provider') %}
-                    <br/>
-                    {{ 'Provider_ColumnProvider'|translate }}:
-                    {% if visitor.getColumn('providerUrl') %}
-                        <a href="{{ visitor.getColumn('providerUrl') }}" rel="noreferrer" target="_blank" class="visitorLogTooltip" title="{{ visitor.getColumn('providerName') }} {{ visitor.getColumn('providerUrl') }}" style="text-decoration:underline;">
-                    {% endif -%}
-                        {{ visitor.getColumn('providerName') }}
-                    {%- if visitor.getColumn('providerUrl') %}</a>{% endif %}
-                {% endif %}
-                {% if visitor.getColumn('visitorTypeIcon') or visitor.getColumn('countryFlag') %}
-                    <br/>
-                {% endif %}
-                {% if visitor.getColumn('visitorTypeIcon') %}
-                    <span class="visitorLogIconWithDetails">
-                        <img src="{{ visitor.getColumn('visitorTypeIcon') }}"/>
-                        <ul class="details">
-                            <li>{{ 'General_ReturningVisitor'|translate }} - {{ 'General_NVisits'|translate(visitor.getColumn('visitCount')) }}</li>
-                        </ul>
-                    </span>
-                {% endif %}
-                {% if visitor.getColumn('countryFlag') %}
-                    <span class="visitorLogIconWithDetails flag">
-
-                        <img height="16px" src="{{ visitor.getColumn('countryFlag') }}"/>
-                        {% if visitor.getColumn('city') %}{{ visitor.getColumn('city')|rawSafeDecoded }}{% endif -%}
-                        {%- if visitor.getColumn('region') %}{% if visitor.getColumn('city') %}, {% endif %}{{ visitor.getColumn('region')|rawSafeDecoded }}{% endif %}
-
-                        <ul class="details">
-                            <li>{{ 'UserCountry_Country'|translate }}: {{ visitor.getColumn('country') }}</li>
-                            {% if visitor.getColumn('region') %}<li>{{ 'UserCountry_Region'|translate }}: {{ visitor.getColumn('region') }}</li>{% endif %}
-                            {% if visitor.getColumn('city') %}<li>{{ 'UserCountry_City'|translate }}: {{ visitor.getColumn('city') }}</li>{% endif %}
-                        </ul>
-                    </span>
-                {% endif %}
-                {% if visitor.getColumn('customVariables') %}
-                    <br/>
-                    {% for id,customVariable in visitor.getColumn('customVariables') %}
-                        {% set name='customVariableName' ~ id %}
-                        {% set value='customVariableValue' ~ id %}
-                        <br/>
-                        <acronym class="visitorLogTooltip" title="{{ 'CustomVariables_CustomVariables'|translate }} (index {{ id }})">
-                            {{ customVariable[name]|truncate(30) }}
-                        </acronym>
-                    {% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %}
-                    {% endfor %}
-                {% endif %}
-                {% if not displayVisitorsInOwnColumn %}
-                    <br/>
-                    {{ visitorColumnContent }}
-                {% endif %}
-                    {{ referrerContent }}
+                {{ postEvent('Live.renderVisitorDetails', visitor) }}
             </div>
 
             {% if displayVisitorsInOwnColumn %}
                 <div class="col s12 m2 own-visitor-column">
-                    {{ visitorColumnContent }}
+                    {{ postEvent('Live.renderVisitorIcons', visitor) }}
                 </div>
             {% endif %}
 
@@ -200,8 +27,12 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
                 {{ postEvent('Live.visitorLogViewBeforeActionsInfo', visitor) }}
 
                 <strong>
-                    {{ visitor.getColumn('actionDetails')|length }}
-                    {% if visitor.getColumn('actionDetails')|length <= 1 %}
+                    {% set actionCount = visitor.getColumn('actionDetails')|length %}
+                    {% if visitor.truncatedActionsCount is defined %}
+                        {% set actionCount = actionCount + visitor.truncatedActionsCount %}
+                    {% endif %}
+                    {{ actionCount }}
+                    {% if actionCount <= 1 %}
                         {{ 'General_Action'|translate }}
                     {% else %}
                         {{ 'General_Actions'|translate }}
@@ -211,7 +42,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
 
                 <div class="visitor-log-page-list">
                     <ol class='visitorLog'>
-                        {% include "@Live/_actionsList.twig" with {'actionDetails': visitor.getColumn('actionDetails')} %}
+                        {% include "@Live/_actionsList.twig" with {'actionDetails': visitor.getColumn('actionDetails'), 'visitInfo': visitor} %}
                     </ol>
                 </div>
                 {{ postEvent('Live.visitorLogViewAfterActionsInfo', visitor) }}
diff --git a/plugins/Live/templates/_profileSummary.twig b/plugins/Live/templates/_profileSummary.twig
new file mode 100644
index 0000000000..b10c5c016b
--- /dev/null
+++ b/plugins/Live/templates/_profileSummary.twig
@@ -0,0 +1,38 @@
+{% set pageviewDetails %}
+    {{ visitorData.totalUniquePageViews }} {{ 'General_ColumnUniquePageviews'|translate }}, {{ visitorData.totalRevisitedPages }} {{ 'Actions_RevisitedPages'|translate }}
+{% endset %}
+
+<div class="visitor-profile-summary visitor-profile-resume">
+    <h1>{{ 'General_Summary'|translate }}</h1>
+    <div>
+        {% if visitorData.totalPageViews != visitorData.totalActions %}
+            {% set actionDetails = [] %}
+            {% if visitorData.totalPageViews > 0 %}{% set actionDetails = actionDetails|merge(['<span title="' ~ pageviewDetails ~ '">' ~ visitorData.totalPageViews ~ ' ' ~ 'General_ColumnPageviews'|translate ~ '</span>']) %}{% endif %}
+            {% if visitorData.totalEvents > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalEvents ~ ' ' ~ 'Events_Events'|translate]) %}{% endif %}
+            {% if visitorData.totalDownloads > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalDownloads ~ ' ' ~ 'General_Downloads'|translate]) %}{% endif %}
+            {% if visitorData.totalOutlinks > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalOutlinks ~ ' ' ~ 'General_Outlinks'|translate]) %}{% endif %}
+            {% if visitorData.totalSearches > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalSearches ~ ' ' ~ 'Actions_ColumnSearches'|translate]) %}{% endif %}
+            <p>{{ 'Live_VisitSummaryWithActionDetails'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions, '</strong>', actionDetails|join(', ') , '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
+        {% else %}
+            <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong title="' ~ pageviewDetails ~ '">' ~ visitorData.totalActions,  '</strong>', '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
+        {% endif %}
+        <p>{% if visitorData.totalGoalConversions %}<strong>{% endif %}{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}{% if visitorData.totalGoalConversions %}</strong>{% endif %}
+        {%- if visitorData.totalGoalConversions %} (
+            {%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
+            {%- set idGoal = idGoal[7:] -%}
+            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} {{ goals[idGoal]['name'] -}}
+            {%- endfor -%}
+        ){% endif %}.</p>
+        {% if visitorData.totalSearches|default(0) %}
+        <p>
+            {{ 'Actions_WidgetSearchKeywords'|translate }}:
+            {%- for entry in visitorData.searches %} <strong title="{% if entry.searches == 1 %}{{ 'Actions_OneSearch'|translate }}{% else %}{{ 'UserCountryMap_Searches'|translate(entry.searches) }}{% endif %}">{{ entry.keyword }}</strong>{% if not loop.last %},{% endif %}{% endfor %}
+        </p>
+        {% endif %}
+        {% if visitorData.averagePageGenerationTime is defined %}
+        <p title="{{ 'Live_CalculatedOverNPageViews'|translate(visitorData.totalPageViewsWithTiming) }}">
+            {{ 'Live_AveragePageGenerationTime'|translate('<strong>' ~ visitorData.averagePageGenerationTime ~ 's</strong>')|raw }}
+        </p>
+        {% endif %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugins/Live/templates/_profileSummaryVisits.twig b/plugins/Live/templates/_profileSummaryVisits.twig
new file mode 100644
index 0000000000..a5c247ddf6
--- /dev/null
+++ b/plugins/Live/templates/_profileSummaryVisits.twig
@@ -0,0 +1,39 @@
+<div class="visitor-profile-summary visitor-profile-important-visits">
+    {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
+    <div>
+        <h1>{% if visitorData.visitsAggregated == 100 %}{{ 'General_Visit'|translate }}# 100{% else %}{{ 'Live_FirstVisit'|translate }}{% endif %}</h1>
+        <div>
+            <p><strong>{{ visitorData.firstVisit.prettyDate }}</strong>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.firstVisit.daysAgo) }}</p>
+            <p>
+                {{ 'General_FromReferrer'|translate }} <strong {% if visitorData.firstVisit.referrerType == 'search' and '(' not in visitorData.firstVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>
+                    {%- if visitorData.firstVisit.referrerType == 'website' %}
+                        <a href="{{ visitorData.firstVisit.referrerUrl }}" target="_blank">
+                            {{ visitorData.firstVisit.referralSummary }}
+                        </a>
+                    {% else %}
+                        {{ visitorData.firstVisit.referralSummary }}
+                    {% endif %}
+                </strong>
+            </p>
+        </div>
+    </div>
+    {% if visitorData.lastVisits.getRowsCount() != 1 %}
+        <div>
+            <h1>{{ 'Live_LastVisit'|translate }}</h1>
+            <div>
+                <p><strong>{{ visitorData.lastVisit.prettyDate }}</strong>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.lastVisit.daysAgo) }}</p>
+                <p>
+                    {{ 'General_FromReferrer'|translate }} <strong {% if visitorData.lastVisit.referrerType == 'search' and '(' not in visitorData.lastVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>
+                        {%- if visitorData.lastVisit.referrerType == 'website' %}
+                            <a href="{{ visitorData.lastVisit.referrerUrl }}" target="_blank">
+                                {{ visitorData.lastVisit.referralSummary }}
+                            </a>
+                        {% else %}
+                            {{ visitorData.lastVisit.referralSummary }}
+                        {% endif %}
+                    </strong>
+                </p>
+            </div>
+        </div>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/plugins/Live/templates/_visitorDetails.twig b/plugins/Live/templates/_visitorDetails.twig
new file mode 100644
index 0000000000..63edc4fd80
--- /dev/null
+++ b/plugins/Live/templates/_visitorDetails.twig
@@ -0,0 +1,17 @@
+<strong class="visitor-log-datetime visitorLogTooltip" title="{% if visitInfo.getColumn('visitorType')=='new' %}{{ 'General_NewVisitor'|translate }}{% else %}{{ 'Live_VisitorsLastVisit'|translate(visitInfo.getColumn('daysSinceLastVisit')) }}{% endif %}">
+    {{ visitInfo.getColumn('serverDatePrettyFirstAction') }}
+    {% if isWidget %}<br/>{% else %}-{% endif %} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}</strong>
+{% if visitInfo.getColumn('visitIp') is not empty %}
+<span class="visitor-log-ip-location visitorLogTooltip" title="{% if visitInfo.getColumn('userId') is not empty %}{{ 'General_UserId'|translate }}: {{ visitInfo.getColumn('userId')|raw }}
+{% endif %}{% if visitInfo.getColumn('visitorId') is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitInfo.getColumn('visitorId') }}
+{% endif %}{% if visitInfo.getColumn('idVisit') is not empty %}
+{{ 'General_Visit'|translate }} ID: {{ visitInfo.getColumn('idVisit') }}
+{% endif %}{% if visitInfo.getColumn('latitude') or visitInfo.getColumn('longitude') %}{{ visitInfo.getColumn('location') }}
+GPS (lat/long): {{ visitInfo.getColumn('latitude') }},{{ visitInfo.getColumn('longitude') }}{% endif %}">
+    IP: {{ visitInfo.getColumn('visitIp') }}
+    {% if visitInfo.getColumn('userId') is not empty %}<br/><br/>{{ visitInfo.getColumn('userId')|raw }}{% endif %}
+</span>{% endif %}
+{% if isWidget %}
+    <br />
+    {{ postEvent('Live.renderVisitorIcons', visitInfo) }}
+{% endif %}
diff --git a/plugins/Live/templates/_visitorLogIcons.twig b/plugins/Live/templates/_visitorLogIcons.twig
new file mode 100644
index 0000000000..63dbeb748a
--- /dev/null
+++ b/plugins/Live/templates/_visitorLogIcons.twig
@@ -0,0 +1,84 @@
+{% set visitHasEcommerceActivity = visitor.getColumn('visitEcommerceStatusIcon') %}
+{% set breakBeforeVisitorRank = (visitHasEcommerceActivity and visitor.getColumn('visitorTypeIcon')) ? true : false %}
+
+<span class="visitorLogIcons">
+
+    <span class="visitorDetails">
+    {% if visitor.getColumn('visitorTypeIcon') %}
+        <span class="visitorLogIconWithDetails visitorTypeIcon">
+            <img src="{{ visitor.getColumn('visitorTypeIcon') }}"/>
+            <ul class="details">
+                <li>{{ 'General_ReturningVisitor'|translate }} - {{ 'General_NVisits'|translate(visitor.getColumn('visitCount')) }}</li>
+            </ul>
+        </span>
+    {% endif %}
+    {% if visitor.getColumn('countryFlag') %}
+        <span class="visitorLogIconWithDetails flag" profile-header-text="{% if visitor.getColumn('city') %}{{ visitor.getColumn('city')|e('html_attr') }}{% else %}{{ visitor.getColumn('country') }}{% endif %}">
+
+            <img src="{{ visitor.getColumn('countryFlag') }}"/>
+            <ul class="details">
+                <li>{{ 'UserCountry_Country'|translate }}: {{ visitor.getColumn('country') }}</li>
+                {% if visitor.getColumn('region') %}<li>{{ 'UserCountry_Region'|translate }}: {{ visitor.getColumn('region') }}</li>{% endif %}
+                {% if visitor.getColumn('city') %}<li>{{ 'UserCountry_City'|translate }}: {{ visitor.getColumn('city') }}</li>{% endif %}
+                {% if visitor.getColumn('language') %}<li>{{ 'UserLanguage_BrowserLanguage'|translate }}: {{ visitor.getColumn('language') }}</li>{% endif %}
+            </ul>
+        </span>
+    {% endif %}
+    {% if visitor.getColumn('browserIcon') %}
+        <span class="visitorLogIconWithDetails" profile-header-text="{{ visitor.getColumn('browser')|e('html_attr') }}">
+            <img src="{{ visitor.getColumn('browserIcon') }}"/>
+            <ul class="details">
+                <li>{{ 'DevicesDetection_ColumnBrowser'|translate }}: {{ visitor.getColumn('browser') }}</li>
+                <li>{{ 'DevicesDetection_BrowserEngine'|translate }}: {{ visitor.getColumn('browserFamily') }}</li>
+                {% if visitor.getColumn('pluginsIcons')|length > 0 %}
+                    <li>
+                        {{ 'General_Plugins'|translate }}:
+                        {% for pluginIcon in visitor.getColumn('pluginsIcons') %}
+                            <img width="16px" height="16px" src="{{ pluginIcon.pluginIcon }}" alt="{{ pluginIcon.pluginName|capitalize(true) }}"/>
+                        {% endfor %}
+                    </li>
+                {% endif %}
+            </ul>
+        </span>
+    {% endif %}
+        {% if visitor.getColumn('operatingSystemIcon') %}
+            <span class="visitorLogIconWithDetails" profile-header-text="{{ visitor.getColumn('operatingSystem')|e('html_attr') }}">
+            <img src="{{ visitor.getColumn('operatingSystemIcon') }}"/>
+            <ul class="details">
+                <li>{{ 'DevicesDetection_ColumnOperatingSystem'|translate }}: {{ visitor.getColumn('operatingSystem') }}</li>
+            </ul>
+        </span>
+        {% endif %}
+        {% if visitor.getColumn('deviceTypeIcon') %}
+            <span class="visitorLogIconWithDetails" profile-header-text="{% if visitor.getColumn('resolution') %}{{ visitor.getColumn('resolution')|e('html_attr') }}{% else %}{{ visitor.getColumn('deviceType') }}{% endif %}">
+            <img src="{{ visitor.getColumn('deviceTypeIcon') }}"/>
+            <ul class="details">
+                <li>{{ 'DevicesDetection_DeviceType'|translate }}: {{ visitor.getColumn('deviceType') }}</li>
+                {% if visitor.getColumn('deviceBrand') %}<li>{{ 'DevicesDetection_DeviceBrand'|translate }}: {{ visitor.getColumn('deviceBrand') }}</li>{% endif %}
+                {% if visitor.getColumn('deviceModel') %}<li>{{ 'DevicesDetection_DeviceModel'|translate }}: {{ visitor.getColumn('deviceModel') }}</li>{% endif %}
+                {% if visitor.getColumn('resolution') %}<li>{{ 'Resolution_ColumnResolution'|translate }}: {{ visitor.getColumn('resolution') }}</li>{% endif %}
+            </ul>
+        </span>
+        {% endif %}
+    </span>
+
+    {% if visitor.getColumn('goalConversions') or visitHasEcommerceActivity %}
+    <span class="visitorType">
+        {# Goals, and/or Ecommerce activity #}
+        {% if visitor.getColumn('goalConversions') %}
+            <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.getColumn('goalConversions')) }}" class='visitorRank visitorLogTooltip'
+                  {% if isWidget or breakBeforeVisitorRank %}style="margin-left:0;"{% endif %}>
+                <img src="{{ visitor.getColumn('visitConvertedIcon') }}"/>
+                {{ visitor.getColumn('goalConversions') }}
+                {% if visitHasEcommerceActivity %}
+                    &nbsp;
+                    <img src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" class='visitorLogTooltip' title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
+                {% endif %}
+            </span>
+        {# Ecommerce activity only (no goal) #}
+        {% elseif visitHasEcommerceActivity %}
+            <img class="visitorLogTooltip" src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
+        {% endif %}
+    </span>
+    {% endif %}
+</span>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
deleted file mode 100644
index c7af9a6c2c..0000000000
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ /dev/null
@@ -1,68 +0,0 @@
-{% macro customVar(id, customVariable) %}
-    {% set name='customVariableName' ~ id %}
-    {% set value='customVariableValue' ~ id %}
-    <li><span>{{ customVariable[name]|truncate(30) }}</span>{% if customVariable[value]|length > 0 %}<strong>{{ customVariable[value]|truncate(50) }}</strong>{% endif %}</li>
-{% endmacro %}
-{% import _self as macros %}
-{% if showLocation|default(false) %}
-<div class="visitor-profile-latest-visit-loc" title="{{ visitData.location }}">
-    <img src="{{ visitData.countryFlag }}"/>&nbsp;<span>{% if visitData.city is not empty %}{{ visitData.city }}{% else %}{{ visitData.country }}{% endif %}</span>
-</div>
-{% endif %}
-<div class="visitor-profile-latest-visit-column">
-    <ul>
-        <li>
-            <span>{{ 'General_IP'|translate }}</span><strong {% if visitData.providerName is defined and visitData.providerName is not empty %}title="{{ 'Provider_ColumnProvider'|translate }}: {{ visitData.providerName }}"{% endif %}>{{ visitData.visitIp }}</strong>
-        </li>
-        <li class="visitor-profile-id">
-            <span>{{ 'General_Id'|translate|upper }}</span>
-            {% if widgetizedLink is defined %}<a class="visitor-profile-widget-link" href="{{ widgetizedLink }}" target="_blank" title="{{ 'Widgetize_OpenInNewWindow'|translate }} - {{ 'Live_VisitorProfile'|translate }} {{ 'General_Id'|translate|upper }} {{ visitData.visitorId }}">{% endif %}
-                <strong>{{ visitData.visitorId }}</strong>
-            {% if widgetizedLink is defined %}</a>{% endif %}
-            <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}">
-                <span class="icon-export"></span>
-            </a>
-        </li>
-        <li>
-            {% if visitData.browserName is defined %}
-            <div class="visitor-profile-browser" title="{% if visitData.plugins is not defined %}{{ visitData.browser }}{% elseif visitData.plugins %}{{ 'DevicePlugins_BrowserWithPluginsEnabled'|translate(visitData.browser, visitData.plugins) }}{% else %}{{ 'DevicePlugins_BrowserWithNoPluginsEnabled'|translate(visitData.browser) }}{% endif %}">
-                {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}" width="16px" height="16px"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span>
-            </div>
-            {% endif %}
-
-            <div class="visitor-profile-os">
-                {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}" width="16px" height="16px"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %}
-            </div>
-        </li>
-        {% if visitData.resolution is defined %}<li><span>{{ 'Resolution_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
-        {% if visitData.userId is not empty %}<li><span>{{ 'General_UserId'|translate }}</span><strong>{{ visitData.userId|raw }}</strong></li>{% endif %}
-        {% if visitReferralSummary is defined %}
-        {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
-        <li>
-            <span>{{ 'General_DateRangeFrom'|translate }}</span>
-            <strong {% if visitData.referrerType == 'search' and '(' not in visitReferralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitReferralSummary }}</strong>
-        </li>
-        {% endif %}
-    </ul>
-</div>
-<div class="visitor-profile-latest-visit-column">
-    {% if visitData.customVariables is defined %}
-    <ul>
-        {% for id,customVariable in visitData.customVariables %}
-        {% if loop.index0 < 4 %}
-            {{ macros.customVar(id, customVariable) }}
-        {% endif %}
-        {% endfor %}
-    </ul>
-    {% endif %}
-    {% if visitData.customVariables is defined and visitData.customVariables|length > 4 %}
-    <ul class="visitor-profile-extra-cvars" style="display:none;">
-        {% for id,customVariable in visitData.customVariables %}
-        {% if loop.index0 >= 4 %}
-            {{ macros.customVar(id, customVariable) }}
-        {% endif %}
-        {% endfor %}
-    </ul>
-    <p class="visitor-profile-see-more-cvars"><a href="#">&#x25bc;</a></p>
-    {% endif %}
-</div>
diff --git a/plugins/Live/templates/getVisitList.twig b/plugins/Live/templates/getVisitList.twig
index 9266afbcb6..b64ed585c5 100644
--- a/plugins/Live/templates/getVisitList.twig
+++ b/plugins/Live/templates/getVisitList.twig
@@ -1,27 +1,35 @@
 {% for visitInfo in visits.getRows() %}
-<li>
+<li data-number="{{ startCounter }}">
     <div>
-        <div class="visitor-profile-visit-title-row">
-            <h2 class="visitor-profile-visit-title" data-idvisit="{{ visitInfo.getColumn('idVisit') }}" title="{{ 'Live_ClickToViewMoreAboutVisit'|translate }}">
-                {{ 'General_Visit'|translate }} #{{ startCounter }}
+        <div class="visitor-profile-visit-title" data-idvisit="{{ visitInfo.getColumn('idVisit') }}" title="{{ 'Live_ClickToViewMoreAboutVisit'|translate }}">
+            {{ 'General_Visit'|translate }} #{{ startCounter }}
 
+            <span class="visitor-profile-date" title="{{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}">
+                {{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}
+            </span>
+        </div>
+        <div class="visitor-profile-visit-details-extended">
+            {{ postEvent('Live.renderVisitorDetails', visitInfo) }}
+        </div>
+        <div class="visitor-profile-visit-details">
+            {{ postEvent('Live.renderVisitorIcons', visitInfo) }}
+            <a href="#" class="visitor-profile-show-actions">
+                {% set actionCount = visitInfo.getColumn('actionDetails')|length %}
+                {% if visitInfo.truncatedActionsCount is defined %}
+                    {% set actionCount = actionCount + visitInfo.truncatedActionsCount %}
+                {% endif %}
                 {% if visitInfo.getColumn('visitDuration') != 0 %}
-                    <span>&nbsp; ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span>
+                    {{ 'Live_ActionsAndDuration'|translate(actionCount, visitInfo.getColumn('visitDurationPretty')) }}
+                {% else %}
+                    {{ actionCount }} {{ 'General_Actions'|translate }}
                 {% endif %}
-                <span class="visitor-profile-date" title="{{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}">
-                    {{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}
-                </span>
-            </h2>
+            </a>
         </div>
-        <ol class="visitor-profile-actions">
+        <ol class="visitorLog visitor-profile-actions">
             {% include "@Live/_actionsList.twig" with {'actionDetails': visitInfo.getColumn('actionDetails'),
-                                                       'clientSideParameters': {
-                                                            'idSite': idSite,
-                                                            'pageUrlNotDefined': 'General_NotDefined'|translate('Actions_ColumnPageURL'|translate)
-                                                        },
-                                                        'overrideLinkStyle': false} %}
+                                                       'visitInfo': visitInfo} %}
         </ol>
     </div>
 </li>
-{% set startCounter = startCounter + 1 %}
-{% endfor %}
+{% set startCounter = startCounter - 1 %}
+{% endfor %}
\ No newline at end of file
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index a5b69e7fbd..f21a2477a3 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -1,174 +1,88 @@
 {% if not visitorData %}
     <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
 {% else %}
-<div class="visitor-profile"
-     data-visitor-id="{{ visitorData.lastVisits.getFirstRow().getColumn('visitorId') }}"
-     data-next-visitor="{{ visitorData.nextVisitorId }}"
-     data-prev-visitor="{{ visitorData.previousVisitorId }}"
-     tabindex="0">
-    <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a>
-    <div class="visitor-profile-info">
-        <div>
+    <div class="visitor-profile"
+         data-visitor-id="{{ visitorData.lastVisits.getFirstRow().getColumn('visitorId') }}"
+         data-next-visitor="{{ visitorData.nextVisitorId }}"
+         data-prev-visitor="{{ visitorData.previousVisitorId }}"
+         tabindex="0">
+        <div class="visitor-profile-options">
+            <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a>
+            <a href="http://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer"
+               target="_blank"
+               title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}">
+            </a>
+            <a href class="visitor-profile-toggle-actions" title="{{ 'Live_ToggleActions'|translate }} "></a>
+        </div>
+        <div class="visitor-profile-info">
             <div class="visitor-profile-overview">
-                <div class="visitor-profile-avatar">
-                    <div>
-                        <div class="visitor-profile-image-frame">
-                            <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.png") }}"
-                                 alt="{{ visitorData.visitorDescription|default('') }}"
-                                 title="{{ visitorData.visitorDescription|default('') }}" />
-                        </div>
-                        <img src="plugins/Live/images/paperclip.png" alt=""/>
+                <div class="visitor-profile-header">
+                    <div class="visitor-profile-avatar">
+                        <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.png") }}"
+                             alt="{{ visitorData.visitorDescription|default('') }}"
+                             title="{{ visitorData.visitorDescription|default('') }}"/>
                     </div>
-                    <div>
-                        <div class="visitor-profile-header">
-                            {% if visitorData.previousVisitorId is not empty %}<a class="visitor-profile-prev-visitor" href="#" title="{{ 'Live_PreviousVisitor'|translate }}">&larr;</a>{% endif %}
-                            <h1>{{ 'Live_VisitorProfile'|translate }}
-                                {%- if visitorData.userId is not empty %}: <span title="{{'General_UserId'|translate}}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span>{% endif -%}
-                                <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
+                    <div class="visitor-profile-header-details">
+                        <div class="visitor-profile-headline">
+                            {% if visitorData.previousVisitorId is not empty %}<a class="visitor-profile-prev-visitor"
+                                                                                  href="#"
+                                                                                  title="{{ 'Live_PreviousVisitor'|translate }}">
+                                    &larr;</a>{% endif %}
+                            <h1>
+                                {%- if visitorData.userId is empty %}
+                                    {{ 'Live_VisitorProfile'|translate }}
+                                {%- else %}
+                                    <span title="{{ 'General_UserId'|translate }}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span>
+                                {% endif -%}
                             </h1>
-                            <a href="http://piwik.org/docs/user-profile/" class="visitorProfileHelp" rel="noreferrer"  target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}">
-                                <span class="icon-help"></span>
-                            </a>
-                            {% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" href="#" title="{{ 'Live_NextVisitor'|translate }}">&rarr;</a>{% endif %}
+                            {% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor"
+                                                                              href="#"
+                                                                              title="{{ 'Live_NextVisitor'|translate }}">
+                                    &rarr;</a>{% endif %}
                         </div>
                         <div class="visitor-profile-latest-visit">
-                            {% include "@Live/getSingleVisitSummary.twig" with {'visitData': visitorData.lastVisits.getFirstRow().getColumns(), 'showLocation': false} %}
-                        </div>
-                    </div>
-                    <p style="clear:both; border:none!important;"></p>
-                </div>
-                <div class="visitor-profile-summary">
-                    <h1>{{ 'General_Summary'|translate }}</h1>
-                    <div>
-                        {% if visitorData.totalPageViews != visitorData.totalActions %}
-                            {% set actionDetails = [] %}
-                            {% if visitorData.totalPageViews > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalPageViews ~ ' ' ~ 'General_ColumnPageviews'|translate]) %}{% endif %}
-                            {% if visitorData.totalEvents > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalEvents ~ ' ' ~ 'Events_Events'|translate]) %}{% endif %}
-                            {% if visitorData.totalDownloads > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalDownloads ~ ' ' ~ 'General_Downloads'|translate]) %}{% endif %}
-                            {% if visitorData.totalOutlinks > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalOutlinks ~ ' ' ~ 'General_Outlinks'|translate]) %}{% endif %}
-                            {% if visitorData.totalSearches > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalSearches ~ ' ' ~ 'Actions_ColumnSearches'|translate]) %}{% endif %}
-                            <p>{{ 'Live_VisitSummaryWithActionDetails'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions, '</strong>', actionDetails|join(', ') , '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
-                        {% else %}
-                            <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions,  '</strong>', '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
-                        {% endif %}
-                        <p>{% if visitorData.totalGoalConversions %}<strong>{% endif %}{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}{% if visitorData.totalGoalConversions %}</strong>{% endif %}
-                        {%- if visitorData.totalGoalConversions %} (
-                            {%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
-                            {%- set idGoal = idGoal[7:] -%}
-                            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} {{ goals[idGoal]['name'] -}}
-                            {%- endfor -%}
-                        ){% endif %}.</p>
-                        {% if visitorData.totalSearches|default(0) %}
-                        <p>
-                            {{ 'Actions_WidgetSearchKeywords'|translate }}:
-                            {%- for entry in visitorData.searches %} <strong title="{% if entry.searches == 1 %}{{ 'Actions_OneSearch'|translate }}{% else %}{{ 'UserCountryMap_Searches'|translate(entry.searches) }}{% endif %}">{{ entry.keyword }}</strong>{% if not loop.last %},{% endif %}{% endfor %}
-                        </p>
-                        {% endif %}
-                        {% if visitorData.averagePageGenerationTime is defined %}
-                        <p title="{{ 'Live_CalculatedOverNPageViews'|translate(visitorData.totalPageViewsWithTiming) }}">
-                            {{ 'Live_AveragePageGenerationTime'|translate('<strong>' ~ visitorData.averagePageGenerationTime ~ 's</strong>')|raw }}
-                        </p>
-                        {% endif %}
-                    </div>
-                </div>
-                {% if visitorData.totalEcommerceRevenue is defined %}
-                <div class="visitor-profile-lifetimevalue">
-                    <h1>{{ 'Goals_Ecommerce'|translate }}</h1>
-                    <div>
-                        <p title="{{ 'Ecommerce_LifeTimeValueDescription'|translate(visitorData.visitorId) }}">
-                                {{ 'Ecommerce_VisitorProfileLTV'|translate( "<strong>" ~ visitorData.totalEcommerceRevenue|money(idSite) ~ "</strong>")|raw }}
-                                {{ 'Ecommerce_VisitorProfileItemsAndOrders'|translate("<strong>" ~ visitorData.totalEcommerceItems ~ "</strong>", "<strong>" ~ visitorData.totalEcommerceConversions ~ "</strong>")|raw }}
-                        </p>
-                        <p>
-                            {%- if visitorData.totalAbandonedCarts|default(0) > 0 %}
-                                {{ 'Ecommerce_VisitorProfileAbandonedCartSummary'|translate('<strong>' ~ visitorData.totalAbandonedCarts ~ '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsItems ~ '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsRevenue|money(idSite) ~ '</strong>')|raw }}
-                            {%- endif -%}
-                        </p>
-                    </div>
-                </div>
-                {% endif %}
-                <div class="visitor-profile-important-visits">
-                    {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
-                    <div>
-                        <h1>{% if visitorData.visitsAggregated == 100 %}{{ 'General_Visit'|translate }}# 100{% else %}{{ 'Live_FirstVisit'|translate }}{% endif %}</h1>
-                        <div>
-                            <p><strong>{{ visitorData.firstVisit.prettyDate }}</strong>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.firstVisit.daysAgo) }}</p>
-                            <p>
-                            {{ 'General_FromReferrer'|translate }}<strong {% if visitorData.firstVisit.referrerType == 'search' and '(' not in visitorData.firstVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.firstVisit.referralSummary }}</strong></p>
+                            <div class="visitor-profile-id">
+                                <span>{{ 'General_Id'|translate|upper }}</span>
+                                {% if widgetizedLink is defined %}<a class="visitor-profile-widget-link"
+                                                                     href="{{ widgetizedLink }}" target="_blank"
+                                                                     title="{{ 'Widgetize_OpenInNewWindow'|translate }} - {{ 'Live_VisitorProfile'|translate }} {{ 'General_Id'|translate|upper }} {{ visitorData.visitorId }}">{% endif %}
+                                    <span>{{ visitorData.visitorId }}</span>
+                                    {%- if widgetizedLink is defined %}</a>{% endif %}
+                                <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank"
+                                   title="{{ 'General_ExportThisReport'|translate }}">
+                                    <span class="icon-export"></span>
+                                </a>
+                            </div>
+                            {{ postEvent('Live.renderVisitorIcons', visitorData.lastVisits|first) }}
                         </div>
                     </div>
-                    {% if visitorData.lastVisits.getRowsCount() != 1 %}
-                    <div>
-                        <h1>{{ 'Live_LastVisit'|translate }}</h1>
-                        <div>
-                            <p><strong>{{ visitorData.lastVisit.prettyDate }}</strong>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.lastVisit.daysAgo) }}</p>
-                            <p>
-                                {{ 'General_FromReferrer'|translate }}<strong {% if visitorData.lastVisit.referrerType == 'search' and '(' not in visitorData.lastVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.lastVisit.referralSummary }}</strong></p>
-                        </div>
-                    </div>
-                    {% endif %}
                 </div>
-                <div class="visitor-profile-location">
-                    <h1>{{ 'UserCountry_Location'|translate }}</h1>
-                    <p>
-                        {%- for entry in visitorData.countries -%}
-
-                            {% set entryCity -%}
-                                {% if entry.cities is defined and 1 == entry.cities|length and entry.cities|join -%}
-                                    {{ entry.cities|join }}
-                                {%- elseif entry.cities is defined and 1 < entry.cities|length -%}
-                                    <span title="{{ entry.cities|join(', ') }}">{{ 'UserCountry_FromDifferentCities'|translate }}</span>
-                                {%- endif %}
-                            {%- endset %}
-
-                            {% set entryVisits -%}
-                                <strong>
-                                    {% if entry.nb_visits == 1 -%}
-                                        {{ 'General_OneVisit'|translate }}
-                                    {%- else -%}
-                                        {{ 'General_NVisits'|translate(entry.nb_visits) }}
-                                    {%- endif -%}
-                                </strong>
-                            {%- endset %}
 
-                            {% set entryCountry -%}
-                                {%- if entryCity -%}
-                                    {{ 'UserCountry_CityAndCountry'|translate(entryCity, entry.prettyName)|raw }}
-                                {%- else -%}
-                                    {{ entry.prettyName }}
-                                {%- endif -%}
-
-                                &nbsp;<img height="16px" src="{{ entry.flag }}" title="{{ entry.prettyName }}"/>
-                            {%- endset %}
-
-                            {{- 'General_XFromY'|translate(entryVisits, entryCountry)|raw -}}{% if not loop.last %}, {% endif %}
-                            {%- endfor %}
-                            <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap'|translate|replace({' ': '&nbsp;'})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
-                    </p>
-                    <div class="visitor-profile-map" style="display:none" data-href="{{ userCountryMapUrl|default('') }}">
-                    </div>
-                </div>
+                {{ profileSummary|raw }}
 
                 {{ postEvent('Template.afterVisitorProfileOverview') }}
             </div>
             <div class="visitor-profile-visits-info">
                 <div class="visitor-profile-visits-container">
                     <ol class="visitor-profile-visits">
-                        {% include "@Live/getVisitList.twig" with {'visits': visitorData.lastVisits, 'startCounter': 1} %}
+                        {% include "@Live/getVisitList.twig" with {'visits': visitorData.lastVisits, 'startCounter': visitorData.totalVisits} %}
                     </ol>
                 </div>
                 <div class="visitor-profile-more-info">
                     {% if visitorData.lastVisits.getRowsCount() >= constant("Piwik\\Plugins\\Live\\VisitorProfile::VISITOR_PROFILE_MAX_VISITS_TO_SHOW") %}
-                    <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
+                        <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik"
+                                                                                   style="display:none;"
+                                                                                   src="plugins/Morpheus/images/loading-blue.gif"/>
                     {% else %}
-                    <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits'|translate }}</span>
+                        <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits'|translate }}</span>
                     {% endif %}
                 </div>
             </div>
         </div>
     </div>
-</div>
-<script type="text/javascript">
-$(function() { require('piwik/UI').VisitorProfileControl.initElements(); });
-</script>
+    <script type="text/javascript">
+        $(function () {
+            require('piwik/UI').VisitorProfileControl.initElements();
+        });
+    </script>
 {% endif %}
\ No newline at end of file
diff --git a/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php
new file mode 100644
index 0000000000..9938f4c25c
--- /dev/null
+++ b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\Live\tests\Fixtures;
+
+use Piwik\Date;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Plugins\Goals\API as GoalsApi;
+use Piwik\Plugins\CustomDimensions\API as CustomDimensionsApi;
+
+/**
+ * Generates many visits for the same visitor
+ */
+class VisitsWithAllActionsAndDevices extends Fixture
+{
+    public $dateTime = '2010-02-01 11:22:33';
+    public $idSite = 1;
+
+    public function setUp()
+    {
+        if (!self::siteCreated($idSite = 1)) {
+            self::createWebsite($this->dateTime, 1);
+        }
+
+        GoalsApi::getInstance()->addGoal(1, 'Successfully used Search', 'manually', '', 'contains');
+        
+        CustomDimensionsApi::getInstance()->configureNewCustomDimension(1, 'age', 'visit', 1);
+        CustomDimensionsApi::getInstance()->configureNewCustomDimension(1, 'currency', 'action', 1);
+
+        $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true);
+        $t->setTokenAuth(self::getTokenAuth());
+
+        $t->setUserId('X4F66G776HGI');
+
+        // smart display
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(0)->getDatetime(), 'Mozilla/5.0 (Linux; U; Android 4.0.4; de-de; VSD220 Build/IMM76D.UI23ED12_VSC) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30');
+
+        // media player
+        $this->trackVisitMediaPlayer($t, Date::factory($this->dateTime)->addHour(6.33)->getDatetime());
+
+        // tv
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(16.6)->getDatetime(), 'Mozilla/5.0 (Linux; Android 4.2.2; AFTB Build/JDQ39) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.173 Mobile Safari/537.22 cordova-amazon-fireos/3.4.0 AmazonWebAppPlatform/3.4.0;2.0');
+
+        // desktop
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(26.7)->getDatetime(), 'Mozilla/5.0 (Windows NT 6.3; Win64; x64; Trident/7.0; NP06; rv:11.0) like Gecko');
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(32.5)->getDatetime(), 'Safari/9537.73.11 CFNetwork/673.0.3 Darwin/13.0.0 (x86_64) (MacBookAir6%2C2)');
+
+        // car browser
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(60.4)->getDatetime(), 'Mozilla/5.0 (X11; u; Linux; C) AppleWebKit /533.3 (Khtml, like Gheko) QtCarBrowser Safari/533.3');
+
+        // unknown device
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(75.1)->getDatetime(), 'Mozilla/5.0 (Android; Linux armv7l; rv:10.0) Gecko/20120118 Firefox/10.0 Fennec/10.0');
+
+        // smartphone
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(79.5)->getDatetime(), 'Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; ADR910L 4G Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30');
+        $this->trackDeviceVisit($t, Date::factory($this->dateTime)->addHour(86.8)->getDatetime(), 'Mozilla/5.0 (Linux; U; Android 4.1.2; zh-cn; ZTE N799D Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30; 360browser(securitypay,securityinstalled); 360(android,uppayplugin); 360 Aphone Browser (5.4.0)');
+
+        $this->trackVisitSmartphone($t, Date::factory($this->dateTime)->addHour(101.6)->getDatetime());
+        $this->trackVisitTablet($t, Date::factory($this->dateTime)->addHour(156.9)->getDatetime());
+    }
+
+    public function tearDown()
+    {
+        // empty
+    }
+
+    private function trackVisitSmartphone(\PiwikTracker $t, $dateTime)
+    {
+        $t->setForceVisitDateTime($dateTime);
+        $t->setUserAgent('Mozilla/5.0 (Linux; U; Android 4.4.2; fr-fr; HTC One_M8 Build/KOT49H) AppleWebKit/537.16 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.16');
+
+        $t->setCountry('jp');
+        $t->setRegion("40");
+        $t->setCity('Tokyo');
+        $t->setLatitude(35.70);
+        $t->setLongitude(139.71);
+
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(251);
+        $t->setDebugStringAppend('bw_bytes=12053');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->doTrackContentImpression('product slider', 'product_16.jpg', 'http://example.org/product16');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.05)->getDatetime());
+        $t->doTrackEvent('product slider', 'next');
+        $t->doTrackContentImpression('product slider', 'product_42.jpg', 'http://example.org/product42');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.08)->getDatetime());
+        $t->doTrackContentInteraction('click', 'product slider', 'product_42.jpg', 'http://example.org/product42');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime());
+        $t->setUrl('http://example.org/product42');
+        $t->setCustomTrackingParameter('dimension2', 'NZD');
+        $t->setEcommerceView($sku = 'P42X4D', $name = 'product 42', $category = 'software', $price = 60);
+        $t->setGenerationTime(83);
+        $t->setDebugStringAppend('bw_bytes=36053');
+        self::checkResponse($t->doTrackPageView('product 42'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.14)->getDatetime());
+        $t->doTrackAction('http://example.org/product42/productsheet.pdf', 'download');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.org/product42');
+        $t->addEcommerceItem('P42X4D', 'product 42', 'software', $price = 60, $qty = 2);
+        self::checkResponse($t->doTrackEcommerceOrder('X42FCY', 140, 120, 20, 6.9, 6.9));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.25)->getDatetime());
+        $t->setUrl('http://example.org/search');
+        $t->setGenerationTime(318);
+        $t->setDebugStringAppend('bw_bytes=2583');
+        self::checkResponse($t->doTrackPageView('product search'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.29)->getDatetime());
+        $t->doTrackSiteSearch('fancy product', '', 12560);
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.32)->getDatetime());
+        $t->doTrackEvent('search', 'filter', 'enormous category');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.35)->getDatetime());
+        $t->doTrackSiteSearch('fancy product', 'enormous category', 13);
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.38)->getDatetime());
+        $t->doTrackGoal(1);
+
+        $t->setUrl('http://example.org/fancyproduct');
+        $t->setEcommerceView($sku = 'F4NCYX', $name = 'fancy product', $category = 'software', $price = 40);
+        $t->setGenerationTime(151);
+        $t->setDebugStringAppend('bw_bytes=68895');
+        self::checkResponse($t->doTrackPageView('fancy product'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime());
+        $t->addEcommerceItem('F4NCYX', 'fancy product', 'software', $price = 40, $qty = 2);
+        self::checkResponse($t->doTrackEcommerceCartUpdate(140));
+
+        $t->setUrl('http://example.org/cart');
+        $t->setGenerationTime(33);
+        $t->setDebugStringAppend('bw_bytes=1590');
+        self::checkResponse($t->doTrackPageView('cart'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime());
+        self::checkResponse($t->doTrackAction('http://vendor.site', 'link'));
+    }
+
+    private function trackVisitTablet(\PiwikTracker $t, $dateTime)
+    {
+        $t->setForceVisitDateTime($dateTime);
+        $t->setUserAgent('Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.8 Safari/535.19 Silk-Accelerated=true');
+
+        $t->setUrlReferrer('http://www.google.com/search?q=product%2042');
+        $t->setUrl('http://example.org/product42');
+        $t->setGenerationTime(96);
+        $t->setDebugStringAppend('bw_bytes=6851');
+        $t->setCustomVariable(1, 'custom', 'variable', 'page');
+        $t->setCustomTrackingParameter('dimension1', '42');
+        $t->setCustomTrackingParameter('dimension2', '€');
+        self::checkResponse($t->doTrackPageView('product 42'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.09)->getDatetime());
+        $t->setUrl('http://example.org/cart');
+        $t->addEcommerceItem('P42X4D', 'product 42', 'software', $price = 60, $qty = 1);
+        self::checkResponse($t->doTrackEcommerceOrder('R52Z6P', 66, 60, 6, 0, 0));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(511);
+        $t->setDebugStringAppend('bw_bytes=2012');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(511);
+        $t->setDebugStringAppend('bw_bytes=2012');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(222);
+        $t->setDebugStringAppend('bw_bytes=950');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->doTrackContentImpression('product slider', 'product_16.jpg', 'http://example.org/product16');
+    }
+
+    private function trackVisitMediaPlayer(\PiwikTracker $t, $dateTime)
+    {
+        $t->setForceVisitDateTime($dateTime);
+        $t->setUserAgent('Mozilla/5.0 (iPod; U; CPU iPhone OS 4_2_1 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C148');
+
+        $t->setUrlReferrer('http://www.nice.website/page3');
+        $t->setCustomVariable(1, 'promo', 'summer', 'visit');
+        $t->setCustomTrackingParameter('dimension1', '16');
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(195);
+        $t->setDebugStringAppend('bw_bytes=631');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->doTrackContentImpression('product slider', 'product_16.jpg', 'http://example.org/product16');
+
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime());
+        $t->addEcommerceItem('F4NCYX', 'fancy product', 'software', $price = 40, $qty = 3);
+        self::checkResponse($t->doTrackEcommerceCartUpdate(120));
+    }
+
+    private function trackDeviceVisit(\PiwikTracker $t, $dateTime, $useragent)
+    {
+        $t->setForceVisitDateTime($dateTime);
+        $t->setUserAgent($useragent);
+
+        $t->setUrl('http://example.org/');
+        $t->setGenerationTime(111);
+        $t->setDebugStringAppend('bw_bytes=555');
+        self::checkResponse($t->doTrackPageView('home'));
+
+        $t->doTrackContentImpression('product slider', 'product_16.jpg', 'http://example.org/product16');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 75a12099fb..94b05f931a 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -1,62 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	
 	<totalVisits>31</totalVisits>
 	<totalVisitDuration>0</totalVisitDuration>
 	<totalActions>31</totalActions>
-	<totalEvents>0</totalEvents>
 	<totalOutlinks>0</totalOutlinks>
 	<totalDownloads>0</totalDownloads>
 	<totalSearches>0</totalSearches>
 	<totalPageViews>31</totalPageViews>
+	<totalUniquePageViews>4</totalUniquePageViews>
+	<totalRevisitedPages>4</totalRevisitedPages>
 	<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
+	<searches>
+	</searches>
 	<totalGoalConversions>0</totalGoalConversions>
 	<totalConversionsByGoal>
 	</totalConversionsByGoal>
+	<totalEvents>0</totalEvents>
 	<hasLatLong>0</hasLatLong>
-	<searches>
-	</searches>
-	<continents>
-		<row>
-			<continent>eur</continent>
-			<nb_visits>1</nb_visits>
-			<prettyName>Europe</prettyName>
-		</row>
-		<row>
-			<continent>unk</continent>
-			<nb_visits>30</nb_visits>
-			<prettyName>Unknown</prettyName>
-		</row>
-	</continents>
-	<countries>
-		<row>
-			<country>fr</country>
-			<nb_visits>1</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
-			<prettyName>France</prettyName>
-		</row>
-		<row>
-			<country>xx</country>
-			<nb_visits>30</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/xx.png</flag>
-			<prettyName>Unknown</prettyName>
-		</row>
-	</countries>
-	<totalVisitDurationPretty>0s</totalVisitDurationPretty>
-	<firstVisit>
-		
-		
-		
-		<referrerType>direct</referrerType>
-		<referralSummary>Direct Entry</referralSummary>
-	</firstVisit>
-	<lastVisit>
-		
-		
-		
-		<referrerType>direct</referrerType>
-		<referralSummary>Direct Entry</referralSummary>
-	</lastVisit>
-	<visitsAggregated>31</visitsAggregated>
 	<lastVisits>
 		<row>
 			<idSite>1</idSite>
@@ -70,10 +31,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>31</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -83,13 +47,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -125,6 +94,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -158,17 +133,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -182,10 +146,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>30</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -195,13 +162,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -237,6 +209,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -270,17 +248,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -294,10 +261,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>29</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -307,13 +277,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -349,6 +324,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -382,17 +363,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -406,10 +376,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>28</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -419,13 +392,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -461,6 +439,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -494,17 +478,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -518,10 +491,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>27</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -531,13 +507,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -573,6 +554,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -606,17 +593,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -630,10 +606,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>26</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -643,13 +622,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -685,6 +669,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -718,17 +708,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -742,10 +721,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>25</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -755,13 +737,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -797,6 +784,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -830,17 +823,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -854,10 +836,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>24</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -867,13 +852,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -909,6 +899,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -942,17 +938,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -966,10 +951,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>23</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -979,13 +967,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1021,6 +1014,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1054,17 +1053,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1078,10 +1066,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>22</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1091,13 +1082,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1133,6 +1129,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1166,21 +1168,81 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 	</lastVisits>
-	<userId>0</userId>
-	
 	
 	
+	<totalVisitDurationPretty>0s</totalVisitDurationPretty>
+	<userId>0</userId>
+	<firstVisit>
+		
+		
+		
+		<referrerType>direct</referrerType>
+		<referrerUrl />
+		<referralSummary>Direct Entry</referralSummary>
+	</firstVisit>
+	<lastVisit>
+		
+		
+		
+		<referrerType>direct</referrerType>
+		<referrerUrl />
+		<referralSummary>Direct Entry</referralSummary>
+	</lastVisit>
+	<visitsAggregated>10</visitsAggregated>
+	<visitedPages>
+		<row key="http://example.org/my/dir/page0">8</row>
+		<row key="http://example.org/my/dir/page1">8</row>
+		<row key="http://example.org/my/dir/page2">8</row>
+		<row key="http://example.org/my/dir/page3">7</row>
+	</visitedPages>
+	<devices>
+		<Unknown>
+			<count>30</count>
+			<icon>plugins/Morpheus/icons/dist/devices/unknown.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>30</count>
+				</row>
+			</devices>
+		</Unknown>
+		<Desktop>
+			<count>1</count>
+			<icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>1</count>
+				</row>
+			</devices>
+		</Desktop>
+	</devices>
+	<continents>
+		<row>
+			<continent>eur</continent>
+			<nb_visits>1</nb_visits>
+			<prettyName>Europe</prettyName>
+		</row>
+		<row>
+			<continent>unk</continent>
+			<nb_visits>30</nb_visits>
+			<prettyName>Unknown</prettyName>
+		</row>
+	</continents>
+	<countries>
+		<row>
+			<country>fr</country>
+			<nb_visits>1</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
+			<prettyName>France</prettyName>
+		</row>
+		<row>
+			<country>xx</country>
+			<nb_visits>30</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/xx.png</flag>
+			<prettyName>Unknown</prettyName>
+		</row>
+	</countries>
 </result>
\ No newline at end of file
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index 2a194415dc..481470e978 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -1,62 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	
 	<totalVisits>31</totalVisits>
 	<totalVisitDuration>0</totalVisitDuration>
 	<totalActions>31</totalActions>
-	<totalEvents>0</totalEvents>
 	<totalOutlinks>0</totalOutlinks>
 	<totalDownloads>0</totalDownloads>
 	<totalSearches>0</totalSearches>
 	<totalPageViews>31</totalPageViews>
+	<totalUniquePageViews>4</totalUniquePageViews>
+	<totalRevisitedPages>4</totalRevisitedPages>
 	<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
+	<searches>
+	</searches>
 	<totalGoalConversions>0</totalGoalConversions>
 	<totalConversionsByGoal>
 	</totalConversionsByGoal>
+	<totalEvents>0</totalEvents>
 	<hasLatLong>0</hasLatLong>
-	<searches>
-	</searches>
-	<continents>
-		<row>
-			<continent>eur</continent>
-			<nb_visits>1</nb_visits>
-			<prettyName>Europe</prettyName>
-		</row>
-		<row>
-			<continent>unk</continent>
-			<nb_visits>30</nb_visits>
-			<prettyName>Unknown</prettyName>
-		</row>
-	</continents>
-	<countries>
-		<row>
-			<country>fr</country>
-			<nb_visits>1</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
-			<prettyName>France</prettyName>
-		</row>
-		<row>
-			<country>xx</country>
-			<nb_visits>30</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/xx.png</flag>
-			<prettyName>Unknown</prettyName>
-		</row>
-	</countries>
-	<totalVisitDurationPretty>0s</totalVisitDurationPretty>
-	<firstVisit>
-		
-		
-		
-		<referrerType>direct</referrerType>
-		<referralSummary>Direct Entry</referralSummary>
-	</firstVisit>
-	<lastVisit>
-		
-		
-		
-		<referrerType>direct</referrerType>
-		<referralSummary>Direct Entry</referralSummary>
-	</lastVisit>
-	<visitsAggregated>31</visitsAggregated>
 	<lastVisits>
 		<row>
 			<idSite>1</idSite>
@@ -70,10 +31,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>31</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -83,13 +47,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -125,6 +94,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -158,17 +133,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -182,10 +146,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>30</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -195,13 +162,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -237,6 +209,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -270,17 +248,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -294,10 +261,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>29</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -307,13 +277,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -349,6 +324,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -382,17 +363,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -406,10 +376,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>28</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -419,13 +392,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -461,6 +439,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -494,17 +478,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -518,10 +491,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>27</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -531,13 +507,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -573,6 +554,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -606,17 +593,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -630,10 +606,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>26</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -643,13 +622,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -685,6 +669,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -718,17 +708,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -742,10 +721,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>25</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -755,13 +737,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -797,6 +784,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -830,17 +823,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -854,10 +836,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>24</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -867,13 +852,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -909,6 +899,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -942,17 +938,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -966,10 +951,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>23</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -979,13 +967,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1021,6 +1014,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1054,17 +1053,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1078,10 +1066,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>22</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1091,13 +1082,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1133,6 +1129,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1166,17 +1168,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1190,10 +1181,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>21</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1203,13 +1197,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1245,6 +1244,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1278,17 +1283,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1302,10 +1296,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>20</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1315,13 +1312,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1357,6 +1359,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1390,17 +1398,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1414,10 +1411,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>19</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1427,13 +1427,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1469,6 +1474,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1502,17 +1513,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1526,10 +1526,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>18</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1539,13 +1542,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1581,6 +1589,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1614,17 +1628,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1638,10 +1641,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>17</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1651,13 +1657,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1693,6 +1704,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1726,17 +1743,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1750,10 +1756,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>16</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1763,13 +1772,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1805,6 +1819,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1838,17 +1858,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1862,10 +1871,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>15</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1875,13 +1887,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1917,6 +1934,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -1950,17 +1973,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -1974,10 +1986,13 @@
 					<pageTitle>incredible title 1</pageTitle>
 					<pageIdAction>4</pageIdAction>
 					
+					
 					<pageId>14</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -1987,13 +2002,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2029,6 +2049,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -2062,17 +2088,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2086,10 +2101,13 @@
 					<pageTitle>incredible title 0</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>13</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -2099,13 +2117,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2141,6 +2164,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -2174,17 +2203,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -2198,10 +2216,13 @@
 					<pageTitle>incredible title 2</pageTitle>
 					<pageIdAction>7</pageIdAction>
 					
+					
 					<pageId>12</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -2211,13 +2232,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2253,6 +2279,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Unknown</continent>
 			<continentCode>unk</continentCode>
@@ -2286,21 +2318,81 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 	</lastVisits>
-	<userId>0</userId>
-	
 	
 	
+	<totalVisitDurationPretty>0s</totalVisitDurationPretty>
+	<userId>0</userId>
+	<firstVisit>
+		
+		
+		
+		<referrerType>direct</referrerType>
+		<referrerUrl />
+		<referralSummary>Direct Entry</referralSummary>
+	</firstVisit>
+	<lastVisit>
+		
+		
+		
+		<referrerType>direct</referrerType>
+		<referrerUrl />
+		<referralSummary>Direct Entry</referralSummary>
+	</lastVisit>
+	<visitsAggregated>20</visitsAggregated>
+	<visitedPages>
+		<row key="http://example.org/my/dir/page0">8</row>
+		<row key="http://example.org/my/dir/page1">8</row>
+		<row key="http://example.org/my/dir/page2">8</row>
+		<row key="http://example.org/my/dir/page3">7</row>
+	</visitedPages>
+	<devices>
+		<Unknown>
+			<count>30</count>
+			<icon>plugins/Morpheus/icons/dist/devices/unknown.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>30</count>
+				</row>
+			</devices>
+		</Unknown>
+		<Desktop>
+			<count>1</count>
+			<icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>1</count>
+				</row>
+			</devices>
+		</Desktop>
+	</devices>
+	<continents>
+		<row>
+			<continent>eur</continent>
+			<nb_visits>1</nb_visits>
+			<prettyName>Europe</prettyName>
+		</row>
+		<row>
+			<continent>unk</continent>
+			<nb_visits>30</nb_visits>
+			<prettyName>Unknown</prettyName>
+		</row>
+	</continents>
+	<countries>
+		<row>
+			<country>fr</country>
+			<nb_visits>1</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
+			<prettyName>France</prettyName>
+		</row>
+		<row>
+			<country>xx</country>
+			<nb_visits>30</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/xx.png</flag>
+			<prettyName>Unknown</prettyName>
+		</row>
+	</countries>
 </result>
\ No newline at end of file
diff --git a/plugins/Live/tests/UI/Live_spec.js b/plugins/Live/tests/UI/Live_spec.js
new file mode 100644
index 0000000000..624ac5f468
--- /dev/null
+++ b/plugins/Live/tests/UI/Live_spec.js
@@ -0,0 +1,58 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Screenshot integration tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("Live", function () {
+    this.timeout(0);
+
+    this.fixture = "Piwik\\Plugins\\Live\\tests\\Fixtures\\VisitsWithAllActionsAndDevices";
+
+    it('should show visitor log', function (done) {
+        expect.screenshot('visitor_log').to.be.captureSelector('.reporting-page', function (page) {
+            page.load("?module=CoreHome&action=index&idSite=1&period=year&date=2010-01-03#?idSite=1&period=year&date=2010-01-03&category=General_Visitors&subcategory=Live_VisitorLog");
+            page.wait(4000);
+        }, done);
+    });
+
+    it('should show visitor profile', function (done) {
+        expect.screenshot('visitor_profile').to.be.captureSelector('.ui-dialog', function (page) {
+            page.evaluate(function(){
+                $('.card:first-child .visitor-log-visitor-profile-link').click();
+            });
+            page.wait(6000);
+        }, done);
+    });
+
+    it('should hide all action details', function (done) {
+        expect.screenshot('visitor_profile_actions_hidden').to.be.captureSelector('.ui-dialog', function (page) {
+            page.evaluate(function(){
+                $('.visitor-profile-toggle-actions').click();
+            }, 500);
+        }, done);
+    });
+
+    it('should show visit details', function (done) {
+        expect.screenshot('visitor_profile_visit_details').to.be.captureSelector('.ui-dialog', function (page) {
+            page.evaluate(function(){
+                $('.visitor-profile-visit-title')[0].click();
+            }, 200);
+        }, done);
+    });
+
+    it('should show action details', function (done) {
+        expect.screenshot('visitor_profile_action_details').to.be.captureSelector('.ui-dialog', function (page) {
+            page.click('.visitor-profile-visits li:first-child .visitor-profile-show-actions', 200);
+        }, done);
+    });
+
+    it('should show action tooltip', function (done) {
+        expect.screenshot('visitor_profile_action_tooltip').to.be.captureSelector('.ui-tooltip:visible', function (page) {
+            page.mouseMove('.visitor-profile-visits li:first-child .visitor-profile-actions .action:first-child', 200);
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_log.png
new file mode 100644
index 0000000000..c4f62dc683
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_log.png
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile.png
new file mode 100644
index 0000000000..f727dc862a
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile.png
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_details.png
new file mode 100644
index 0000000000..4048ddfc59
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_details.png
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_tooltip.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_tooltip.png
new file mode 100644
index 0000000000..3c59df6d85
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_action_tooltip.png
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_actions_hidden.png
new file mode 100644
index 0000000000..0838f7fd0a
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_actions_hidden.png
diff --git a/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_visit_details.png
new file mode 100644
index 0000000000..0358e64d08
--- /dev/null
+++ b/plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_profile_visit_details.png
diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting
-Subproject 1b523d822a5b2fc245412c751a0acc6a5875f2e
+Subproject 73b17d0b3ef57d96578a7782030ab5f04182072
diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons
-Subproject 9d8522f98a2c9c5de4f7c267f0ca0618b185a87
+Subproject 0c4e30d95c1a36bf540df5e5d67a3161053c490
diff --git a/plugins/Morpheus/images/event.png b/plugins/Morpheus/images/event.png
index ad4b38a01b..bea57d4933 100644
--- a/plugins/Morpheus/images/event.png
+++ b/plugins/Morpheus/images/event.png
diff --git a/plugins/Morpheus/stylesheets/general/_default.less b/plugins/Morpheus/stylesheets/general/_default.less
index 68d1827806..cfbd8ec0af 100644
--- a/plugins/Morpheus/stylesheets/general/_default.less
+++ b/plugins/Morpheus/stylesheets/general/_default.less
@@ -11,6 +11,7 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
 
 abbr {
     border-bottom: 1px dotted;
+    text-decoration: none;
 }
 
 form {
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less
index db3515a1f6..1eaf784455 100644
--- a/plugins/Morpheus/stylesheets/main.less
+++ b/plugins/Morpheus/stylesheets/main.less
@@ -409,10 +409,6 @@ table.dataTable {
         }
       }
     }
-
-    &.dataTableVizVisitorLog {
-
-    }
 }
 
 div.dataTableVizHtmlTable:not(.dataTableActions), div.dataTableVizAllColumns, div.dataTableVizGoals {
@@ -490,156 +486,6 @@ div.sparkline {
     z-index: 1;
 }
 
-.visitor-profile a {
-    color: @theme-color-link;
-    font-weight: normal;
-}
-
-.visitor-profile-info {
-    box-shadow: none !important;
-}
-
-.visitor-profile-latest-visit-loc {
-    display: inline-block;
-    position: absolute;
-    right: 4px;
-    top: -19px;
-}
-
-
-.visitor-profile-more-info > a {
-    color: @theme-color-link;
-    .font-default(12px, 16px);
-}
-
-.visitor-profile-more-info {
-    margin: 5px 0 15px 0;
-}
-
-.visitor-profile-visits-container {
-    padding: 0;
-    margin: 0;
-    li {
-        margin: 0 !important;
-        background: @color-silver-l95;
-        padding: 7px 10px !important;
-        > div {
-            border: 0px !important;
-            margin: 0 !important;
-        }
-    }
-
-    ol.visitor-profile-visits {
-        > li {
-            padding: 0 0 0 !important;
-            span {
-                font-weight: normal;
-                margin-right: 20px;
-            }
-
-            ol {
-                background: @theme-color-background-contrast !important;
-                border-top: 0 !important;
-                li {
-                    background: @theme-color-background-contrast !important;
-                    font-weight: normal;
-                    color: @theme-color-text-lighter;
-                    &:last-child {
-                        border-bottom: 0 !important;
-                        padding-bottom: 20px !important;
-                    }
-                    &:first-child {
-                        padding-top: 20px !important;
-                    }
-                }
-            }
-        }
-    }
-}
-
-.widget .visitor-profile .visitor-profile-info > div > div {
-    min-width: 100% !important;
-}
-
-.visitor-profile {
-    background: none;
-    border: 0;
-    .border-radius(0px);
-    .visitor-profile-info {
-        .border-radius(0px);
-        border: 0px;
-
-        > div {
-            border: 0px !important;
-        }
-
-        .visitor-profile-image-frame {
-            background: none !important;
-        }
-        .visitor-profile-avatar {
-            > div > img {
-                display: none;
-            }
-        }
-    }
-
-
-
-    .visitor-profile-avatar {
-       ul {
-        width: 100% !important;
-           li {
-                display: block;
-                border: 0px;
-                &:first-child {
-                    border: 0px !important;
-                }
-                span {
-                    color: @theme-color-text-lighter;
-                    .font-default(13px, 18px);
-                    padding-left: 0;
-                }
-
-                strong {
-                    color: @theme-color-text;
-                    .font-default(13px, 18px);
-                    font-weight: normal !important;
-                }
-
-                .visitor-profile-os,
-                .visitor-profile-browser {
-                    margin-left: 0;
-                    img {
-                        margin-right: 5px;
-                        vertical-align: middle;
-                    }
-                }
-            }
-        }
-    }
-
-    .visitor-profile-avatar > div:nth-child(2n) {
-        width: 376px;
-    }
-
-    .visitor-profile-latest-visit {
-        .visitor-profile-latest-visit-column {
-            display: inline-block;
-            margin-left: 0;
-        }
-
-        .visitor-profile-latest-visit-column:first-child {
-            width: 50%;
-            margin-right:-4px;
-        }
-
-        .visitor-profile-latest-visit-column:last-child {
-            width: 50%;
-            margin-right:-4px;
-        }
-    }
-}
-
 .annotationView {
     .font-default(10px, 12px);
     text-transform: uppercase;
diff --git a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
index b43bb1af32..17e350f0fd 100644
--- a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
+++ b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
@@ -1,3 +1,3 @@
-<p style="margin-top:8px" class="alert-info alert">Did you know?
+<p class="alert-info alert">Did you know?
     With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you can record all clicks, mouse movements, scrolls and form interactions of your visitors and replay them in a video to truly understand your visitors.
 </p>
\ No newline at end of file
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 4aed41100c..c275e09fc2 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -17,16 +17,6 @@ use Piwik\Piwik;
 
 class Provider extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails' => 'extendVisitorDetails'
-        );
-    }
-
     public function install()
     {
         // add column hostname / hostname ext in the visit table
@@ -42,15 +32,6 @@ class Provider extends \Piwik\Plugin
         }
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['provider']     = $instance->getProvider();
-        $visitor['providerName'] = $instance->getProviderName();
-        $visitor['providerUrl']  = $instance->getProviderUrl();
-    }
-
     public function uninstall()
     {
         // add column hostname / hostname ext in the visit table
diff --git a/plugins/Provider/Visitor.php b/plugins/Provider/Visitor.php
deleted file mode 100644
index c11f1e3a9b..0000000000
--- a/plugins/Provider/Visitor.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Provider;
-
-use Piwik\Piwik;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php';
-
-class Visitor
-{
-    private $details = array();
-
-    public function __construct($details)
-    {
-        $this->details = $details;
-    }
-
-    public function getProvider()
-    {
-        if (isset($this->details['location_provider'])) {
-            return $this->details['location_provider'];
-        }
-        return Piwik::translate('General_Unknown');
-    }
-
-    public function getProviderName()
-    {
-        return getPrettyProviderName($this->getProvider());
-    }
-
-    public function getProviderUrl()
-    {
-        return getHostnameUrl(@$this->details['location_provider']);
-    }
-}
\ No newline at end of file
diff --git a/plugins/Provider/VisitorDetails.php b/plugins/Provider/VisitorDetails.php
new file mode 100644
index 0000000000..d0f8f146b7
--- /dev/null
+++ b/plugins/Provider/VisitorDetails.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Provider;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\View;
+
+/**
+ * @see plugins/Provider/functions.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php';
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['provider'] = $this->details['location_provider'];
+        $visitor['providerName'] = $this->getProviderName();
+        $visitor['providerUrl']  = $this->getProviderUrl();
+    }
+
+    public function renderVisitorDetails($visitorDetails)
+    {
+        if (empty($visitorDetails['provider'])) {
+            return [];
+        }
+
+        $view            = new View('@Provider/_visitorDetails.twig');
+        $view->visitInfo = $visitorDetails;
+        return [[ 20, $view->render() ]];
+    }
+
+    protected function getProvider()
+    {
+        if (isset($this->details['location_provider'])) {
+            return $this->details['location_provider'];
+        }
+        return Piwik::translate('General_Unknown');
+    }
+
+    protected function getProviderName()
+    {
+        return getPrettyProviderName($this->getProvider());
+    }
+
+    protected function getProviderUrl()
+    {
+        return getHostnameUrl(@$this->details['location_provider']);
+    }
+}
\ No newline at end of file
diff --git a/plugins/Provider/templates/_visitorDetails.twig b/plugins/Provider/templates/_visitorDetails.twig
new file mode 100644
index 0000000000..0cfdbe6b4b
--- /dev/null
+++ b/plugins/Provider/templates/_visitorDetails.twig
@@ -0,0 +1,9 @@
+<div class="visitorProvider">
+    <br />
+    {{ 'Provider_ColumnProvider'|translate }}:
+    {% if visitInfo.getColumn('providerUrl') %}
+        <a href="{{ visitInfo.getColumn('providerUrl') }}" rel="noreferrer" target="_blank" class="visitorLogTooltip" title="{{ visitInfo.getColumn('providerName') }} {{ visitInfo.getColumn('providerUrl') }}" style="text-decoration:underline;">
+    {%- endif %}
+        {{ visitInfo.getColumn('providerName') }}
+    {%- if visitInfo.getColumn('providerUrl') %}</a>{% endif %}
+</div>
\ No newline at end of file
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index 9d4d03a4a1..4e18abc933 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -30,7 +30,6 @@ class Referrers extends \Piwik\Plugin
     {
         return array(
             'Insights.addReportToOverview'      => 'addReportToInsightsOverview',
-            'Live.getAllVisitorDetails'         => 'extendVisitorDetails',
             'Request.getRenamedModuleAndAction' => 'renameDeprecatedModuleAndAction',
             'Tracker.setTrackerCacheGeneral'    => 'setTrackerCacheGeneral'
         );
@@ -51,20 +50,6 @@ class Referrers extends \Piwik\Plugin
         }
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['referrerType']             = $instance->getReferrerType();
-        $visitor['referrerTypeName']         = $instance->getReferrerTypeName();
-        $visitor['referrerName']             = $instance->getReferrerName();
-        $visitor['referrerKeyword']          = $instance->getKeyword();
-        $visitor['referrerKeywordPosition']  = $instance->getKeywordPosition();
-        $visitor['referrerUrl']              = $instance->getReferrerUrl();
-        $visitor['referrerSearchEngineUrl']  = $instance->getSearchEngineUrl();
-        $visitor['referrerSearchEngineIcon'] = $instance->getSearchEngineIcon();
-    }
-
     public function addReportToInsightsOverview(&$reports)
     {
         $reports['Referrers_getWebsites']  = array();
diff --git a/plugins/Referrers/Visitor.php b/plugins/Referrers/VisitorDetails.php
index b10b9b953d..f0021c9293 100644
--- a/plugins/Referrers/Visitor.php
+++ b/plugins/Referrers/VisitorDetails.php
@@ -2,27 +2,38 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\Referrers;
 
-use Piwik\Url;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
 use Piwik\UrlHelper;
+use Piwik\View;
 
-require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
-
-class Visitor
+class VisitorDetails extends VisitorDetailsAbstract
 {
-    private $details = array();
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['referrerType']             = $this->getReferrerType();
+        $visitor['referrerTypeName']         = $this->getReferrerTypeName();
+        $visitor['referrerName']             = $this->getReferrerName();
+        $visitor['referrerKeyword']          = $this->getKeyword();
+        $visitor['referrerKeywordPosition']  = $this->getKeywordPosition();
+        $visitor['referrerUrl']              = $this->getReferrerUrl();
+        $visitor['referrerSearchEngineUrl']  = $this->getSearchEngineUrl();
+        $visitor['referrerSearchEngineIcon'] = $this->getSearchEngineIcon();
+    }
 
-    public function __construct($details)
+    public function renderVisitorDetails($visitorDetails)
     {
-        $this->details = $details;
+        $view            = new View('@Referrers/_visitorDetails.twig');
+        $view->visitInfo = $visitorDetails;
+        return [[ 10, $view->render() ]];
     }
 
-    public function getReferrerType()
+    protected function getReferrerType()
     {
         try {
             $referrerType = getReferrerTypeFromShortName($this->details['referer_type']);
@@ -33,15 +44,15 @@ class Visitor
         return $referrerType;
     }
 
-    public function getReferrerTypeName()
+    protected function getReferrerTypeName()
     {
         return getReferrerTypeLabel($this->details['referer_type']);
     }
 
-    public function getKeyword()
+    protected function getKeyword()
     {
         $keyword = $this->details['referer_keyword'];
-        
+
         if ($this->getReferrerType() == 'search') {
             $keyword = API::getCleanKeyword($keyword);
         }
@@ -49,27 +60,8 @@ class Visitor
         return urldecode($keyword);
     }
 
-    public function getReferrerUrl()
+    protected function getReferrerUrl()
     {
-        if ($this->getReferrerType() == 'search') {
-            if ($this->details['referer_keyword'] == API::LABEL_KEYWORD_NOT_DEFINED) {
-
-                return 'http://piwik.org/faq/general/#faq_144';
-
-            } // Case URL is google.XX/url.... then we rewrite to the search result page url
-            elseif ($this->getReferrerName() == 'Google'
-                && strpos($this->details['referer_url'], '/url')
-            ) {
-                $refUrl = @parse_url($this->details['referer_url']);
-                if (isset($refUrl['host'])) {
-                    $url = SearchEngine::getInstance()->getBackLinkFromUrlAndKeyword('http://google.com', $this->getKeyword());
-                    $url = str_replace('google.com', $refUrl['host'], $url);
-
-                    return $url;
-                }
-            }
-        }
-
         if (UrlHelper::isLookLikeUrl($this->details['referer_url'])) {
             return $this->details['referer_url'];
         }
@@ -77,7 +69,7 @@ class Visitor
         return null;
     }
 
-    public function getKeywordPosition()
+    protected function getKeywordPosition()
     {
         if ($this->getReferrerType() == 'search'
             && strpos($this->getReferrerName(), 'Google') !== false
@@ -98,12 +90,12 @@ class Visitor
         return null;
     }
 
-    public function getReferrerName()
+    protected function getReferrerName()
     {
         return urldecode($this->details['referer_name']);
     }
 
-    public function getSearchEngineUrl()
+    protected function getSearchEngineUrl()
     {
         if ($this->getReferrerType() == 'search'
             && !empty($this->details['referer_name'])
@@ -115,7 +107,7 @@ class Visitor
         return null;
     }
 
-    public function getSearchEngineIcon()
+    protected function getSearchEngineIcon()
     {
         $searchEngineUrl = $this->getSearchEngineUrl();
 
@@ -126,5 +118,4 @@ class Visitor
 
         return null;
     }
-
 }
\ No newline at end of file
diff --git a/plugins/Referrers/templates/_visitorDetails.twig b/plugins/Referrers/templates/_visitorDetails.twig
new file mode 100644
index 0000000000..e3b03a2aba
--- /dev/null
+++ b/plugins/Referrers/templates/_visitorDetails.twig
@@ -0,0 +1,35 @@
+<div class="visitorReferrer {{ visitInfo.getColumn('referrerType') }}">
+    {% if visitInfo.getColumn('referrerType') == 'website' %}
+        <span>{{ 'Referrers_ColumnWebsite'|translate }}:</span>
+        <a href="{{ visitInfo.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" class="visitorLogTooltip" title="{{ visitInfo.getColumn('referrerUrl') }}"
+           style="text-decoration:underline;">
+            {{ visitInfo.getColumn('referrerName') }}
+        </a>
+    {% endif %}
+    {% if visitInfo.getColumn('referrerType') == 'campaign' %}
+        <span>{{ 'Referrers_ColumnCampaign'|translate }}: {{ visitInfo.getColumn('referrerName') }}
+            {% if visitInfo.getColumn('referrerKeyword') is not empty %} - {{ visitInfo.getColumn('referrerKeyword') }}{% endif %}</span>
+    {% endif %}
+    {% if visitInfo.getColumn('referrerType') == 'search' %}
+        {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
+        {%- set showKeyword = visitInfo.getColumn('referrerKeyword') is not empty and visitInfo.getColumn('referrerKeyword') != keywordNotDefined -%}
+        {% if visitInfo.getColumn('referrerSearchEngineIcon') %}
+            <img width="16" src="{{ visitInfo.getColumn('referrerSearchEngineIcon') }}" alt="{{ visitInfo.getColumn('referrerName') }}"/>
+        {% endif %}
+        <span {% if not showKeyword %}title="{{ keywordNotDefined }}" class="visitorLogTooltip"{% endif %}>{{ visitInfo.getColumn('referrerName') }}</span>
+        {%- if showKeyword %}<span>, {{ 'Referrers_Keywords'|translate }}:</span>
+            <a href="{{ visitInfo.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" style="text-decoration:underline;">
+                "{{ visitInfo.getColumn('referrerKeyword') }}"</a>
+        {% endif %}
+        {% set keyword %}{{ visitInfo.getColumn('referrerKeyword') }}{% endset %}
+        {% set searchName %}{{ visitInfo.getColumn('referrerName') }}{% endset %}
+        {% set position %}#{{ visitInfo.getColumn('referrerKeywordPosition') }}{% endset %}
+        {% if visitInfo.getColumn('referrerKeywordPosition') %}
+            <span title='{{ 'Live_KeywordRankedOnSearchResultForThisVisitor'|translate(keyword,position,searchName) }}' class='visitorRank visitorLogTooltip'>
+                            <span class='hash'>#</span>
+                {{ visitInfo.getColumn('referrerKeywordPosition') }}
+                        </span>
+        {% endif %}
+    {% endif %}
+    {% if visitInfo.getColumn('referrerType') == 'direct' %}{{ 'Referrers_DirectEntry'|translate }}{% endif %}
+</div>
diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php
index 5ab7692ccf..da5acd7579 100644
--- a/plugins/Resolution/Resolution.php
+++ b/plugins/Resolution/Resolution.php
@@ -8,28 +8,9 @@
  */
 namespace Piwik\Plugins\Resolution;
 
-use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
-
 /**
  *
  */
 class Resolution extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
-        );
-    }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['resolution']               = $instance->getResolution();
-    }
 }
diff --git a/plugins/Resolution/Visitor.php b/plugins/Resolution/VisitorDetails.php
index 47fd330868..d6ccedb0a5 100644
--- a/plugins/Resolution/Visitor.php
+++ b/plugins/Resolution/VisitorDetails.php
@@ -2,22 +2,22 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\Resolution;
 
-class Visitor
-{
-    private $details = array();
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
 
-    public function __construct($details)
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
     {
-        $this->details = $details;
+        $visitor['resolution'] = $this->getResolution();
     }
 
-    function getResolution()
+    protected function getResolution()
     {
         if (!array_key_exists('config_resolution', $this->details)) {
             return null;
diff --git a/plugins/UserCountry/ProfileSummary/LocationSummary.php b/plugins/UserCountry/ProfileSummary/LocationSummary.php
new file mode 100644
index 0000000000..2aee622b09
--- /dev/null
+++ b/plugins/UserCountry/ProfileSummary/LocationSummary.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\UserCountry\ProfileSummary;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugins\Live;
+use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract;
+use Piwik\Url;
+use Piwik\View;
+
+/**
+ * Class LocationSummary
+ *
+ * @api
+ */
+class LocationSummary extends ProfileSummaryAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    public function getName()
+    {
+        return Piwik::translate('UserCountry_Location');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render()
+    {
+        if (empty($this->profile['countries'])) {
+            return '';
+        }
+
+        $view              = new View('@UserCountry/_profileSummary.twig');
+        $view->visitorData = $this->profile;
+
+        if (Common::getRequestVar('showMap', 1) == 1
+            && !empty($view->visitorData['hasLatLong'])
+            && \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('UserCountryMap')
+        ) {
+            $view->userCountryMapUrl = $this->getUserCountryMapUrlForVisitorProfile();
+        }
+
+        return $view->render();
+    }
+
+    private function getUserCountryMapUrlForVisitorProfile()
+    {
+        $params = array(
+            'module'             => 'UserCountryMap',
+            'action'             => 'realtimeMap',
+            'segment'            => Live\Controller::getSegmentWithVisitorId(),
+            'visitorId'          => false,
+            'changeVisitAlpha'   => 0,
+            'removeOldVisits'    => 0,
+            'realtimeWindow'     => 'false',
+            'showFooterMessage'  => 0,
+            'showDateTime'       => 0,
+            'doNotRefreshVisits' => 1
+        );
+        return Url::getCurrentQueryStringWithParametersModified($params);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOrder()
+    {
+        return 100;
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 0e1fa71728..61e5925c37 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -37,27 +37,9 @@ class UserCountry extends \Piwik\Plugin
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
             'Tracker.setTrackerCacheGeneral'         => 'setTrackerCacheGeneral',
             'Insights.addReportToOverview'           => 'addReportToInsightsOverview',
-            'Live.getAllVisitorDetails'              => 'extendVisitorDetails'
         );
     }
 
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['continent']     = $instance->getContinent();
-        $visitor['continentCode'] = $instance->getContinentCode();
-        $visitor['country']       = $instance->getCountryName();
-        $visitor['countryCode']   = $instance->getCountryCode();
-        $visitor['countryFlag']   = $instance->getCountryFlag();
-        $visitor['region']        = $instance->getRegionName();
-        $visitor['regionCode']    = $instance->getRegionCode();
-        $visitor['city']          = $instance->getCityName();
-        $visitor['location']      = $instance->getPrettyLocation();
-        $visitor['latitude']      = $instance->getLatitude();
-        $visitor['longitude']     = $instance->getLongitude();
-    }
-
     public function addReportToInsightsOverview(&$reports)
     {
         $reports['UserCountry_getCountry'] = array();
diff --git a/plugins/UserCountry/Visitor.php b/plugins/UserCountry/Visitor.php
deleted file mode 100644
index 2a64fcca0d..0000000000
--- a/plugins/UserCountry/Visitor.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserCountry;
-
-use Piwik\ArchiveProcessor;
-use Piwik\Common;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Tracker\Visit;
-use Piwik\Url;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
-
-class Visitor
-{
-    private $details = array();
-
-    public function __construct($details)
-    {
-        $this->details = $details;
-    }
-
-    public function getCountryCode()
-    {
-        return $this->details['location_country'];
-    }
-
-    public function getCountryName()
-    {
-        return countryTranslate($this->getCountryCode());
-    }
-
-    public function getCountryFlag()
-    {
-        return getFlagFromCode($this->getCountryCode());
-    }
-
-    public function getContinent()
-    {
-        return continentTranslate($this->getContinentCode());
-    }
-
-    public function getContinentCode()
-    {
-        return Common::getContinent($this->details['location_country']);
-    }
-
-    public function getCityName()
-    {
-        if (!empty($this->details['location_city'])) {
-            return $this->details['location_city'];
-        }
-
-        return null;
-    }
-
-    public function getRegionName()
-    {
-        $region = $this->getRegionCode();
-        if ($region != '' && $region != Visit::UNKNOWN_CODE) {
-            return GeoIp::getRegionNameFromCodes(
-                $this->details['location_country'], $region);
-        }
-
-        return null;
-    }
-
-    public function getRegionCode()
-    {
-        return $this->details['location_region'];
-    }
-
-    public function getPrettyLocation()
-    {
-        $parts = array();
-
-        $city = $this->getCityName();
-        if (!empty($city)) {
-            $parts[] = $city;
-        }
-        $region = $this->getRegionName();
-        if (!empty($region)) {
-            $parts[] = $region;
-        }
-
-        // add country & return concatenated result
-        $parts[] = $this->getCountryName();
-
-        return implode(', ', $parts);
-    }
-
-    public function getLatitude()
-    {
-        if (!empty($this->details['location_latitude'])) {
-            return $this->details['location_latitude'];
-        }
-
-        return null;
-    }
-
-    public function getLongitude()
-    {
-        if (!empty($this->details['location_longitude'])) {
-            return $this->details['location_longitude'];
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserCountry/VisitorDetails.php b/plugins/UserCountry/VisitorDetails.php
new file mode 100644
index 0000000000..1458aea307
--- /dev/null
+++ b/plugins/UserCountry/VisitorDetails.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserCountry;
+
+use Piwik\Common;
+use Piwik\Plugins\Live;
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Tracker\Visit;
+use Piwik\Url;
+use Piwik\View;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['continent']     = $this->getContinent();
+        $visitor['continentCode'] = $this->getContinentCode();
+        $visitor['country']       = $this->getCountryName();
+        $visitor['countryCode']   = $this->getCountryCode();
+        $visitor['countryFlag']   = $this->getCountryFlag();
+        $visitor['region']        = $this->getRegionName();
+        $visitor['regionCode']    = $this->getRegionCode();
+        $visitor['city']          = $this->getCityName();
+        $visitor['location']      = $this->getPrettyLocation();
+        $visitor['latitude']      = $this->getLatitude();
+        $visitor['longitude']     = $this->getLongitude();
+    }
+
+    protected function getCountryCode()
+    {
+        return $this->details['location_country'];
+    }
+
+    protected function getCountryName()
+    {
+        return countryTranslate($this->getCountryCode());
+    }
+
+    protected function getCountryFlag()
+    {
+        return getFlagFromCode($this->getCountryCode());
+    }
+
+    protected function getContinent()
+    {
+        return continentTranslate($this->getContinentCode());
+    }
+
+    protected function getContinentCode()
+    {
+        return Common::getContinent($this->details['location_country']);
+    }
+
+    protected function getCityName()
+    {
+        if (!empty($this->details['location_city'])) {
+            return $this->details['location_city'];
+        }
+
+        return null;
+    }
+
+    protected function getRegionName()
+    {
+        $region = $this->getRegionCode();
+        if ($region != '' && $region != Visit::UNKNOWN_CODE) {
+            return GeoIp::getRegionNameFromCodes(
+                $this->details['location_country'], $region);
+        }
+
+        return null;
+    }
+
+    protected function getRegionCode()
+    {
+        return $this->details['location_region'];
+    }
+
+    protected function getPrettyLocation()
+    {
+        $parts = array();
+
+        $city = $this->getCityName();
+        if (!empty($city)) {
+            $parts[] = $city;
+        }
+        $region = $this->getRegionName();
+        if (!empty($region)) {
+            $parts[] = $region;
+        }
+
+        // add country & return concatenated result
+        $parts[] = $this->getCountryName();
+
+        return implode(', ', $parts);
+    }
+
+    protected function getLatitude()
+    {
+        if (!empty($this->details['location_latitude'])) {
+            return $this->details['location_latitude'];
+        }
+
+        return null;
+    }
+
+    protected function getLongitude()
+    {
+        if (!empty($this->details['location_longitude'])) {
+            return $this->details['location_longitude'];
+        }
+
+        return null;
+    }
+
+
+    private $cities     = array();
+    private $countries  = array();
+    private $continents = array();
+
+    public function initProfile($visits, &$profile)
+    {
+        $this->cities          = array();
+        $this->continents      = array();
+        $this->countries       = array();
+        $profile['hasLatLong'] = false;
+    }
+
+    public function handleProfileVisit($visit, &$profile)
+    {
+        // realtime map only checks for latitude
+        $hasLatitude = $visit->getColumn('latitude') !== false;
+        if ($hasLatitude) {
+            $profile['hasLatLong'] = true;
+        }
+
+        $countryCode = $visit->getColumn('countryCode');
+        if (!isset($this->countries[$countryCode])) {
+            $this->countries[$countryCode] = 0;
+        }
+        ++$this->countries[$countryCode];
+
+        $continentCode = $visit->getColumn('continentCode');
+        if (!isset($this->continents[$continentCode])) {
+            $this->continents[$continentCode] = 0;
+        }
+        ++$this->continents[$continentCode];
+
+        if ($countryCode && !array_key_exists($countryCode, $this->cities)) {
+            $this->cities[$countryCode] = array();
+        }
+        $city = $visit->getColumn('city');
+        if (!empty($city)) {
+            $this->cities[$countryCode][] = $city;
+        }
+    }
+
+    public function finalizeProfile($visits, &$profile)
+    {
+        // transform country/continents/search keywords into something that will look good in XML
+        $profile['countries'] = $profile['continents'] = array();
+
+        // sort by visit/action
+        asort($this->continents);
+        foreach ($this->continents as $continentCode => $nbVisits) {
+            $profile['continents'][] = array(
+                'continent'  => $continentCode,
+                'nb_visits'  => $nbVisits,
+                'prettyName' => \Piwik\Plugins\UserCountry\continentTranslate($continentCode)
+            );
+        }
+
+        // sort by visit/action
+        asort($this->countries);
+
+        foreach ($this->countries as $countryCode => $nbVisits) {
+            $countryInfo = array(
+                'country'    => $countryCode,
+                'nb_visits'  => $nbVisits,
+                'flag'       => \Piwik\Plugins\UserCountry\getFlagFromCode($countryCode),
+                'prettyName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode)
+            );
+            if (!empty($this->cities[$countryCode])) {
+                $countryInfo['cities'] = array_unique($this->cities[$countryCode]);
+            }
+            $profile['countries'][] = $countryInfo;
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserCountry/templates/_profileSummary.twig b/plugins/UserCountry/templates/_profileSummary.twig
new file mode 100644
index 0000000000..8e6b33ef96
--- /dev/null
+++ b/plugins/UserCountry/templates/_profileSummary.twig
@@ -0,0 +1,40 @@
+<div class="visitor-profile-summary visitor-profile-location">
+    <h1>{{ 'UserCountry_Location'|translate }}</h1>
+    <p>
+        {%- for entry in visitorData.countries -%}
+
+            {% set entryCity -%}
+                {% if entry.cities is defined and 1 == entry.cities|length and entry.cities|join -%}
+                    {{ entry.cities|join }}
+                {%- elseif entry.cities is defined and 1 < entry.cities|length -%}
+                    <span title="{{ entry.cities|join(', ') }}">{{ 'UserCountry_FromDifferentCities'|translate }}</span>
+                {%- endif %}
+            {%- endset %}
+
+            {% set entryVisits -%}
+                <strong>
+                    {% if entry.nb_visits == 1 -%}
+                        {{ 'General_OneVisit'|translate }}
+                    {%- else -%}
+                        {{ 'General_NVisits'|translate(entry.nb_visits) }}
+                    {%- endif -%}
+                </strong>
+            {%- endset %}
+
+            {% set entryCountry -%}
+                {%- if entryCity -%}
+                    {{ 'UserCountry_CityAndCountry'|translate(entryCity, entry.prettyName)|raw }}
+                {%- else -%}
+                    {{ entry.prettyName }}
+                {%- endif -%}
+
+                &nbsp;<img height="16px" src="{{ entry.flag }}" title="{{ entry.prettyName }}"/>
+            {%- endset %}
+
+            {{- 'General_XFromY'|translate(entryVisits, entryCountry)|raw -}}{% if not loop.last %}, {% endif %}
+        {%- endfor %}
+        <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap'|translate|replace({' ': '&nbsp;'})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
+    </p>
+    <div class="visitor-profile-map" style="display:none" data-href="{{ userCountryMapUrl|default('') }}">
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index 3238ac11de..ea29eeb6d7 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -16,24 +16,6 @@ use Piwik\FrontController;
  */
 class UserLanguage extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails'              => 'extendVisitorDetails',
-        );
-    }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
-
-        $visitor['languageCode'] = $instance->getLanguageCode();
-        $visitor['language']     = $instance->getLanguage();
-    }
-
     public function postLoad()
     {
         Piwik::addAction('Template.footerUserCountry', array('Piwik\Plugins\UserLanguage\UserLanguage', 'footerUserCountry'));
diff --git a/plugins/UserLanguage/Visitor.php b/plugins/UserLanguage/VisitorDetails.php
index 26e8a36ec8..ba9122030f 100644
--- a/plugins/UserLanguage/Visitor.php
+++ b/plugins/UserLanguage/VisitorDetails.php
@@ -2,29 +2,30 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\UserLanguage;
 
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php';
 
-class Visitor
+class VisitorDetails extends VisitorDetailsAbstract
 {
-    private $details = array();
-
-    public function __construct($details)
+    public function extendVisitorDetails(&$visitor)
     {
-        $this->details = $details;
+        $visitor['languageCode'] = $this->getLanguageCode();
+        $visitor['language']     = $this->getLanguage();
     }
 
-    public function getLanguageCode()
+    protected function getLanguageCode()
     {
         return $this->details['location_browser_lang'];
     }
 
-    public function getLanguage()
+    protected function getLanguage()
     {
         return languageTranslate($this->details['location_browser_lang']);
     }
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 5b1c256ce7..39ac47d536 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -11,20 +11,4 @@ namespace Piwik\Plugins\VisitTime;
 // empty plugin definition, otherwise plugin won't be installed during test run
 class VisitTime extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails' => 'extendVisitorDetails',
-        );
-    }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $visitor['visitLocalTime'] = $details['visitor_localtime'];
-        $visitor['visitLocalHour'] = date('G', strtotime('2012-12-21 ' . $details['visitor_localtime']));
-    }
-
 }
diff --git a/plugins/VisitTime/VisitorDetails.php b/plugins/VisitTime/VisitorDetails.php
new file mode 100644
index 0000000000..eb40686832
--- /dev/null
+++ b/plugins/VisitTime/VisitorDetails.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\VisitTime;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['visitLocalTime'] = $this->details['visitor_localtime'];
+        $visitor['visitLocalHour'] = date('G', strtotime('2012-12-21 ' . $this->details['visitor_localtime']));
+    }
+}
\ No newline at end of file
diff --git a/plugins/VisitorInterest/VisitorDetails.php b/plugins/VisitorInterest/VisitorDetails.php
new file mode 100644
index 0000000000..62f0b99f3e
--- /dev/null
+++ b/plugins/VisitorInterest/VisitorDetails.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\VisitorInterest;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendVisitorDetails(&$visitor)
+    {
+        $visitor['daysSinceLastVisit'] = $this->details['visitor_days_since_last'];
+    }
+}
\ No newline at end of file
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index f135e12923..1a624d4cdb 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -17,17 +17,6 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 
 class VisitorInterest extends \Piwik\Plugin
 {
-
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        return array(
-            'Live.getAllVisitorDetails' => 'extendVisitorDetails',
-        );
-    }
-
     function postLoad()
     {
         Piwik::addAction('Template.footerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'footerVisitsFrequency'));
@@ -37,10 +26,4 @@ class VisitorInterest extends \Piwik\Plugin
     {
         $out .= FrontController::getInstance()->fetchDispatch('VisitorInterest', 'index');
     }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $visitor['daysSinceLastVisit'] = $details['visitor_days_since_last'];
-    }
-
 }
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php
index 56d4c7080d..dd7b13baaf 100644
--- a/tests/PHPUnit/Framework/TestRequest/Response.php
+++ b/tests/PHPUnit/Framework/TestRequest/Response.php
@@ -90,6 +90,7 @@ class Response
     private function normalizeApiResponse($apiResponse)
     {
         $apiResponse = $this->removeSubtableIdsFromXml($apiResponse);
+        $apiResponse = $this->removePageViewIds($apiResponse);
 
         if ($this->shouldDeleteLiveIds()) {
             $apiResponse = $this->removeAllIdsFromXml($apiResponse);
@@ -131,6 +132,15 @@ class Response
         return str_replace('&amp;#039;', "'", $apiResponse);
     }
 
+    private function removePageViewIds($apiResponse)
+    {
+        $toRemove = array(
+            'idpageview',
+        );
+
+        return $this->removeXmlFields($apiResponse, $toRemove);
+    }
+
     private function removeAllIdsFromXml($apiResponse)
     {
         $toRemove = array(
@@ -213,6 +223,7 @@ class Response
 
         $oldInput = $input;
         $input = preg_replace('/(<' . $xmlElement . '>.+?<\/' . $xmlElement . '>)/', '', $input);
+        $input = str_replace('<' . $xmlElement . ' />', '', $input);
 
         // check we didn't delete the whole string
         if ($testNotSmallAfter && $input != $oldInput) {
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
index b9512da381..a089d95913 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
@@ -23,16 +23,19 @@
 				<pageTitle />
 				<pageIdAction>9</pageIdAction>
 				
+				
 				<pageId>9</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -42,13 +45,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -84,6 +92,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -102,17 +116,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -137,16 +140,19 @@
 				<pageTitle />
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>8</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -156,13 +162,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -198,6 +209,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -216,17 +233,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -251,16 +257,19 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>7</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -270,13 +279,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -312,6 +326,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -330,17 +350,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -365,16 +374,19 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>6</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -384,13 +396,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -426,6 +443,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -444,17 +467,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -479,16 +491,19 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -498,13 +513,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -540,6 +560,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -558,17 +584,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -593,16 +608,19 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -612,13 +630,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -654,6 +677,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -672,17 +701,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -707,16 +725,19 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -726,13 +747,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -768,6 +794,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -786,17 +818,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -821,16 +842,19 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -840,13 +864,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -882,6 +911,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -900,17 +935,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -935,16 +959,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -954,13 +981,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -996,6 +1028,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -1014,16 +1052,5 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
index 6f6af71852..f25d013581 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
@@ -12,20 +12,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>70</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>123</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>123</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -44,20 +47,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>74</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>120</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>5</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>120</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>5</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -65,20 +71,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>78</pageId>
+				<bandwidth />
+				<timeSpent>52</timeSpent>
+				<timeSpentPretty>52s</timeSpentPretty>
+				<generationTimeMilliseconds>23</generationTimeMilliseconds>
+				<generationTime>0.02s</generationTime>
+				<interactionPosition>9</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>23</generationTimeMilliseconds>
-				<generationTime>0.02s</generationTime>
-				<interactionPosition>9</interactionPosition>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -86,20 +95,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>71</pageId>
+				<bandwidth />
+				<timeSpent>50</timeSpent>
+				<timeSpentPretty>50s</timeSpentPretty>
+				<generationTimeMilliseconds>234</generationTimeMilliseconds>
+				<generationTime>0.23s</generationTime>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>234</generationTimeMilliseconds>
-				<generationTime>0.23s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>50</timeSpent>
-				<timeSpentPretty>50s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -107,20 +119,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>75</pageId>
+				<bandwidth />
+				<timeSpent>49</timeSpent>
+				<timeSpentPretty>49s</timeSpentPretty>
+				<generationTimeMilliseconds>294</generationTimeMilliseconds>
+				<generationTime>0.29s</generationTime>
+				<interactionPosition>6</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>294</generationTimeMilliseconds>
-				<generationTime>0.29s</generationTime>
-				<interactionPosition>6</interactionPosition>
-				<timeSpent>49</timeSpent>
-				<timeSpentPretty>49s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -128,20 +143,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>79</pageId>
+				<bandwidth />
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTimeMilliseconds>237</generationTimeMilliseconds>
+				<generationTime>0.24s</generationTime>
+				<interactionPosition>10</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>237</generationTimeMilliseconds>
-				<generationTime>0.24s</generationTime>
-				<interactionPosition>10</interactionPosition>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -149,20 +167,23 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>72</pageId>
+				<bandwidth />
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTimeMilliseconds>1324</generationTimeMilliseconds>
+				<generationTime>1.32s</generationTime>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>1324</generationTimeMilliseconds>
-				<generationTime>1.32s</generationTime>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -170,20 +191,23 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>76</pageId>
+				<bandwidth />
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTimeMilliseconds>624</generationTimeMilliseconds>
+				<generationTime>0.62s</generationTime>
+				<interactionPosition>7</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>624</generationTimeMilliseconds>
-				<generationTime>0.62s</generationTime>
-				<interactionPosition>7</interactionPosition>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -191,20 +215,23 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>73</pageId>
+				<bandwidth />
+				<timeSpent>8</timeSpent>
+				<timeSpentPretty>8s</timeSpentPretty>
+				<generationTimeMilliseconds>543</generationTimeMilliseconds>
+				<generationTime>0.54s</generationTime>
+				<interactionPosition>4</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>543</generationTimeMilliseconds>
-				<generationTime>0.54s</generationTime>
-				<interactionPosition>4</interactionPosition>
-				<timeSpent>8</timeSpent>
-				<timeSpentPretty>8s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -212,18 +239,21 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>77</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>343</generationTimeMilliseconds>
+				<generationTime>0.34s</generationTime>
+				<interactionPosition>8</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>343</generationTimeMilliseconds>
-				<generationTime>0.34s</generationTime>
-				<interactionPosition>8</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -233,13 +263,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -275,6 +310,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -293,17 +334,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -328,7 +358,12 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>30</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -343,9 +378,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -355,13 +388,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -397,6 +435,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -432,17 +476,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -467,16 +500,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>28</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -486,13 +522,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -528,6 +569,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -550,17 +597,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -585,16 +621,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>29</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -604,13 +643,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -646,6 +690,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -668,17 +718,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -692,18 +731,21 @@
 				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</pageTitle>
 				<pageIdAction>25</pageIdAction>
 				
+				
 				<pageId>26</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>301</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -722,16 +764,19 @@
 				<pageTitle>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</pageTitle>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>27</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>307</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -741,13 +786,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -783,6 +833,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -805,17 +861,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -829,18 +874,21 @@
 				<pageTitle />
 				<pageIdAction>21</pageIdAction>
 				
+				
 				<pageId>23</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>61</timeSpent>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -848,18 +896,21 @@
 				<pageTitle />
 				<pageIdAction>22</pageIdAction>
 				
+				
 				<pageId>24</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>61</timeSpent>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -867,16 +918,19 @@
 				<pageTitle />
 				<pageIdAction>23</pageIdAction>
 				
+				
 				<pageId>25</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -886,13 +940,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -928,6 +987,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -950,17 +1015,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -985,16 +1039,19 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>22</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1004,13 +1061,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1046,6 +1108,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -1068,17 +1136,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1103,16 +1160,19 @@
 				<pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle>
 				<pageIdAction>20</pageIdAction>
 				
+				
 				<pageId>21</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>500</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1122,13 +1182,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1164,6 +1229,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -1186,17 +1257,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1210,16 +1270,19 @@
 				<pageTitle />
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>18</pageId>
+				<bandwidth>4324023</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>4.1 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1229,13 +1292,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1271,6 +1339,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Oceania</continent>
 		<continentCode>oce</continentCode>
@@ -1293,17 +1367,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1328,16 +1391,19 @@
 				<pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F</pageTitle>
 				<pageIdAction>18</pageIdAction>
 				
+				
 				<pageId>20</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>404</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1347,13 +1413,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1389,6 +1460,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -1411,16 +1488,5 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index a79a0dba17..982d316f0c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -23,10 +23,13 @@
 				<pageTitle>It's pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>95</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -36,13 +39,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -78,6 +86,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -111,17 +125,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -135,12 +138,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>46</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,19 +164,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -189,12 +198,15 @@
 				<pageTitle />
 				<pageIdAction>47</pageIdAction>
 				
+				
 				<pageId>48</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -202,26 +214,32 @@
 				<pageTitle />
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>49</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
 				<eventAction>Action8</eventAction>
+				<bandwidth />
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -231,13 +249,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -273,6 +296,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -314,17 +343,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -349,7 +367,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -360,9 +383,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -372,13 +393,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -414,6 +440,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -455,17 +487,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -479,12 +500,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>41</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -514,12 +538,15 @@
 				<pageTitle />
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -527,26 +554,32 @@
 				<pageTitle />
 				<pageIdAction>43</pageIdAction>
 				
+				
 				<pageId>43</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
 				<eventAction>Action7</eventAction>
+				<bandwidth />
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -556,13 +589,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -598,6 +636,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -639,17 +683,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -674,7 +707,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -685,9 +723,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -697,13 +733,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -739,6 +780,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -780,17 +827,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -804,12 +840,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>35</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -827,19 +866,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>36</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -858,12 +900,15 @@
 				<pageTitle />
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>37</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -871,26 +916,32 @@
 				<pageTitle />
 				<pageIdAction>38</pageIdAction>
 				
+				
 				<pageId>38</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
 				<eventAction>Action6</eventAction>
+				<bandwidth />
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -900,13 +951,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -942,6 +998,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -983,17 +1045,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1018,7 +1069,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1029,9 +1085,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1041,13 +1095,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1083,6 +1142,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1124,17 +1189,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1148,12 +1202,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>30</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1183,12 +1240,15 @@
 				<pageTitle />
 				<pageIdAction>32</pageIdAction>
 				
+				
 				<pageId>31</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -1196,26 +1256,32 @@
 				<pageTitle />
 				<pageIdAction>33</pageIdAction>
 				
+				
 				<pageId>32</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>33</pageId>
 				<eventCategory>Cat5</eventCategory>
 				<eventAction>Action5</eventAction>
+				<bandwidth />
 				<eventName>Name5</eventName>
 				<eventValue>350.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1225,13 +1291,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -1267,6 +1338,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1308,17 +1385,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1343,7 +1409,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>29</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1354,9 +1425,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1366,13 +1435,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1408,6 +1482,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1449,17 +1529,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1473,12 +1542,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>24</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1496,19 +1568,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>25</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1527,12 +1602,15 @@
 				<pageTitle />
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>26</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -1540,26 +1618,32 @@
 				<pageTitle />
 				<pageIdAction>28</pageIdAction>
 				
+				
 				<pageId>27</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>28</pageId>
 				<eventCategory>Cat4</eventCategory>
 				<eventAction>Action4</eventAction>
+				<bandwidth />
 				<eventName>Name4</eventName>
 				<eventValue>349.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1569,13 +1653,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -1611,6 +1700,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1652,17 +1747,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1687,7 +1771,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>23</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1698,9 +1787,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1710,13 +1797,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1752,6 +1844,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1793,17 +1891,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1817,12 +1904,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>19</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1852,12 +1942,15 @@
 				<pageTitle />
 				<pageIdAction>22</pageIdAction>
 				
+				
 				<pageId>20</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -1865,26 +1958,32 @@
 				<pageTitle />
 				<pageIdAction>23</pageIdAction>
 				
+				
 				<pageId>21</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>22</pageId>
 				<eventCategory>Cat3</eventCategory>
 				<eventAction>Action3</eventAction>
+				<bandwidth />
 				<eventName>Name3</eventName>
 				<eventValue>348.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1894,13 +1993,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -1936,6 +2040,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1977,17 +2087,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2001,12 +2100,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>80</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2036,12 +2138,15 @@
 				<pageTitle />
 				<pageIdAction>22</pageIdAction>
 				
+				
 				<pageId>81</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -2049,26 +2154,32 @@
 				<pageTitle />
 				<pageIdAction>23</pageIdAction>
 				
+				
 				<pageId>82</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>83</pageId>
 				<eventCategory>Cat3</eventCategory>
 				<eventAction>Action3</eventAction>
+				<bandwidth />
 				<eventName>Name3</eventName>
 				<eventValue>348.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -2078,13 +2189,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -2120,6 +2236,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>34.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -2153,17 +2275,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2188,7 +2299,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>18</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2199,9 +2315,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2211,13 +2325,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -2253,6 +2372,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -2294,17 +2419,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2329,7 +2443,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>79</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2340,9 +2459,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2352,13 +2469,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -2394,6 +2516,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>34.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -2435,17 +2563,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2459,12 +2576,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>13</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2482,19 +2602,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>14</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2513,12 +2636,15 @@
 				<pageTitle />
 				<pageIdAction>17</pageIdAction>
 				
+				
 				<pageId>15</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -2526,26 +2652,32 @@
 				<pageTitle />
 				<pageIdAction>18</pageIdAction>
 				
+				
 				<pageId>16</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>17</pageId>
 				<eventCategory>Cat2</eventCategory>
 				<eventAction>Action2</eventAction>
+				<bandwidth />
 				<eventName>Name2</eventName>
 				<eventValue>347.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -2555,13 +2687,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -2597,6 +2734,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -2638,17 +2781,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2662,12 +2794,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>74</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2685,19 +2820,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>75</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2716,12 +2854,15 @@
 				<pageTitle />
 				<pageIdAction>17</pageIdAction>
 				
+				
 				<pageId>76</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -2729,26 +2870,32 @@
 				<pageTitle />
 				<pageIdAction>18</pageIdAction>
 				
+				
 				<pageId>77</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>78</pageId>
 				<eventCategory>Cat2</eventCategory>
 				<eventAction>Action2</eventAction>
+				<bandwidth />
 				<eventName>Name2</eventName>
 				<eventValue>347.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -2758,13 +2905,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -2800,6 +2952,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>11.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2833,17 +2991,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2868,7 +3015,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>12</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2879,9 +3031,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2891,13 +3041,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -2933,6 +3088,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -2974,17 +3135,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3009,7 +3159,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>73</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3020,9 +3175,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3032,13 +3185,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -3074,6 +3232,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>11.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -3115,17 +3279,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3139,12 +3292,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>8</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -3174,12 +3330,15 @@
 				<pageTitle />
 				<pageIdAction>12</pageIdAction>
 				
+				
 				<pageId>9</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -3187,26 +3346,32 @@
 				<pageTitle />
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>10</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>11</pageId>
 				<eventCategory>Cat1</eventCategory>
 				<eventAction>Action1</eventAction>
+				<bandwidth />
 				<eventName>Name1</eventName>
 				<eventValue>346.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -3216,13 +3381,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -3258,6 +3428,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -3299,17 +3475,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3323,12 +3488,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>58</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -3358,12 +3526,15 @@
 				<pageTitle />
 				<pageIdAction>12</pageIdAction>
 				
+				
 				<pageId>59</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -3371,26 +3542,32 @@
 				<pageTitle />
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>60</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>61</pageId>
 				<eventCategory>Cat1</eventCategory>
 				<eventAction>Action1</eventAction>
+				<bandwidth />
 				<eventName>Name1</eventName>
 				<eventValue>346.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -3400,13 +3577,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -3442,6 +3624,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -3483,17 +3671,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3507,12 +3684,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>69</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -3542,12 +3722,15 @@
 				<pageTitle />
 				<pageIdAction>12</pageIdAction>
 				
+				
 				<pageId>70</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -3555,26 +3738,32 @@
 				<pageTitle />
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>71</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>72</pageId>
 				<eventCategory>Cat1</eventCategory>
 				<eventAction>Action1</eventAction>
+				<bandwidth />
 				<eventName>Name1</eventName>
 				<eventValue>346.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -3584,13 +3773,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -3626,6 +3820,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -3659,17 +3859,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3683,12 +3872,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>91</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -3718,12 +3910,15 @@
 				<pageTitle />
 				<pageIdAction>12</pageIdAction>
 				
+				
 				<pageId>92</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -3731,26 +3926,32 @@
 				<pageTitle />
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>93</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>94</pageId>
 				<eventCategory>Cat1</eventCategory>
 				<eventAction>Action1</eventAction>
+				<bandwidth />
 				<eventName>Name1</eventName>
 				<eventValue>346.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -3760,13 +3961,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -3802,6 +4008,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -3843,17 +4055,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3878,7 +4079,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>7</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3889,9 +4095,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3901,13 +4105,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -3943,6 +4152,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -3984,17 +4199,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4019,7 +4223,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>57</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4030,9 +4239,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4042,13 +4249,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -4084,6 +4296,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -4125,17 +4343,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4160,7 +4367,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>68</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4171,9 +4383,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4183,13 +4393,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -4225,6 +4440,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -4266,17 +4487,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4301,7 +4511,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>90</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4312,9 +4527,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4324,13 +4537,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -4366,6 +4584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -4407,17 +4631,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4431,12 +4644,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4454,19 +4670,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4485,12 +4704,15 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>4</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -4498,26 +4720,32 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>5</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>6</pageId>
 				<eventCategory>Cat0</eventCategory>
 				<eventAction>Action0</eventAction>
+				<bandwidth />
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -4527,13 +4755,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -4569,6 +4802,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -4610,17 +4849,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4634,12 +4862,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>52</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4657,19 +4888,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>53</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4688,12 +4922,15 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>54</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -4701,26 +4938,32 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>55</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>56</pageId>
 				<eventCategory>Cat0</eventCategory>
 				<eventAction>Action0</eventAction>
+				<bandwidth />
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -4730,13 +4973,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -4772,6 +5020,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon>
 		<browserCode>CM</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -4813,17 +5067,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4837,12 +5080,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>63</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4860,19 +5106,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>64</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4891,12 +5140,15 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>65</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -4904,26 +5156,32 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>66</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>67</pageId>
 				<eventCategory>Cat0</eventCategory>
 				<eventAction>Action0</eventAction>
+				<bandwidth />
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -4933,13 +5191,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -4975,6 +5238,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>32.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -5008,17 +5277,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5032,12 +5290,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>85</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -5055,19 +5316,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>86</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -5086,12 +5350,15 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>87</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -5099,26 +5366,32 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>88</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>89</pageId>
 				<eventCategory>Cat0</eventCategory>
 				<eventAction>Action0</eventAction>
+				<bandwidth />
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -5128,13 +5401,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -5170,6 +5448,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon>
 		<browserCode>QQ</browserCode>
 		<browserVersion>5.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -5211,17 +5495,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5246,7 +5519,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -5257,9 +5535,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5269,13 +5545,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5311,6 +5592,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -5352,17 +5639,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5387,7 +5663,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>51</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -5398,9 +5679,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5410,13 +5689,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5452,6 +5736,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon>
 		<browserCode>CM</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -5493,17 +5783,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5528,7 +5807,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>62</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -5539,9 +5823,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5551,13 +5833,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5593,6 +5880,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>32.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -5634,17 +5927,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5669,7 +5951,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>84</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -5680,9 +5967,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5692,13 +5977,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5734,6 +6024,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon>
 		<browserCode>QQ</browserCode>
 		<browserVersion>5.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -5775,16 +6071,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 90cf7ef7ce..752d66ceb8 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -11,12 +11,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,13 +29,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -68,6 +76,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -105,17 +119,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,12 +131,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -143,13 +149,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -185,6 +196,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -222,17 +239,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -245,90 +251,108 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
-				<eventName>Search query here</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Search query here</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>23</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>24</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>720</timeSpent>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>25</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
+				<bandwidth />
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -338,13 +362,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -380,6 +409,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>6</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -417,17 +452,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -440,12 +464,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -455,13 +482,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -497,6 +529,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -534,17 +572,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -569,163 +596,187 @@
 				<pageTitle>Welcome!</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1</timeSpent>
+				<timeSpentPretty>1s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>9</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>9</eventValue>
-				<interactionPosition />
-				<timeSpent>1</timeSpent>
-				<timeSpentPretty>1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>10</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>10</eventValue>
-				<interactionPosition />
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -743,14 +794,17 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>9</pageId>
 				<eventCategory>CategoryTriggersGoal here</eventCategory>
 				<eventAction>This is an event without a URL</eventAction>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -758,102 +812,123 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
+				
 				<pageId>10</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>666</generationTimeMilliseconds>
 				<generationTime>0.67s</generationTime>
 				<interactionPosition>2</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Princess Mononoke (もののけ姫)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Princess Mononoke (もののけ姫)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Ponyo (崖の上のポニョ)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Ponyo (崖の上のポニョ)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -863,13 +938,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -905,6 +985,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>14</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -942,17 +1028,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -965,12 +1040,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>45</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -980,13 +1058,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1022,6 +1105,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1055,17 +1144,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1078,12 +1156,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1093,13 +1174,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1135,6 +1221,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1168,17 +1260,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1191,90 +1272,108 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>40</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>41</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>43</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
-				<eventName>Search query here</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Search query here</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>46</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>720</timeSpent>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>48</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
+				<bandwidth />
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1284,13 +1383,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1326,6 +1430,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>6</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1359,17 +1469,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1382,12 +1481,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>42</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1397,13 +1499,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1439,6 +1546,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1472,17 +1585,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1495,149 +1597,170 @@
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>26</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>27</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>28</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>29</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>30</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>31</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1</timeSpent>
+				<timeSpentPretty>1s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>9</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>9</eventValue>
-				<interactionPosition />
-				<timeSpent>1</timeSpent>
-				<timeSpentPretty>1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>32</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1499</timeSpent>
+				<timeSpentPretty>24 min 59s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>10</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>10</eventValue>
-				<interactionPosition />
-				<timeSpent>1499</timeSpent>
-				<timeSpentPretty>24 min 59s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1645,102 +1768,123 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
+				
 				<pageId>33</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>666</generationTimeMilliseconds>
 				<generationTime>0.67s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>34</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Princess Mononoke (もののけ姫)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Princess Mononoke (もののけ姫)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>35</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Ponyo (崖の上のポニョ)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Ponyo (崖の上のポニョ)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>36</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>37</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>38</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1750,13 +1894,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1792,6 +1941,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>13</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1825,16 +1980,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 3ea5a04c04..2852bfd6bf 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -11,12 +11,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>68</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,13 +29,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -68,6 +76,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -101,17 +115,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -124,12 +127,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>67</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -139,13 +145,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -181,6 +192,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -214,17 +231,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -237,90 +243,108 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>63</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>64</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>66</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
-				<eventName>Search query here</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Search query here</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>69</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>70</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>720</timeSpent>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>71</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
+				<bandwidth />
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -330,13 +354,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -372,6 +401,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>6</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -405,17 +440,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -428,12 +452,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>65</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -443,13 +470,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -485,6 +517,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -518,17 +556,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -541,149 +568,170 @@
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>49</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>51</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>52</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>53</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>54</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1</timeSpent>
+				<timeSpentPretty>1s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>9</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>9</eventValue>
-				<interactionPosition />
-				<timeSpent>1</timeSpent>
-				<timeSpentPretty>1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.com/piwik/</url>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>55</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1499</timeSpent>
+				<timeSpentPretty>24 min 59s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>10</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>10</eventValue>
-				<interactionPosition />
-				<timeSpent>1499</timeSpent>
-				<timeSpentPretty>24 min 59s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -691,102 +739,123 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
+				
 				<pageId>56</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>666</generationTimeMilliseconds>
 				<generationTime>0.67s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>57</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Princess Mononoke (もののけ姫)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Princess Mononoke (もののけ姫)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>58</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Ponyo (崖の上のポニョ)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Ponyo (崖の上のポニョ)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>59</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>60</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>61</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>62</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -796,13 +865,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -838,6 +912,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>13</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -871,17 +951,6 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -894,12 +963,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -909,13 +981,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -951,6 +1028,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -988,17 +1071,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1011,12 +1083,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1026,13 +1101,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1068,6 +1148,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1105,17 +1191,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1128,90 +1203,108 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
-				<eventName>Search query here</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Search query here</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>23</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>24</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>720</timeSpent>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>25</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
+				<bandwidth />
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1221,13 +1314,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1263,6 +1361,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>6</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1300,17 +1404,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1323,12 +1416,15 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
+				<bandwidth />
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1338,13 +1434,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1380,6 +1481,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1417,17 +1524,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1452,163 +1548,187 @@
 				<pageTitle>Welcome!</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
+				<bandwidth />
+				<timeSpent>30</timeSpent>
+				<timeSpentPretty>30s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<interactionPosition />
-				<timeSpent>30</timeSpent>
-				<timeSpentPretty>30s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>1</timeSpent>
+				<timeSpentPretty>1s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>9</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>9</eventValue>
-				<interactionPosition />
-				<timeSpent>1</timeSpent>
-				<timeSpentPretty>1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<eventName>La fiancée de l'eau</eventName>
+				<eventValue>10</eventValue>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Page Scope Custom var</customVariablePageName1>
 						<customVariablePageValue1>should not appear in events report</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>La fiancée de l'eau</eventName>
-				<eventValue>10</eventValue>
-				<interactionPosition />
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1626,14 +1746,17 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>9</pageId>
 				<eventCategory>CategoryTriggersGoal here</eventCategory>
 				<eventAction>This is an event without a URL</eventAction>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1641,102 +1764,123 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
+				
 				<pageId>10</pageId>
+				<bandwidth />
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>666</generationTimeMilliseconds>
 				<generationTime>0.67s</generationTime>
 				<interactionPosition>2</interactionPosition>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Princess Mononoke (もののけ姫)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Princess Mononoke (もののけ姫)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Ponyo (崖の上のポニョ)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Ponyo (崖の上のポニョ)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
-				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
+				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
+				<interactionPosition />
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
+				<bandwidth />
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1746,13 +1890,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1788,6 +1937,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>14</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1825,16 +1980,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 14b07fcb83..4ad17456d4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -23,18 +23,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>49</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>292</generationTimeMilliseconds>
+				<generationTime>0.29s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>292</generationTimeMilliseconds>
-				<generationTime>0.29s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -44,13 +47,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>77</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -86,6 +94,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -127,17 +141,6 @@
 				<pluginName>pdf</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -151,18 +154,21 @@
 				<pageTitle>Changelog Archive - Analytics - Piwik</pageTitle>
 				<pageIdAction>44</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>79</timeSpent>
+				<timeSpentPretty>1 min 19s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>79</timeSpent>
-				<timeSpentPretty>1 min 19s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -181,16 +187,19 @@
 				<pageTitle>Contact the Piwik team - Analytics - Piwik</pageTitle>
 				<pageIdAction>55</pageIdAction>
 				
+				
 				<pageId>48</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -200,13 +209,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>181</daysSinceFirstVisit>
@@ -242,6 +256,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -266,17 +286,6 @@
 		<resolution>1536x864</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -301,18 +310,21 @@
 				<pageTitle>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</pageTitle>
 				<pageIdAction>53</pageIdAction>
 				
+				
 				<pageId>47</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>413</generationTimeMilliseconds>
+				<generationTime>0.41s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>413</generationTimeMilliseconds>
-				<generationTime>0.41s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -322,13 +334,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -364,6 +381,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>34.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -417,17 +440,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -441,18 +453,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>44</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>32</timeSpent>
+				<timeSpentPretty>32s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>32</timeSpent>
-				<timeSpentPretty>32s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -471,16 +486,19 @@
 				<pageTitle>What is Piwik? - Analytics - Piwik</pageTitle>
 				<pageIdAction>51</pageIdAction>
 				
+				
 				<pageId>46</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>501</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -490,13 +508,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>7</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>17</daysSinceFirstVisit>
@@ -511,7 +534,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=1&amp;ved=0CCcQFjAA&amp;url=http%3A%2F%2Fpiwik.org%2F&amp;ei=8vwgU8TYDZTI2wWTi4CQCA&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;bvm=bv.62922401,d.b2I</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -532,6 +555,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -577,17 +606,6 @@
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -601,16 +619,19 @@
 				<pageTitle />
 				<pageIdAction>49</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/link.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/link.png</icon>
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -620,13 +641,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -662,6 +688,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -707,17 +739,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -742,18 +763,21 @@
 				<pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle>
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>43</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>391</generationTimeMilliseconds>
+				<generationTime>0.39s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>391</generationTimeMilliseconds>
-				<generationTime>0.39s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -763,13 +787,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -784,7 +813,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>https://www.google.com/</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -805,6 +834,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -858,17 +893,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -893,16 +917,19 @@
 				<pageTitle>Log Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>404</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -912,13 +939,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>4</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>3</daysSinceFirstVisit>
@@ -933,7 +965,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>2</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>https://www.google.co.jp/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=2&amp;ved=0CDAQFjAB&amp;url=https%3A%2F%2Fpiwik.org%2Flog-analytics%2F&amp;ei=rogdU5OuK43pkgXZmYGICA&amp;usg=AFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg&amp;bvm=bv.62578216,d.dGI</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -954,6 +986,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -995,17 +1033,6 @@
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1030,18 +1057,21 @@
 				<pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle>
 				<pageIdAction>46</pageIdAction>
 				
+				
 				<pageId>41</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>119</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>119</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1051,13 +1081,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1090,9 +1125,15 @@
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox Mobile 27.0</browser>
 		<browserName>Firefox Mobile</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+		<browserIcon>plugins/Morpheus/icons/dist/browsers/FM.png</browserIcon>
 		<browserCode>FM</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1126,17 +1167,6 @@
 				<pluginName>flash</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1161,18 +1191,21 @@
 				<pageTitle>Log Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>39</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>145</generationTimeMilliseconds>
+				<generationTime>0.15s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>145</generationTimeMilliseconds>
-				<generationTime>0.15s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1182,13 +1215,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>1</daysSinceFirstVisit>
@@ -1224,6 +1262,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1277,17 +1321,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1301,20 +1334,23 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>35</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>2</timeSpent>
+				<timeSpentPretty>2s</timeSpentPretty>
+				<generationTimeMilliseconds>182</generationTimeMilliseconds>
+				<generationTime>0.18s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>403</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>182</generationTimeMilliseconds>
-				<generationTime>0.18s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>2</timeSpent>
-				<timeSpentPretty>2s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1333,20 +1369,23 @@
 				<pageTitle>Download - Analytics - Piwik</pageTitle>
 				<pageIdAction>39</pageIdAction>
 				
+				
 				<pageId>37</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTimeMilliseconds>113</generationTimeMilliseconds>
+				<generationTime>0.11s</generationTime>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>500</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>113</generationTimeMilliseconds>
-				<generationTime>0.11s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -1354,16 +1393,19 @@
 				<pageTitle />
 				<pageIdAction>40</pageIdAction>
 				
+				
 				<pageId>38</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1373,13 +1415,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1394,7 +1441,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>http://www.google.ru/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=1&amp;ved=0CCoQFjAA&amp;url=http%3A%2F%2Fpiwik.org%2F&amp;ei=ffwgU57VGuf44QT3-oCQCw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;bvm=bv.62922401,d.bGE&amp;cad=rjt</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -1415,6 +1462,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1452,17 +1505,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1487,18 +1529,21 @@
 				<pageTitle>Hello Installing Piwik - Analytics - Piwik</pageTitle>
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>36</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>134</generationTimeMilliseconds>
+				<generationTime>0.13s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>134</generationTimeMilliseconds>
-				<generationTime>0.13s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1508,13 +1553,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>30</daysSinceFirstVisit>
@@ -1550,6 +1600,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1595,17 +1651,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1630,18 +1675,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>58</generationTimeMilliseconds>
+				<generationTime>0.06s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>58</generationTimeMilliseconds>
-				<generationTime>0.06s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1651,13 +1699,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1693,6 +1746,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1738,17 +1797,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1762,20 +1810,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>70</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>123</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>123</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1794,20 +1845,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>74</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>120</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>5</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>120</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>5</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1815,20 +1869,23 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>78</pageId>
+				<bandwidth />
+				<timeSpent>52</timeSpent>
+				<timeSpentPretty>52s</timeSpentPretty>
+				<generationTimeMilliseconds>23</generationTimeMilliseconds>
+				<generationTime>0.02s</generationTime>
+				<interactionPosition>9</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>23</generationTimeMilliseconds>
-				<generationTime>0.02s</generationTime>
-				<interactionPosition>9</interactionPosition>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1836,20 +1893,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>71</pageId>
+				<bandwidth />
+				<timeSpent>50</timeSpent>
+				<timeSpentPretty>50s</timeSpentPretty>
+				<generationTimeMilliseconds>234</generationTimeMilliseconds>
+				<generationTime>0.23s</generationTime>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>234</generationTimeMilliseconds>
-				<generationTime>0.23s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>50</timeSpent>
-				<timeSpentPretty>50s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1857,20 +1917,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>75</pageId>
+				<bandwidth />
+				<timeSpent>49</timeSpent>
+				<timeSpentPretty>49s</timeSpentPretty>
+				<generationTimeMilliseconds>294</generationTimeMilliseconds>
+				<generationTime>0.29s</generationTime>
+				<interactionPosition>6</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>294</generationTimeMilliseconds>
-				<generationTime>0.29s</generationTime>
-				<interactionPosition>6</interactionPosition>
-				<timeSpent>49</timeSpent>
-				<timeSpentPretty>49s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1878,20 +1941,23 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>79</pageId>
+				<bandwidth />
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTimeMilliseconds>237</generationTimeMilliseconds>
+				<generationTime>0.24s</generationTime>
+				<interactionPosition>10</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>237</generationTimeMilliseconds>
-				<generationTime>0.24s</generationTime>
-				<interactionPosition>10</interactionPosition>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1899,20 +1965,23 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>72</pageId>
+				<bandwidth />
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTimeMilliseconds>1324</generationTimeMilliseconds>
+				<generationTime>1.32s</generationTime>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>1324</generationTimeMilliseconds>
-				<generationTime>1.32s</generationTime>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1920,20 +1989,23 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>76</pageId>
+				<bandwidth />
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTimeMilliseconds>624</generationTimeMilliseconds>
+				<generationTime>0.62s</generationTime>
+				<interactionPosition>7</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>624</generationTimeMilliseconds>
-				<generationTime>0.62s</generationTime>
-				<interactionPosition>7</interactionPosition>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1941,20 +2013,23 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>73</pageId>
+				<bandwidth />
+				<timeSpent>8</timeSpent>
+				<timeSpentPretty>8s</timeSpentPretty>
+				<generationTimeMilliseconds>543</generationTimeMilliseconds>
+				<generationTime>0.54s</generationTime>
+				<interactionPosition>4</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>543</generationTimeMilliseconds>
-				<generationTime>0.54s</generationTime>
-				<interactionPosition>4</interactionPosition>
-				<timeSpent>8</timeSpent>
-				<timeSpentPretty>8s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1962,18 +2037,21 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>77</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>343</generationTimeMilliseconds>
+				<generationTime>0.34s</generationTime>
+				<interactionPosition>8</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>343</generationTimeMilliseconds>
-				<generationTime>0.34s</generationTime>
-				<interactionPosition>8</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1983,13 +2061,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2025,6 +2108,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -2045,17 +2134,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2080,18 +2158,21 @@
 				<pageTitle />
 				<pageIdAction>65</pageIdAction>
 				
+				
 				<pageId>86</pageId>
+				<bandwidth>182</bandwidth>
+				<generationTimeMilliseconds>1</generationTimeMilliseconds>
+				<generationTime>0.001s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>1</generationTimeMilliseconds>
-				<generationTime>0.001s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>182 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2101,13 +2182,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2143,6 +2229,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>5.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -2163,17 +2255,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2187,18 +2268,21 @@
 				<pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle>
 				<pageIdAction>63</pageIdAction>
 				
+				
 				<pageId>84</pageId>
+				<bandwidth>355</bandwidth>
+				<timeSpent>240</timeSpent>
+				<timeSpentPretty>4 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>302</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>240</timeSpent>
-				<timeSpentPretty>4 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>355 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2217,16 +2301,19 @@
 				<pageTitle />
 				<pageIdAction>64</pageIdAction>
 				
+				
 				<pageId>85</pageId>
+				<bandwidth>5609</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>5.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2236,13 +2323,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2278,6 +2370,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -2298,17 +2396,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2333,7 +2420,14 @@
 				<pageTitle />
 				<pageIdAction>61</pageIdAction>
 				
+				
 				<pageId>94</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>359</generationTimeMilliseconds>
+				<generationTime>0.36s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2348,11 +2442,7 @@
 						<customVariablePageValue3>200</customVariablePageValue3>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>359</generationTimeMilliseconds>
-				<generationTime>0.36s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2362,13 +2452,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2404,6 +2499,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>37.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2428,17 +2529,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2452,20 +2542,23 @@
 				<pageTitle />
 				<pageIdAction>56</pageIdAction>
 				
+				
 				<pageId>80</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>109</generationTimeMilliseconds>
+				<generationTime>0.11s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>109</generationTimeMilliseconds>
-				<generationTime>0.11s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2484,18 +2577,21 @@
 				<pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle>
 				<pageIdAction>58</pageIdAction>
 				
+				
 				<pageId>81</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>301</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -2503,7 +2599,14 @@
 				<pageTitle />
 				<pageIdAction>56</pageIdAction>
 				
+				
 				<pageId>91</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>109</generationTimeMilliseconds>
+				<generationTime>0.11s</generationTime>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2518,11 +2621,7 @@
 						<customVariablePageValue3>200</customVariablePageValue3>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>109</generationTimeMilliseconds>
-				<generationTime>0.11s</generationTime>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2532,13 +2631,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>user1</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2574,6 +2678,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon>
 		<browserCode>CM</browserCode>
 		<browserVersion>39.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2598,17 +2708,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2633,18 +2732,21 @@
 				<pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle>
 				<pageIdAction>60</pageIdAction>
 				
+				
 				<pageId>82</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>359</generationTimeMilliseconds>
+				<generationTime>0.36s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>404</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>359</generationTimeMilliseconds>
-				<generationTime>0.36s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2654,13 +2756,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2696,6 +2803,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>37.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2716,17 +2829,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2740,7 +2842,16 @@
 				<pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle>
 				<pageIdAction>60</pageIdAction>
 				
+				
 				<pageId>93</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTimeMilliseconds>359</generationTimeMilliseconds>
+				<generationTime>0.36s</generationTime>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2755,13 +2866,7 @@
 						<customVariablePageValue3>404</customVariablePageValue3>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>359</generationTimeMilliseconds>
-				<generationTime>0.36s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -2780,18 +2885,21 @@
 				<pageTitle />
 				<pageIdAction>61</pageIdAction>
 				
+				
 				<pageId>83</pageId>
+				<bandwidth />
+				<generationTimeMilliseconds>359</generationTimeMilliseconds>
+				<generationTime>0.36s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>359</generationTimeMilliseconds>
-				<generationTime>0.36s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2801,13 +2909,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>user2</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2843,6 +2956,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>37.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2863,17 +2982,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -2898,7 +3006,12 @@
 				<pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle>
 				<pageIdAction>58</pageIdAction>
 				
+				
 				<pageId>92</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2913,9 +3026,7 @@
 						<customVariablePageValue3>301</customVariablePageValue3>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2925,13 +3036,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2967,6 +3083,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>41.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -2991,17 +3113,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3026,7 +3137,12 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>30</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -3041,9 +3157,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3053,13 +3167,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3095,6 +3214,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -3132,17 +3257,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3167,16 +3281,19 @@
 				<pageTitle>Piwik Forums</pageTitle>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>31</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3186,13 +3303,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>444</daysSinceFirstVisit>
@@ -3228,6 +3350,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>11.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -3281,17 +3409,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3316,18 +3433,21 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>89</pageId>
+				<bandwidth>915</bandwidth>
+				<generationTimeMilliseconds>1</generationTimeMilliseconds>
+				<generationTime>0.001s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>1</generationTimeMilliseconds>
-				<generationTime>0.001s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>915 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3337,13 +3457,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3379,6 +3504,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>39.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -3399,17 +3530,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3434,18 +3554,21 @@
 				<pageTitle />
 				<pageIdAction>71</pageIdAction>
 				
+				
 				<pageId>90</pageId>
+				<bandwidth>267</bandwidth>
+				<generationTimeMilliseconds>9</generationTimeMilliseconds>
+				<generationTime>0.009s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>9</generationTimeMilliseconds>
-				<generationTime>0.009s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>267 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3455,13 +3578,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3497,6 +3625,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>1.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -3517,17 +3651,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3540,19 +3663,22 @@
 				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
 				<pageIdAction>66</pageIdAction>
 				
+				
 				<pageId>88</pageId>
 				<eventCategory>cloudfront_rtmp</eventCategory>
 				<eventAction>play</eventAction>
+				<bandwidth>3914</bandwidth>
+				<eventName>myvideo</eventName>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<eventName>myvideo</eventName>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>3.8 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -3562,13 +3688,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3604,6 +3735,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -3624,17 +3761,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3647,18 +3773,21 @@
 				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
 				<pageIdAction>66</pageIdAction>
 				
+				
 				<pageId>87</pageId>
 				<eventCategory>cloudfront_rtmp</eventCategory>
 				<eventAction>connect</eventAction>
+				<bandwidth>2014</bandwidth>
+				<interactionPosition />
+				
+				<icon>plugins/Morpheus/images/event.png</icon>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
+				<bandwidth_pretty>2 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -3668,13 +3797,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3710,6 +3844,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -3730,17 +3870,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3765,16 +3894,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>28</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3784,13 +3916,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3826,6 +3963,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -3850,17 +3993,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3885,16 +4017,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>29</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3904,13 +4039,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -3946,6 +4086,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -3970,17 +4116,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -3994,18 +4129,21 @@
 				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</pageTitle>
 				<pageIdAction>25</pageIdAction>
 				
+				
 				<pageId>26</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>301</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -4024,16 +4162,19 @@
 				<pageTitle>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</pageTitle>
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>27</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>307</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4043,13 +4184,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4085,6 +4231,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -4109,17 +4261,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4133,18 +4274,21 @@
 				<pageTitle />
 				<pageIdAction>21</pageIdAction>
 				
+				
 				<pageId>23</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>61</timeSpent>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -4152,18 +4296,21 @@
 				<pageTitle />
 				<pageIdAction>22</pageIdAction>
 				
+				
 				<pageId>24</pageId>
+				<bandwidth>3574</bandwidth>
+				<timeSpent>61</timeSpent>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -4171,16 +4318,19 @@
 				<pageTitle />
 				<pageIdAction>23</pageIdAction>
 				
+				
 				<pageId>25</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -4190,13 +4340,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4232,6 +4387,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -4256,17 +4417,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4291,16 +4441,19 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>22</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4310,13 +4463,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4352,6 +4510,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -4376,17 +4540,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4411,16 +4564,19 @@
 				<pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle>
 				<pageIdAction>20</pageIdAction>
 				
+				
 				<pageId>21</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>500</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4430,13 +4586,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4472,6 +4633,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -4496,17 +4663,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4520,16 +4676,19 @@
 				<pageTitle />
 				<pageIdAction>16</pageIdAction>
 				
+				
 				<pageId>18</pageId>
+				<bandwidth>4324023</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>4.1 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -4539,13 +4698,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4581,6 +4745,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Oceania</continent>
 		<continentCode>oce</continentCode>
@@ -4605,17 +4775,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4640,16 +4799,19 @@
 				<pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F</pageTitle>
 				<pageIdAction>18</pageIdAction>
 				
+				
 				<pageId>20</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>404</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4659,13 +4821,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4701,6 +4868,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -4725,17 +4898,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4760,16 +4922,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>19</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4779,13 +4944,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4821,6 +4991,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -4845,17 +5021,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4880,16 +5045,19 @@
 				<pageTitle />
 				<pageIdAction>15</pageIdAction>
 				
+				
 				<pageId>17</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4899,13 +5067,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>commonuser</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -4941,6 +5114,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>20.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -4961,17 +5140,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -4996,16 +5164,19 @@
 				<pageTitle />
 				<pageIdAction>14</pageIdAction>
 				
+				
 				<pageId>16</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5015,13 +5186,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5057,6 +5233,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -5077,17 +5259,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5112,16 +5283,19 @@
 				<pageTitle />
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>15</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5131,13 +5305,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5173,6 +5352,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>20.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
@@ -5193,17 +5378,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5228,16 +5402,19 @@
 				<pageTitle />
 				<pageIdAction>12</pageIdAction>
 				
+				
 				<pageId>14</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5247,13 +5424,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5289,6 +5471,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
@@ -5309,17 +5497,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5344,16 +5521,19 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5363,13 +5543,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5405,6 +5590,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
@@ -5425,17 +5616,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5460,16 +5640,19 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>12</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5479,13 +5662,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5521,6 +5709,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -5541,17 +5735,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5576,16 +5759,19 @@
 				<pageTitle />
 				<pageIdAction>11</pageIdAction>
 				
+				
 				<pageId>11</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5595,13 +5781,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5637,6 +5828,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -5657,17 +5854,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5692,16 +5878,19 @@
 				<pageTitle />
 				<pageIdAction>10</pageIdAction>
 				
+				
 				<pageId>10</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5711,13 +5900,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5753,6 +5947,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -5773,17 +5973,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5808,16 +5997,19 @@
 				<pageTitle />
 				<pageIdAction>9</pageIdAction>
 				
+				
 				<pageId>9</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5827,13 +6019,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5869,6 +6066,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -5889,17 +6092,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -5924,16 +6116,19 @@
 				<pageTitle />
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>8</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -5943,13 +6138,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -5985,6 +6185,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -6005,17 +6211,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6040,16 +6235,19 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>7</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6059,13 +6257,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6101,6 +6304,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -6121,17 +6330,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6156,16 +6354,19 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>6</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6175,13 +6376,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6217,6 +6423,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -6237,17 +6449,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6272,16 +6473,19 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6291,13 +6495,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6333,6 +6542,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -6353,17 +6568,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6388,16 +6592,19 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6407,13 +6614,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6449,6 +6661,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -6469,17 +6687,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6504,16 +6711,19 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6523,13 +6733,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6565,6 +6780,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -6585,17 +6806,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6620,16 +6830,19 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6639,13 +6852,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6681,6 +6899,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -6701,17 +6925,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -6736,16 +6949,19 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth>3574</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>3.5 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -6755,13 +6971,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -6797,6 +7018,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -6817,16 +7044,5 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
-</result>
\ No newline at end of file
+</result>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml
index fe7f9ff263..5b2ac07565 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml
@@ -12,18 +12,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>69</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>292</generationTimeMilliseconds>
+				<generationTime>0.29s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>292</generationTimeMilliseconds>
-				<generationTime>0.29s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -33,13 +36,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>77</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -75,6 +83,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -116,17 +130,6 @@
 				<pluginName>pdf</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -140,18 +143,21 @@
 				<pageTitle>Changelog Archive - Analytics - Piwik</pageTitle>
 				<pageIdAction>44</pageIdAction>
 				
+				
 				<pageId>60</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>79</timeSpent>
+				<timeSpentPretty>1 min 19s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>79</timeSpent>
-				<timeSpentPretty>1 min 19s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -159,16 +165,19 @@
 				<pageTitle>Contact the Piwik team - Analytics - Piwik</pageTitle>
 				<pageIdAction>55</pageIdAction>
 				
+				
 				<pageId>68</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -178,13 +187,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>181</daysSinceFirstVisit>
@@ -220,6 +234,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -244,17 +264,6 @@
 		<resolution>1536x864</resolution>
 		<plugins />
 		<pluginsIcons />
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -268,18 +277,21 @@
 				<pageTitle>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</pageTitle>
 				<pageIdAction>53</pageIdAction>
 				
+				
 				<pageId>67</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>413</generationTimeMilliseconds>
+				<generationTime>0.41s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>413</generationTimeMilliseconds>
-				<generationTime>0.41s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -289,13 +301,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -331,6 +348,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>34.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -384,17 +407,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -408,18 +420,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>64</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>32</timeSpent>
+				<timeSpentPretty>32s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>32</timeSpent>
-				<timeSpentPretty>32s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -427,16 +442,19 @@
 				<pageTitle>What is Piwik? - Analytics - Piwik</pageTitle>
 				<pageIdAction>51</pageIdAction>
 				
+				
 				<pageId>66</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>501</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -446,13 +464,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>7</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>17</daysSinceFirstVisit>
@@ -467,7 +490,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=1&amp;ved=0CCcQFjAA&amp;url=http%3A%2F%2Fpiwik.org%2F&amp;ei=8vwgU8TYDZTI2wWTi4CQCA&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;bvm=bv.62922401,d.b2I</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -488,6 +511,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -533,17 +562,6 @@
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -557,16 +575,19 @@
 				<pageTitle />
 				<pageIdAction>49</pageIdAction>
 				
+				
 				<pageId>65</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/link.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/link.png</icon>
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -576,13 +597,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -618,6 +644,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -663,17 +695,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -687,18 +708,21 @@
 				<pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle>
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>63</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>391</generationTimeMilliseconds>
+				<generationTime>0.39s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>391</generationTimeMilliseconds>
-				<generationTime>0.39s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -708,13 +732,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -729,7 +758,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>https://www.google.com/</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -750,6 +779,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -803,17 +838,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -827,16 +851,19 @@
 				<pageTitle>Log Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>62</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>404</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -846,13 +873,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>4</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>3</daysSinceFirstVisit>
@@ -867,7 +899,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>2</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>https://www.google.co.jp/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=2&amp;ved=0CDAQFjAB&amp;url=https%3A%2F%2Fpiwik.org%2Flog-analytics%2F&amp;ei=rogdU5OuK43pkgXZmYGICA&amp;usg=AFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg&amp;bvm=bv.62578216,d.dGI</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -888,6 +920,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
@@ -929,17 +967,6 @@
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -953,18 +980,21 @@
 				<pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle>
 				<pageIdAction>46</pageIdAction>
 				
+				
 				<pageId>61</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>119</generationTimeMilliseconds>
+				<generationTime>0.12s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>119</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -974,13 +1004,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1013,9 +1048,15 @@
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox Mobile 27.0</browser>
 		<browserName>Firefox Mobile</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+		<browserIcon>plugins/Morpheus/icons/dist/browsers/FM.png</browserIcon>
 		<browserCode>FM</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1049,17 +1090,6 @@
 				<pluginName>flash</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1073,18 +1103,21 @@
 				<pageTitle>Log Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>59</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>145</generationTimeMilliseconds>
+				<generationTime>0.15s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>145</generationTimeMilliseconds>
-				<generationTime>0.15s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1094,13 +1127,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>1</daysSinceFirstVisit>
@@ -1136,6 +1174,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1189,17 +1233,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1213,20 +1246,23 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>55</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>2</timeSpent>
+				<timeSpentPretty>2s</timeSpentPretty>
+				<generationTimeMilliseconds>182</generationTimeMilliseconds>
+				<generationTime>0.18s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>403</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>182</generationTimeMilliseconds>
-				<generationTime>0.18s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>2</timeSpent>
-				<timeSpentPretty>2s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1234,20 +1270,23 @@
 				<pageTitle>Download - Analytics - Piwik</pageTitle>
 				<pageIdAction>39</pageIdAction>
 				
+				
 				<pageId>57</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTimeMilliseconds>113</generationTimeMilliseconds>
+				<generationTime>0.11s</generationTime>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>500</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>113</generationTimeMilliseconds>
-				<generationTime>0.11s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -1255,16 +1294,19 @@
 				<pageTitle />
 				<pageIdAction>40</pageIdAction>
 				
+				
 				<pageId>58</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition />
+				<icon>plugins/Morpheus/images/download.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1274,13 +1316,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1295,7 +1342,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Keyword not defined</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>http://www.google.ru/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=1&amp;ved=0CCoQFjAA&amp;url=http%3A%2F%2Fpiwik.org%2F&amp;ei=ffwgU57VGuf44QT3-oCQCw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;bvm=bv.62922401,d.bGE&amp;cad=rjt</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode />
@@ -1316,6 +1363,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1353,17 +1406,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1377,18 +1419,21 @@
 				<pageTitle>Hello Installing Piwik - Analytics - Piwik</pageTitle>
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>56</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>134</generationTimeMilliseconds>
+				<generationTime>0.13s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>134</generationTimeMilliseconds>
-				<generationTime>0.13s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1398,13 +1443,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>30</daysSinceFirstVisit>
@@ -1440,6 +1490,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1485,17 +1541,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1509,18 +1554,21 @@
 				<pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle>
 				<pageIdAction>35</pageIdAction>
 				
+				
 				<pageId>54</pageId>
+				<bandwidth>43</bandwidth>
+				<generationTimeMilliseconds>58</generationTimeMilliseconds>
+				<generationTime>0.06s</generationTime>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTimeMilliseconds>58</generationTimeMilliseconds>
-				<generationTime>0.06s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1530,13 +1578,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1572,6 +1625,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1617,17 +1676,6 @@
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1641,7 +1689,12 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>50</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -1656,9 +1709,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1668,13 +1719,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -1710,6 +1766,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -1747,17 +1809,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1771,16 +1822,19 @@
 				<pageTitle>Piwik Forums</pageTitle>
 				<pageIdAction>31</pageIdAction>
 				
+				
 				<pageId>51</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1790,13 +1844,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>444</daysSinceFirstVisit>
@@ -1832,6 +1891,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>11.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -1885,17 +1950,6 @@
 				<pluginName>windowsmedia</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>3</idSite>
@@ -1909,18 +1963,21 @@
 				<pageTitle>Looking at Electronics &amp; Cameras page with a page level custom variable</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>33</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName5>_pkc</customVariablePageName5>
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1928,7 +1985,14 @@
 				<pageTitle>Another Product page with no category</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>52</pageId>
+				<bandwidth>43</bandwidth>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -1939,11 +2003,7 @@
 						<customVariablePageValue4>PRODUCT name</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -1951,16 +2011,19 @@
 				<pageTitle>Looking at Electronics &amp; Cameras page with a page level custom variable</pageTitle>
 				<pageIdAction>29</pageIdAction>
 				
+				
 				<pageId>53</pageId>
+				<bandwidth>43</bandwidth>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName5>_pkc</customVariablePageName5>
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>43 B</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1970,13 +2033,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -2012,6 +2080,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>5.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -2049,16 +2123,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
-</result>
\ No newline at end of file
+</result>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
index 8646118514..3b4cd8befe 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
@@ -12,12 +12,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>46</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -35,19 +38,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -66,12 +72,15 @@
 				<pageTitle />
 				<pageIdAction>47</pageIdAction>
 				
+				
 				<pageId>48</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -79,26 +88,32 @@
 				<pageTitle />
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>49</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
 				<eventAction>Action8</eventAction>
+				<bandwidth />
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -108,13 +123,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -150,6 +170,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -191,17 +217,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -226,7 +241,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -237,9 +257,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -249,13 +267,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -291,6 +314,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -332,17 +361,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -356,12 +374,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>41</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -391,12 +412,15 @@
 				<pageTitle />
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -404,26 +428,32 @@
 				<pageTitle />
 				<pageIdAction>43</pageIdAction>
 				
+				
 				<pageId>43</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
 				<eventAction>Action7</eventAction>
+				<bandwidth />
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -433,13 +463,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -475,6 +510,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -516,16 +557,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
index 3fb5f85cee..92114fca3c 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
@@ -23,7 +23,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -34,9 +39,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -46,13 +49,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -88,6 +96,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -129,17 +143,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -153,12 +156,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>35</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -176,19 +182,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>36</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -207,12 +216,15 @@
 				<pageTitle />
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>37</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -220,26 +232,32 @@
 				<pageTitle />
 				<pageIdAction>38</pageIdAction>
 				
+				
 				<pageId>38</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
 				<eventAction>Action6</eventAction>
+				<bandwidth />
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -249,13 +267,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -291,6 +314,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -332,17 +361,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -367,7 +385,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -378,9 +401,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -390,13 +411,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -432,6 +458,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -473,16 +505,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index a84538ee57..706b759468 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -23,10 +23,13 @@
 				<pageTitle>It's pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>95</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -36,13 +39,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -78,6 +86,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -111,17 +125,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -135,12 +138,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>46</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,19 +164,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -189,12 +198,15 @@
 				<pageTitle />
 				<pageIdAction>47</pageIdAction>
 				
+				
 				<pageId>48</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -202,26 +214,32 @@
 				<pageTitle />
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>49</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
 				<eventAction>Action8</eventAction>
+				<bandwidth />
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -231,13 +249,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -273,6 +296,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -314,17 +343,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -349,7 +367,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -360,9 +383,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -372,13 +393,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -414,6 +440,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -455,17 +487,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -479,12 +500,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>41</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -514,12 +538,15 @@
 				<pageTitle />
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -527,26 +554,32 @@
 				<pageTitle />
 				<pageIdAction>43</pageIdAction>
 				
+				
 				<pageId>43</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
 				<eventAction>Action7</eventAction>
+				<bandwidth />
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -556,13 +589,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -598,6 +636,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -639,17 +683,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -674,7 +707,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -685,9 +723,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -697,13 +733,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -739,6 +780,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -780,17 +827,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -804,12 +840,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>35</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -827,19 +866,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>36</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -858,12 +900,15 @@
 				<pageTitle />
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>37</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -871,26 +916,32 @@
 				<pageTitle />
 				<pageIdAction>38</pageIdAction>
 				
+				
 				<pageId>38</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
 				<eventAction>Action6</eventAction>
+				<bandwidth />
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -900,13 +951,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -942,6 +998,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -983,17 +1045,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1018,7 +1069,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1029,9 +1085,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1041,13 +1095,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1083,6 +1142,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1124,16 +1189,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index a84538ee57..706b759468 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -23,10 +23,13 @@
 				<pageTitle>It's pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>95</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -36,13 +39,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -78,6 +86,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -111,17 +125,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -135,12 +138,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>46</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,19 +164,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -189,12 +198,15 @@
 				<pageTitle />
 				<pageIdAction>47</pageIdAction>
 				
+				
 				<pageId>48</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -202,26 +214,32 @@
 				<pageTitle />
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>49</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
 				<eventAction>Action8</eventAction>
+				<bandwidth />
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -231,13 +249,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -273,6 +296,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -314,17 +343,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -349,7 +367,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -360,9 +383,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -372,13 +393,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -414,6 +440,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -455,17 +487,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -479,12 +500,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>41</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -514,12 +538,15 @@
 				<pageTitle />
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -527,26 +554,32 @@
 				<pageTitle />
 				<pageIdAction>43</pageIdAction>
 				
+				
 				<pageId>43</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
 				<eventAction>Action7</eventAction>
+				<bandwidth />
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -556,13 +589,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -598,6 +636,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -639,17 +683,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -674,7 +707,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -685,9 +723,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -697,13 +733,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -739,6 +780,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -780,17 +827,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -804,12 +840,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>35</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -827,19 +866,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>36</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -858,12 +900,15 @@
 				<pageTitle />
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>37</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -871,26 +916,32 @@
 				<pageTitle />
 				<pageIdAction>38</pageIdAction>
 				
+				
 				<pageId>38</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
 				<eventAction>Action6</eventAction>
+				<bandwidth />
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -900,13 +951,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -942,6 +998,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -983,17 +1045,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1018,7 +1069,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1029,9 +1085,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1041,13 +1095,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1083,6 +1142,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1124,16 +1189,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 1e8b2f580a..03a2f431a7 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -23,10 +23,13 @@
 				<pageTitle>It's pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>95</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -36,13 +39,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -78,6 +86,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
@@ -111,17 +125,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -135,12 +138,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>46</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,19 +164,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>47</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -189,12 +198,15 @@
 				<pageTitle />
 				<pageIdAction>47</pageIdAction>
 				
+				
 				<pageId>48</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -202,26 +214,32 @@
 				<pageTitle />
 				<pageIdAction>48</pageIdAction>
 				
+				
 				<pageId>49</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
 				<eventAction>Action8</eventAction>
+				<bandwidth />
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -231,13 +249,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -273,6 +296,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -314,17 +343,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -349,7 +367,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>45</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -360,9 +383,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -372,13 +393,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -414,6 +440,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -455,17 +487,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -479,12 +500,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>41</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -514,12 +538,15 @@
 				<pageTitle />
 				<pageIdAction>42</pageIdAction>
 				
+				
 				<pageId>42</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -527,26 +554,32 @@
 				<pageTitle />
 				<pageIdAction>43</pageIdAction>
 				
+				
 				<pageId>43</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
 				<eventAction>Action7</eventAction>
+				<bandwidth />
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -556,13 +589,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -598,6 +636,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -639,17 +683,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -674,7 +707,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>40</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -685,9 +723,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -697,13 +733,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -739,6 +780,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -780,17 +827,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -804,12 +840,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>35</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -827,19 +866,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>36</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -858,12 +900,15 @@
 				<pageTitle />
 				<pageIdAction>37</pageIdAction>
 				
+				
 				<pageId>37</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -871,26 +916,32 @@
 				<pageTitle />
 				<pageIdAction>38</pageIdAction>
 				
+				
 				<pageId>38</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
 				<eventAction>Action6</eventAction>
+				<bandwidth />
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -900,13 +951,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -942,6 +998,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -983,17 +1045,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1018,7 +1069,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>34</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1029,9 +1085,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1041,13 +1095,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1083,6 +1142,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1124,17 +1189,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1148,12 +1202,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>30</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1183,12 +1240,15 @@
 				<pageTitle />
 				<pageIdAction>32</pageIdAction>
 				
+				
 				<pageId>31</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -1196,26 +1256,32 @@
 				<pageTitle />
 				<pageIdAction>33</pageIdAction>
 				
+				
 				<pageId>32</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>33</pageId>
 				<eventCategory>Cat5</eventCategory>
 				<eventAction>Action5</eventAction>
+				<bandwidth />
 				<eventName>Name5</eventName>
 				<eventValue>350.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1225,13 +1291,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -1267,6 +1338,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1308,17 +1385,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1343,7 +1409,12 @@
 				<pageTitle>It's &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>29</pageId>
+				<bandwidth />
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1354,9 +1425,7 @@
 						<customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1366,13 +1435,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
@@ -1408,6 +1482,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1449,17 +1529,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -1473,12 +1542,15 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>24</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1496,19 +1568,22 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>25</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
+				<interactionPosition>2</interactionPosition>
+				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
 						<customVariablePageValue4>CAT</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<siteSearchKeyword>Bring on the party</siteSearchKeyword>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/search_ico.png</icon>
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -1527,12 +1602,15 @@
 				<pageTitle />
 				<pageIdAction>27</pageIdAction>
 				
+				
 				<pageId>26</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -1540,26 +1618,32 @@
 				<pageTitle />
 				<pageIdAction>28</pageIdAction>
 				
+				
 				<pageId>27</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>28</pageId>
 				<eventCategory>Cat4</eventCategory>
 				<eventAction>Action4</eventAction>
+				<bandwidth />
 				<eventName>Name4</eventName>
 				<eventValue>349.678</eventValue>
 				<interactionPosition />
-				<icon>plugins/Morpheus/images/event.png</icon>
 				
+				<icon>plugins/Morpheus/images/event.png</icon>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1569,13 +1653,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>5</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
@@ -1611,6 +1700,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>1</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -1652,16 +1747,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 62126192b7..6526eaedea 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -23,12 +23,15 @@
 				<pageTitle>Checkout/Purchasing...</pageTitle>
 				<pageIdAction>13</pageIdAction>
 				
+				
 				<pageId>9</pageId>
+				<bandwidth />
 				<generationTimeMilliseconds>134</generationTimeMilliseconds>
 				<generationTime>0.13s</generationTime>
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -38,13 +41,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -80,6 +88,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -113,17 +127,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -137,14 +140,17 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>234</generationTimeMilliseconds>
 				<generationTime>0.23s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -152,14 +158,17 @@
 				<pageTitle>Second page view - should be registered as URL</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<generationTimeMilliseconds>224</generationTimeMilliseconds>
 				<generationTime>0.22s</generationTime>
 				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -167,12 +176,15 @@
 				<pageTitle />
 				<pageIdAction>5</pageIdAction>
 				
+				
 				<pageId>3</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>download</type>
@@ -180,12 +192,15 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>4</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>72</timeSpent>
 				<timeSpentPretty>1 min 12s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/download.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -193,12 +208,15 @@
 				<pageTitle />
 				<pageIdAction>7</pageIdAction>
 				
+				
 				<pageId>5</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>108</timeSpent>
 				<timeSpentPretty>1 min 48s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>outlink</type>
@@ -206,12 +224,15 @@
 				<pageTitle />
 				<pageIdAction>8</pageIdAction>
 				
+				
 				<pageId>6</pageId>
-				<interactionPosition />
+				<bandwidth />
 				<timeSpent>72</timeSpent>
 				<timeSpentPretty>1 min 12s</timeSpentPretty>
+				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -229,15 +250,18 @@
 				<url />
 				<pageIdAction />
 				
+				
 				<pageId>7</pageId>
+				<bandwidth />
+				<timeSpent>108</timeSpent>
+				<timeSpentPretty>1 min 48s</timeSpentPretty>
 				<siteSearchKeyword>Banks Own The World</siteSearchKeyword>
 				<generationTimeMilliseconds>812</generationTimeMilliseconds>
 				<generationTime>0.81s</generationTime>
 				<interactionPosition>3</interactionPosition>
-				<timeSpent>108</timeSpent>
-				<timeSpentPretty>1 min 48s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -245,12 +269,15 @@
 				<pageTitle>Looking at homepage after site search...</pageTitle>
 				<pageIdAction>11</pageIdAction>
 				
+				
 				<pageId>8</pageId>
+				<bandwidth />
 				<generationTimeMilliseconds>24</generationTimeMilliseconds>
 				<generationTime>0.02s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -260,13 +287,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -302,6 +334,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -335,16 +373,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index c7c3f8aec1..034e8433d4 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -12,10 +12,13 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -46,7 +54,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>&lt;&gt;&amp;\&quot;the pdo extension is required for this adapter but the extension is not loaded</referrerKeyword>
 		<referrerKeywordPosition>4</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl>
+		<referrerUrl>http://www.google.com.vn/url?sa=t&amp;rct=j&amp;q=%3C%3E%26%5C%22the%20pdo%20extension%20is%20required%20for%20this%20adapter%20but%20the%20extension%20is%20not%20loaded&amp;source=web&amp;cd=4&amp;ved=0FjAD&amp;url=http%3A%2F%2Fforum.piwik.org%2Fread.php%3F2%2C1011&amp;ei=y-HHAQ&amp;usg=AFQjCN2-nt5_GgDeg&amp;cad=rja</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -100,17 +114,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -124,12 +127,15 @@
 				<pageTitle>incredible title! (Page URL contains a HTML entity)</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>1084</timeSpent>
 				<timeSpentPretty>18 min 4s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -150,13 +156,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -171,7 +182,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>Mot-clé indéfini</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=1&amp;ved=0CC&amp;url=http%3A%2F%2Fpiwik.org%2F&amp;ei=&amp;usg=</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -192,6 +203,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -225,16 +242,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 342351f2fa..e3726996c0 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -10,17 +10,20 @@
 				<url>http://piwik.net/</url>
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
+				
 				<serverTimePretty>Apr 7, 2013 10:00:00</serverTimePretty>
 				<pageId>1</pageId>
+				<bandwidth>9625</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				<timestamp>1365328800</timestamp>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				<timestamp>1365328800</timestamp>
+				<bandwidth_pretty>9.4 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -30,13 +33,18 @@
 		<visitServerHour>10</visitServerHour>
 		<lastActionTimestamp>1365328800</lastActionTimestamp>
 		<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
+		<serverTimestamp>1365328800</serverTimestamp>
+		<firstActionTimestamp>1365328800</firstActionTimestamp>
+		<serverTimePretty>10:00:00</serverTimePretty>
+		<serverDatePretty>Sunday, April 7, 2013</serverDatePretty>
+		<serverDatePrettyFirstAction>Sunday, April 7, 2013</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		<firstActionTimestamp>1365328800</firstActionTimestamp>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -72,6 +80,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -92,17 +106,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		<serverTimestamp>1365328800</serverTimestamp>
-		<serverTimePretty>10:00:00</serverTimePretty>
-		<serverDatePretty>Sunday, April 7, 2013</serverDatePretty>
-		<serverDatePrettyFirstAction>Sunday, April 7, 2013</serverDatePrettyFirstAction>
-		<serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -114,17 +117,20 @@
 				<url>http://piwik.net/</url>
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
+				
 				<serverTimePretty>Apr 6, 2013 11:00:00</serverTimePretty>
 				<pageId>2</pageId>
+				<bandwidth>9625</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				<timestamp>1365246000</timestamp>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				<timestamp>1365246000</timestamp>
+				<bandwidth_pretty>9.4 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -134,13 +140,18 @@
 		<visitServerHour>11</visitServerHour>
 		<lastActionTimestamp>1365246000</lastActionTimestamp>
 		<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
+		<serverTimestamp>1365246000</serverTimestamp>
+		<firstActionTimestamp>1365246000</firstActionTimestamp>
+		<serverTimePretty>11:00:00</serverTimePretty>
+		<serverDatePretty>Saturday, April 6, 2013</serverDatePretty>
+		<serverDatePrettyFirstAction>Saturday, April 6, 2013</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		<firstActionTimestamp>1365246000</firstActionTimestamp>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -176,6 +187,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -196,17 +213,6 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		<serverTimestamp>1365246000</serverTimestamp>
-		<serverTimePretty>11:00:00</serverTimePretty>
-		<serverDatePretty>Saturday, April 6, 2013</serverDatePretty>
-		<serverDatePrettyFirstAction>Saturday, April 6, 2013</serverDatePrettyFirstAction>
-		<serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -218,17 +224,20 @@
 				<url>http://piwik.net/</url>
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
+				
 				<serverTimePretty>Apr 5, 2013 12:00:00</serverTimePretty>
 				<pageId>3</pageId>
+				<bandwidth>9625</bandwidth>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				<timestamp>1365163200</timestamp>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				<timestamp>1365163200</timestamp>
+				<bandwidth_pretty>9.4 K</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -238,13 +247,18 @@
 		<visitServerHour>12</visitServerHour>
 		<lastActionTimestamp>1365163200</lastActionTimestamp>
 		<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
+		<serverTimestamp>1365163200</serverTimestamp>
+		<firstActionTimestamp>1365163200</firstActionTimestamp>
+		<serverTimePretty>12:00:00</serverTimePretty>
+		<serverDatePretty>Friday, April 5, 2013</serverDatePretty>
+		<serverDatePrettyFirstAction>Friday, April 5, 2013</serverDatePrettyFirstAction>
+		<serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		<firstActionTimestamp>1365163200</firstActionTimestamp>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -280,6 +294,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
@@ -300,16 +320,5 @@
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		<serverTimestamp>1365163200</serverTimestamp>
-		<serverTimePretty>12:00:00</serverTimePretty>
-		<serverDatePretty>Friday, April 5, 2013</serverDatePretty>
-		<serverDatePrettyFirstAction>Friday, April 5, 2013</serverDatePrettyFirstAction>
-		<serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 5d73c1dc59..229a294738 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -12,10 +12,13 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -100,16 +114,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index e057bf8431..d344df1d0e 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -982,7 +982,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAOPUlEQVR4nO3dW2xc9Z3A8f+Zm50Z45AACY6BhAygCBRoS0ULFb0gbS8r1BaqbdWbdhGi1T60DyvtrrTqG6XaFVWrah/6UG27D1UXKlHa1XYrVKItoaVRF1eBLksd5KQlxOBcbGzi8WUuZx+sdUeO4/zj2D4e+/N5iMYzZ8a/kcDnO+c2SZqmAQDgQnJZDwAAdAbRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0Xp1qtnu/ORR9a4lkA0FlEw4oZGhq64EPqAYDOJRouztDQ0IIVf7VaXSIXAGDDKGQ9wHr0tX95fsE9//DgOy/4rPl6aK+K+Xvma2P+0QX9oTwAWOdEwyJeOT5Rr9fnfywWiydOnOjv74957oIND+0/zlVC+66K8y0JAOuQ3ROLq7UJIQwPD88/1L6F4IJr+vgOUAwArHOiYYXNJUXMAY/xSwLAemD3xMprP7IhZjtEzJIAkDnRsLhyubzEo/N7KC54mmXMkQrxSwJAhkTDIu67pzp84sTynhu/7lcJAHQW0bCIj753dwi7l/fcpU+kbH/UKZcAdJYkTdOsZwAAOoCzJwCAKKIBAIgiGgCAKKIBAIiy6c6ecMICrDdOP4bMRa4cN1c0+I4oWG9cSR0yF79ytHsCyIxwh84iGoBsKAboOJtr9wSwTigGWD/ir1AsGoBstP+R0hCQofhjGkQDkAGHJEMnckwDABBlc21p8MWSALBA/MrRt1wCAFHsngAAoogGACCKaAAAoogGACCKaAAAoogGACDKJo2GgYGBrEcAQghheHh4eHg46ymAECJWjps0GgCAiyUaAIAoogEAiCIaAIAom+sLq9oNHX8z6xGAcOrUZAhhqun/R8je62dml15g80bD337jv7IeAQDWl3s/uNSjdk8AAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFGW+S2X1Wp1aGhoZUcBANaDarU6f7t9dZ9bdInz3QMAbGxz2wXmtceA3RMAQJQLR8NcYlT/3xILLLpYtU378ue7fcFfBwBkIuqYhvYjGBYczXC+h+ZuL7Hw8n4dALCqFuySWPyYhqWfv+j9C9bokWv3+Wnmw2LBS6kEAMjKqhzTYBsAAGwqy4+GBfUBAGxsfzqmYcEhCDEbEs49aiFS+xOX/SIAwIpb4piGwvmWu6gDFM638BK/GABYn863vk7SNF3jUdaDgYGBR77/atZTAMD68qNv3rfEoy7uBABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQJRC1gNkZulv/wTWxvDwcAhh165dWQ8ChIGBgaUXsKUBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKKIBAIgiGgCAKJv3MtJ//dWnsh6BS/Xtr3wo6xEANpHNGw0jZ2pZjwAAncTuCQAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKJshMtIn62Hg69OHh6ZPTnZaoXQW0puvqJ4957ytT35rEcDgI2jg6MhrU+F5vSvRkrfOfDa7xv5LVsrfVuSQi4Zfqtx6A9jg4ONT91z/d7Gye6rrsl6UgDYCDKLhmq1GkIYGhpa9iuMPffk88+9+Mj43Wdz+Yf2PzFSuOkXtU/nk3R8th7GJ3/5eu2K8Me7+oo3nRzqveV9Kzc4AGxSy4+GubX+vKGhoWq1GhkB8Usu4fgzh/tfefLxqx9PdqT1tLjv2MOX99QqyUxrtt41MVkfGUv2Xnfrzc8f+92Z3vRtIdl6ib+Odav9P8VL/+8KgPO5pC0NC/5Ar+Xf67TV2J4frFXyE61CfjppHZ/9yW8/NHrlVV/Z+bVyYzp/tlZoNr/9xIsPfri/esvLrZmnct2fXLPZWEsLAnRFehSARa3k2RNzH/ja/527MW/BYu03zl3g3Nvtpo4cmjwymDZD2gzpTChcltv69jv/vf9vLjs9Whg+VT9+YuqN4eZbbx789c+SfF/r7KEVfJusKxIBYM2syjEN85/2Fv0U2L4jY+kFlvjUWHvlcGM65HIhVw/pdJgeLXzrjStfOH0qCaFZG29OTzcnR++8/cY919yQNrt+84ODd315Nd4oAGwilxQN59uXvAYf/mbGp+qzoVQIrUJ6/Nnm13MfPFIsF/MjjVYuX59Ip8bSmdrY0cHqjteS0h2HT/fetdoDsQ7YNwGwqlbymIZFnW//wgVfeekVQO7ynTMzIZ8PoRV27s49euUz3zi6v1gOH3nniQOv9v30QFf97Pj+O6YaZyq5rT+8/x0fWMYMdJBLPxkHgAta9VMul/d3/IK7J7be9p6p6Vw+1+rOhVwxNMcaD1/z23qt9ePHegYLPUk9TL1Ve+jjR6ZrzamXL6/suPfS3gTrmg0MAGtjTS8jvbytDova0n991+6bJyeT2anQqodCLv3uC71//tR1j7zR99Ifm/np05+/c6xS637z2crL/9k9lVy7Ur+X9UYxAKyZ1d3SMLe1oP3HmAXmVwNLbGxIcrkbv/DlQ1/6YghJT5p2tcJnbpr4cLV28I3yllLznurMzt3N088lrelk8PVd77/t9lV5e6wP514yJKtJADa2JE3TrGdYvv/9p388+tj3unuSSiV0d4VCKSTFkCuEXHdIm6E5Hbq7du76u38u77t1wRMHBgYe+f6rmczMCvrRN+/LegQu1fDwcAhh165dWQ8ChIGBgdtvX+pjdgd/90S9Xu/97OdKI6dnf/6z+kyzuxy6ukKhEPL5kCRhZLI4m992w1cfTXbfmPWkALARdHA0FIvFbdu29T/4wEt7r0+efnrm+LHyxGyumMuVCukV2+u37e//2H1X762WSqWsJwWAjaCDoyGEUKlU9u3bt2fPnolP3D86OlqbmEharWJPz/bt23t7e8vlcrFYzHpGANggOjsaQgj5fL5SqVQqlb6+vqxnAYCNbE1PuQQAOpdoAACiiAYAIIpoAACiiAYAIIpoAACiiAYAIIpoAACiiAYAIIpoAACidPxlpJfNtyoDwEWxpQEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAoogEAiCIaAIAom/cy0t//j5eyHmF1fe7eW7IeAYANZfNGw48OHMl6hNUlGgBYWXZPAABRRAMAEEU0AABRRAMAEEU0AABRRAMAEEU0AABRRAMAEEU0AABRRAMAEGUjXEb6bD0cfHXy8MjsyclWK4TeUnLzFcW795Sv7clnPRoAbBwdHA1pfSo0p381UvrOgdd+38hv2Vrp25IUcsnwW41DfxgbHGx86p7r9zZOdl91TdaTAsBGsGLRUK1W528PDQ2t1MsuYey5J59/7sVHxu8+m8s/tP+JkcJNv6h9Op+k47P1MD75y9drV4Q/3tVXvOnkUO8t71uDeQBgY1uZaKhWq+2hsODHVXL8mcP9rzz5+NWPJzvSelrcd+zhy3tqlWSmNVvvmpisj4wle6+79ebnj/3uTG/6tpBsXe151qe5mFubjANgY1uBAyHPTYShoaG5ddX8v3Pan7LgzvblF33KAmmrsT0/WKjkJ1rdZ6fLU8fTn/z3h775uy+EkbfKp94sjY6Xms1vP/FiI9dfveVka+apS3+bnWht6g2ATWLVj2loX2/N3T7fZon2+xc85dyXnTpyaPLIYCiF0AzpTCjszG19+53/2vroZW+MprXJ2fE3681Gc7p58NfP/9m7r2udPZTr/uTqvs91STEAsIJW/ZTL+PXWRa3haq8cbkyHViOk9ZBOh+nRwrdeu/KFF0/VT47MnDzRGD8zM3Ls3Td07bnmhrR52W9+cHBZswMAf5LN2RNL7HeIXGBmfKo+G0qF0Cqkx59tfj33wSPFcjE/0mjl8vWJdGosnamNHR2s7ngtKd1x+HTvXSs3PABsTtlEw9IbFRbs0Vh0mdzlO2dmQj4fQivs3J179MpnvnF0f7EcPvLOEwde7fvpga762fH9d0w1zlRyW394/zs+sPLvAQA2mRWIhiUOU4ixvIP1tt72nqnpXD7X6s6FXDE0xxoPX/Pbeq3148d6Bgs9ST1MvVV76ONHpmvNqZcvr+y492JfHwBYYGW2NMyfLjH/4/ztc+9fYuFFX21RW/qv79p98+QfXsolaSmEQnf63Rd6/+1o76l8V6nZrBRPf/7O8Uqt+81nw9H/Kd7ywLWb9IRLAFg5K7Z74nxbCxa9f9FQiHm1eUkud+MXvnzoS18MIelJ065W+MxNEx+u1g6+Ud5Sat5Tndm5u3n6uaQ1nQy+vuv9t91+MW9l41hwRquTKQC4FB18Gemr7nxv9S/+8uhj32s0kkojNOqhXGp8ZOdErhBys+Hk70NzOnR37firrz+ar/RmPWw2VAIAK2h1o2FVV1r1er33s58rjZye/fnP6jPN7nLo6gqFQsjnQ5KEkcnibH7bDV99NNl94+rNAACbRwdvaSgWi9u2bet/8IGX9l6fPP30zPFj5YnZXDGXKxXSK7bXb9vf/7H7rt5bLZVKWU8KABtBB0dDCKFSqezbt2/Pnj0Tn7h/dHS0NjGRtFrFnp7t27f39vaWy+VisZj1jACwQXR2NIQQ8vl8pVKpVCp9fX1ZzwIAG9mqX0YaANgYRAMAEEU0AABRRAMAEEU0AABRRAMAEEU0AABRRAMAEEU0AABRRAMAEEU0AABROv67J5bt7x94V9YjAEAn2bzR8K5bd2U9AgB0ErsnAIAoogEAiCIaAIAoogEAiJKkaZr1DABAB7ClAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgCj/BySJPgn3n6WqAAAAAElFTkSuQmCC"
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAOK0lEQVR4nO3dXWxcV4HA8TNf/q4TtXbiNE3adKBqKWlFWwJRRaFUm7arqgIeUEFbEEJdsUJspZVWK61461IhFYF44gEt2gfEp9oCWqh4iBaalka0qZosVRojN5Q0EztO48SJxx/zcffBWjNy7MmJY/t67N/vwRrPnBmfkRLfv+89904mSZIAAHA52bQnAAC0BtEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDVemWCwudueCDzV5FgC0FtGwbIaGhi77kHoAoHWJhiszNDQ0b8NfLBab5AIArBv5tCewFj39n6/Nu+ffv3zPZZ81Vw+NVTF3z1xtzD06rz+UBwBrnGhYwJ9PjFcqlblvC4XCyZMnt2/fHvPceTseGr+drYTGQxWLjQSANcjhiYWVG4QQSqXS3EONewguu6WP7wDFAMAaJxqW2WxSxCx4jB8JAGuBwxPLr3FlQ8x+iJiRAJA60bCwrq6uJo/OHaG47GmWMSsV4kcCQIpEwwI+/cli6eTJpT03ftuvEgBoLaJhAY/ed2MINy7tuc1PpGx81CmXALSWTJIkac8BAGgBzp4AAKKIBgAgimgAAKKIBgAgyoY7e8IJC7DWOP0YUhe5cdxY0eAzomCtcSV1SF38xtHhCSA1wh1ai2gA0qEYoOVsrMMTwBqhGGDtiL9CsWgA0tH4S0pDQIri1zSIBiAFliRDK7KmAQCIsrH2NPhgSQCYJ37j6FMuAYAoDk8AAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQZYNGw6FDh9KeAhBCCKVSqVQqpT0LIISIjeMGjQYA4EqJBgAgimgAAKKIBgAgysb6wKpGQyfOpT0FIIyOToQQJmv+P0L6Tr0303zAxo2Gf/32/6Q9BQBYWx7Z1+xRhycAgCiiAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgCiiAQCIIhoAgChL/JTLYrE4NDS0vFMBANaCYrE4d7txc59dcMRi9wAA69vsfoE5jTHg8AQAEOXy0TCbGMX/12TAgsOKDRrHL3b7sj8OAEhF1JqGxhUM81YzLPbQ7O0mg5f24wCAFTXvkMTCaxqaP3/B++dt0SO37nOzmQuLeS+lEgAgLSuypsE+AADYUJYeDfPqAwBY3/62pmHeEoSYHQmXrlqI1PjEJb8IALDsmqxpyC827ooWKCw2uMkPBgDWpsW215kkSVZ5KmvBoUOHvvHDv6Y9CwBYW577zqebPOriTgBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAETJpz2B1DT/9E9gdZRKpRDC9ddfn/ZEgHDo0KHmA+xpAACiiAYAIIpoAACiiAYAIIpoAACiiAYAIIpoAACiiAYAIIpoAACiiAYAIMrGvYz0P/3Hb9OeAlfre19/MO0pAGwgGzcaRt4rpz0FAGglDk8AAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQRTQAAFFEAwAQZT1cRvpiNRx4Z+L14ZnRcr0eQm9b5rZr8/ft6t7Rk0t7agCwfrRwNCSVyVAtv3y64/v7332rmuvc1L2tM5PPZkoXqgf/MjU4eOqz9+8q1kY6+nekPVMAWA9Si4ZisRhCGBoaWvIrjL383KsvH376wscvZnNP7H52JH/L78qfy2WS8zOVcH7ipVPl68I7k9sKt5w+3nv7fcs3cQDYoJYeDbNb/TlDQ0PFYjEyAuJHNnHiwOEbBp//6cDPM1uSSlK49fhTm3vK3Znp+kylfXyiMjKWuXnnHR947fiRM73JnSGz6Sp/HGtW4z/Fq/93BcBirmpPw7xf0Kv5+zqpV6/NHit358br+dxUpn5i5pevP3i2r//rW5/uqk7lLpbztdr3nj3y5Ye2Fz94tD79QrbjsVWbG6tpXoAuS48CsKDlPHti9g++xq+zN+bMG9Z449IBl95uNHnslYnBY0ktJLWQTIf8NdlNH9r7q+3/cs2Zs/nSaOXEycnhUu3CuRdfeSGT21a7cHAZ3yZrikQAWDUrsqZh7q+9Bf8KbDyQ0XxAk78aJ/78RnUqZLMhWwnJVJg6m//ucN/hM6OZEGrl87WpqdrE2b13v/+mG96X1Nr/+OOX7v3nlXijALCBXFU0LHYseRX++JsZn6zMhLZ8qOeTEwdq38ruGyx0FXIj1Xo2VxlPJseS6fLY28eKW97NtO05fKb33pWeEGuAYxMAK2o51zQsaLHjC5d95eYbgOzmgenpkMuFUA9bb8w+0/f7b7+9u9AVHr7n5P6/bvv1/vbKxfO790xW3+vObvrZZ+66fwlzoIVc/ck4AFzWip9yubTf45c9PLHpznsnp7K5bL0jG7KFUBurPnXD65Vy/Rc/6TmW78lUwuSF8hOfGpwq1yaPbu7e8sjVvQnWNDsYAFbHql5Geml7HRbUuX1X+85bJyYyM5OhXgn5bPKDw71//9ud3xje9uY7tdzUmcf3jnWXO84d6D76m47JjOs7rVuKAWDVrOyehtm9BY3fxgyY2ww02dmQyWbf/8STB5/8SgiZniRpr4fP3zL+ULH84nBXZ1vtk8XprTfWzvwhU5/KHCtd/4k7716Rt8facOklQ9KaCcD6tvRoWLAALr1/wd/gzVdNRq6pvG7vx3Y++tjJ539UrWa6q6FaCV1t1Ye3jmfzITsTTr8ValOhPd/3hWe+mevujX5btBiJALBqWvizJyqVyvSDD5/609GBN9+oTIeOrtDeHvL5kMuFTCaMlAvjlc7ur36tb9tNac8UANaDFo6GfD6/6+Zdo198/OCvNvcfPrJldGxzPskUkiSfLXf2nN6665oHHrjtrrt7enrSnikArActHA25XK6/v3/fvn179uwZHh4ulUrjY+dCtdqxqXfHwMCHBwb6+vo6OzvTniYArBMtHA2zCoVCf39/f3//7t27054LAKxnq3rKJQDQukQDABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUUQDABBFNAAAUUQDABCl5S8jvWTPfefTaU8BAFqJPQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABEEQ0AQBTRAABE2biXkf7hf7+Z9hRW1j88cnvaUwBgXdm40fDc/sG0p7CyRAMAy8vhCQAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKIBgAgimgAAKKsh8tIX6yGA+9MvD48M1qu10Pobcvcdm3+vl3dO3pyaU8NANaPFo6GpDIZquWXT3d8f/+7b1VznZu6t3Vm8tlM6UL14F+mBgdPffb+XcXaSEf/jrRnCgDrwbJFQ7FYnLs9NDS0XC/bxNjLz7368uGnL3z8Yjb3xO5nR/K3/K78uVwmOT9TCecnXjpVvi68M7mtcMvp472337cK8wGA9W15oqFYLDaGwrxvV8iJA4dvGHz+pwM/z2xJKknh1uNPbe4pd2em6zOV9vGJyshY5uadd3zgteNHzvQmd4bMppWez9o0G3Ork3EArG/LsBDy0kQYGhqa3VbNfZ3V+JR5dzaOX/Ap8yT16rXZY/nu3Hi94+JU1+SJ5JevPvid//3HMHKha/Rc29nzbbXa9549Us1uL35wtD79wtW/zVa0OvUGwAax4msaGrdbs7cX2y3ReP+8p1z6spPHXpkYPBbaQqiFZDrkt2Y3fWjvf9UfvWb4bFKemDl/rlKr1qZqL77y2t99dGftwsFsx2Mr+z7XJMUAwDJa8VMu47dbV7SFm/jzG9WpUK+GpBKSqTB1Nv/dd/sOHxmtnB6ZPn2yev696ZHjH31f+003vC+pXfPHH7+0pLkDAH+TztkTTY47RA6YGZ+szIS2fKjnkxMHat/K7hssdBVyI9V6NlcZTybHkuny2NvHilvezbTtOXym997lmzwAbEzpREPznQrzjmgsOCa7eWB6OuRyIdTD1huzz/T9/ttv7y50hYfvObn/r9t+vb+9cvH87j2T1fe6s5t+9pm77l/+9wAAG8wyREOTZQoxlrZYb9Od905OZXPZekc2ZAuhNlZ96obXK+X6L37Scyzfk6mEyQvlJz41OFWuTR7d3L3lkSt9fQBgnuXZ0zB3usTct3O3L72/yeAFX21Bndt3te+8deKdo9lM0hZCviP5weHeH7/dO5prb6vVugtnHt97vrvcce5AePtPhdu/tGODnnAJAMtn2Q5PLLa3YMH7FwyFmFebk8lm3//Ekwef/EoImZ4kaa+Hz98y/lCx/OJwV2db7ZPF6a031s78IVOfyhwrXf+JO+++kreyfsw7o9XJFABcjRa+jPR1ez+289HHTj7/o2o1010N1Uroaqs+vHU8mw/ZmXD6rVCbCu35vi88881cd2/ak02HSgBgGa1sNKzoRqtSqUw/+PCpPx0dePONynTo6Art7SGfD7lcyGTCSLkwXuns/urX+rbdtHJzAICNo4X3NOTz+V037xr94uMHf7W5//CRLaNjm/NJppAk+Wy5s+f01l3XPPDAbXfd3dPTk/ZMAWA9aOFoyOVy/f39+/bt27Nnz/DwcKlUGh87F6rVjk29OwYGPjww0NfX19nZmfY0AWCdaOFomFUoFPr7+/v7+3fv3p32XABgPVvxy0gDAOuDaAAAoogGACCKaAAAoogGACCKaAAAoogGACCKaAAAoogGACCKaAAAoogGACBKy3/2xJL925c+kvYUAKCVbNxo+Mgd16c9BQBoJQ5PAABRRAMAEEU0AABRRAMAECWTJEnacwAAWoA9DQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAEQRDQBAFNEAAET5P4SEWN0P/2IFAAAAAElFTkSuQmCC"
                                 height="200"
                 width="700"
                 margin="0 auto"/>
@@ -1102,7 +1102,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAOv0lEQVR4nO3db2xdZ30H8Ofcf3Z8jdOkTVPHbZPmNlXUkhYoKktZgVUaf6YKaNFA/NNWVQVtEn0xaZs28WqlaFMRCO0FL9BgLxBrkUrHNIYqGo2mUCIWo7TQgVM5LU3jxvnj1E58/ef63rMX1lzj+M/jG9vH1/l8XkTX5zznnJ+j5D7f+zzPOTdJ0zQAACwll3UBAEBrEBoAgChCAwAQRWgAAKIIDQBAFKEBAIgiNKykSqWy0MZ5dy1yFACsN0LDGunv719yl/QAwHomNKyk/v7+OR1/pVJZJC4AQAspZF1A6/nyvxyes+XvH3jnkkfNpIfZqWJmy0zamNk7J39IHgBkTmhYtpeOj9RqtZkfi8XiiRMnenp6Yo6dM/Aw+8fplDB7qmKhlgCQCdMTzajOEkIYGBiY2TV7hGDJnj4+B0gMAGROaFhT05EiZsFjfEsAWBumJ9ba7JUNMeMQMS0BYA0IDc3o6OhYZO/MDMWSt1nGrFSIbwkAq0poWLZ7764MnDjR3LHxfb+UAMB6IzQs24ffszOEnc0du/iNlLP3uuUSgPUmSdM06xoAgBbg7gkAIIrQAABEERoAgChCAwAQxd0Tv8cNC5A59xvD2ovs/oSGN/mOKMicR6fD2ovv/kxPAOuFpA7rnNAArAsSA6x/pieA7EkMkKH4ZxALDcC6MPs9S4aAtRS/pkFoALJnDTK0BGsaAIAoRhre5IslAbgMxXd/vuUSAIhiegIAiCI0AABRhAYAIIrQAABEERoAgChCAwAQRWiYR29vb9YlwGVqYGBgYGAg6yrgMrVk9yc0AABRhAYAIIrQAABEERoAgCi+sGp+/cffyLoEuBydPj0aQhir+w8IGXj97OTiDYSG+f31V/876xIAYK3d8/7F9pqeAACiCA0AQBShAQCIIjQAAFGEBgAgitAAAEQRGgCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIMqqfMtlpVLp7+9fjTMDAKutUqnMvJ7doceONMw+fqEtAECrm/7kP2N2d296AgCIcqmhYTqAVP7fIg3mbVaZZXb7hV4veTkAYJWswJqG2SsY5qxmWGjX9OtFGjd3OQDgEs2ZkmhmTcPiZ593+5wePbJ3n6l1JljMOZWUAACrJ4M1DcYAAGCDWa3QMCebAACtLnZNw5wlCDEDCRevWmjiWk2fBABowiJrGpaxEHL2WZa1QGGhxouUBQBkZaEeOUnTdI1LWf96e3sf+c6rWVcBAGvt+1+7d5G9Hu4EAEQRGgCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABEERoAgChCAwAQRWgAAKIIDQBAFKEBAIhSyLqAdWrx7wYFVsnAwEAIYceOHVkXApej3t7exRsYaQAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABEERoAgChCAwAQRWgAAKIIDQBAFI+Rnt9ffOmprEuged/44geyLgFgAxIa5jd4tpp1CTTv1y+dfuuebVlXAbDRmJ4AAKIIDQBAFKEBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACiCA0AQJSN/xjpC7Vw8NXRI4OTp0YbjRC6SsnNVxbv2tVxXWc+69IAoJVs2NCQ1sZCffxng6VvHnjtt1P5TZvL3ZuSQi4ZOD916JVzfX1Tn7j7ht1Tp9q3XZt1pQDQGlYlNFQqlRBCf3//apw80rnnnjz83AuPDN91IZd/cN8Tg4WbflL9ZD5JhydrYXj0p69Xrwy/u7O7eNOp/q5b3pthnQDQKuYPDdO9/oz+/v5KpRIZAuJbLnnphc4z02aRCx1/5kjPS08+fs3jydVpLS3uffnhKzqr5WSiMVlrGxmtDZ5Ldl9/682HX/7V2a70bSHZ3HTBrFsx/5YAiLfgSMOcN9m1ec+dEzjmzR8xoSRtTG3N91XL+ZFGIT+eNI5P/uCXHxi6atsXt3+5Y2o8f6FaqNe/8cQLD3ywp3LLbxoTT+XaP77yvwyZivm3BMCyxN49Mf2hbfaf0y9mzGk2+8XFDS5+PW3Jt/XIt/6xo4dGj/al9ZDWQzoRCm/JbX77/v/o+au3nBkqDJyuHT8xdnKgfv6Ngz//UZLvblw4FPEXQIsREQBW3LLXNMx02/N+kps9kbF4g6Y/+cWMOVdfOjI1HnK5kKuFdDyMDxW+fvKq58+cTkKoV4fr4+P10aH9t+/Zde2Nab3tF989eOdDTRQCAJeXBUPDQn3zGnyAW3zJQsyY88TwWG0ylAqhUUiPP1v/Su79R4sdxfzgVCOXr42kY+fSieq5Y32Vq19LSnccOdN15yr9JqwP5iYAVkTsmoZ5XTy/EGPJYYaZXU2/1+eu2D4xEfL5EBph+87co1c989Vj+4od4UPvPHHg1e4fHmirXRjed8fY1NlybvP37nvHHzVxCVrCeriRB2DDuKRbLpueX7iU6YkYm29799h4Lp9rtOdCrhjq56YevvaXtWrj3x/r7Ct0JrUwdr764EePjlfrY7+5onz1PatUBtkywACwslbsMdLNjTpEnmS5J9/Uc0PbzptHR5PJsdCohUIu/dbzXX/y1PWPnOx+8Xf1/PiZz+4/V662v/Fs+Tf/1T6WXHfplbPeSAwAK675kYbp0YLZP8Y0mHkrn3ewoblzXizJ5fZ87qFDX/h8CElnmrY1wqduGvlgpXrwZMemUv3uysT2nfUzzyWN8aTv9R3vu+32Zf3itIqLHzeSVSUAG0OSpmnWNayW//2nfzz22LfbO5NyObS3hUIpJMWQK4Rce0jroT4e2tu27/ibf+7Ye+ucA3t7ex/5zquZ1MyK+Ie//MO37tmWdRU0Y2BgIISwY8eOrAuBy1Fvb+/tty/2QXrDfvdErVbr+vRnSoNnJn/8o9pEvb0jtLWFQiHk8yFJwuBocTK/5cYvPZrs3JN1pQDQGjZsaCgWi1u2bOl54P4Xd9+QPP30xPGXO0Ymc8VcrlRIr9xau21fz0fuvWZ3pVQqZV0pALSGDRsaQgjlcnnv3r27du0a+dh9Q0ND1ZGRpNEodnZu3bq1q6uro6OjWCxmXSMAtIyNHBpCCPl8vlwul8vl7u7urGsBgNa2YrdcAgAbm9AAAEQRGgCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABE2eCPkW7a9792b9YlAMD6YqQBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACiCA0AQBShAQCIIjQAAFE8Rnp+3/nPF7MuYRV95p5bsi4BgNYjNMzv+weOZl3CKhIaAGiC6QkAIIrQAABEERoAgChCAwAQRWgAAKIIDQBAFKEBAIgiNAAAUYQGACCK0AAARNn4j5G+UAsHXx09Mjh5arTRCKGrlNx8ZfGuXR3XdeazLg0AWsmGDQ1pbSzUx382WPrmgdd+O5XftLncvSkp5JKB81OHXjnX1zf1ibtv2D11qn3btVlXCgCtYW5oqFQqM6/7+/tX9dox15ppM9MgssJzzz15+LkXHhm+60Iu/+C+JwYLN/2k+sl8kg5P1sLw6E9fr14Zfndnd/GmU/1dt7x3BX4ZANjofi80VCqV2d3wnB9XVsy1Lt4YX+HxZ470vPTk49c8nlyd1tLi3pcfvqKzWk4mGpO1tpHR2uC5ZPf1t958+OVfne1K3xaSzSv3m7WM6fi12tEQgA3jzYWQF3fA/f390/3KzJ/TZh8yZ+Ps9vMeEm/eQBDZw6WNqa35vkI5P9JovzDeMXY8/cH/fOBrv/pcGDzfcfqN0tBwqV7/xhMvTOV6Krecakw81UR5rW5VEyEAG1LsmobZfcz064U+9M/ePueQ5RbX9FzJ2NFDo0f7QimEekgnQmF7bvPb9/9r48NvOTmUVkcnh9+o1afq4/WDPz/8x39wfePCoVz7x5dbW6uTGABYrtjQEN/HrGBvtNBMxMULHeaovnRkajzkciFXC+l4GB8qfP3kVc+fOZ2EUK8O18fH66ND+2/fs+vaG9N62y++e/DOh1aqZADYsC7p7okl5x0WaTAz99GEJQcwJobHapOhVAiNQnr82fpXcu8/Wuwo5genGrl8bSQdO5dOVM8d66tc/VpSuuPIma47m6sDAC4nlxQaFh9UmHdsYKHDmw4Q88pdsX1iIuTzITTC9p25R6965qvH9hU7wofeeeLAq90/PNBWuzC8746xqbPl3Obv3feOP1rBSwPARvXmQsiLP/ovayHCpfT6S8aL5V5l823vHhvPTYyHpB7yuRDOTT187S//rv3wK4+d7/vF+aQ2MXa++uBH+8ar/WcPXbFp2z1NVw4Al4/fG2mYkxsWGgmY3r5I43nPdrHFlybMe/4lLzptU88NbTtvHn3lxVySlkIotKffer7r3451nc63ler1cvHMZ/cPl6vtbzwbjv26eMv9112ON1wCwDLNnZ5YqBteqF9ffMviAxVLnjPyohdLcrk9n3vo0Bc+H0LSmaZtjfCpm0Y+WKkePNmxqVS/uzKxfWf9zHNJYzzpe33H+267fckTbjxz7pJ1MwUAS9qwj5Hetv89lT/9s2OPfXtqKilPhala6ChNfWj7SK4QcpPh1G9DfTy0t1395195NF/uyrrYDEgJACxXVGhoxQ6mVqt1ffozpcEzkz/+UW2i3t4R2tpCoRDy+ZAkYXC0OJnfcuOXHk127sm6UgBoDRt2pKFYLG7ZsqXngftf3H1D8vTTE8df7hiZzBVzuVIhvXJr7bZ9PR+595rdlVKplHWlANAaNmxoCCGUy+W9e/fu2rVr5GP3DQ0NVUdGkkaj2Nm5devWrq6ujo6OYrGYdY0A0DI2cmgIIeTz+XK5XC6Xu7u7s64FAFpbbukmAABCAwAQSWgAAKIIDQBAFKEBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACibPDvnmja397/rqxLAID1RWiY37tu3ZF1CQCwvpieAACiCA0AQBShAQCIIjQAAFGSNE2zrgEAaAFGGgCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABE+T+y3rz+4SUBbQAAAABJRU5ErkJggg=="
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAOvUlEQVR4nO3dX4xcV30H8DP/9n/WVtix13bsxBkSJSQmIgZTK20gRHVIFSHgAQFqihBKRYsgUqUKteKpgagSCERfeEBFfUD8q5IUVIp4sApxQizIRnFIFOxoExLH47XX8dpr7+yf+XP7sOpmWe+fs+Nd353x5/Ngzd577r2/tew53znn3DuZJEkCAMBKsmkXAAC0BqEBAIgiNAAAUYQGACCK0AAARBEaAIAoQsNaKpVKS21cdNcyRwHARiM0XCHDw8Mr7pIeANjIhIa1NDw8vKDjL5VKy8QFAGgh+bQLaD2P/vuzC7b88+feu+JRc+lhfqqY2zKXNub2LsgfkgcAqRMaVu2V4+PVanXux0KhcOLEiR07dsQcu2DgYf6Psylh/lTFUi0BIBWmJ5pRmSeEUC6X53bNHyFYsaePzwESAwCpExquqNlIEbPgMb4lAFwZpieutPkrG2LGIWJaAsAVIDQ0o6enZ5m9czMUK95mGbNSIb4lAKwroWHVPvahUvnEieaOje/7pQQANhqhYdU+cvf1IVzf3LHL30g5f69bLgHYaDJJkqRdAwDQAtw9AQBEERoAgChCAwAQRWgAAKK4e+JPuGEBUud+Y7jyIrs/oeFtviMKUufR6XDlxXd/pieAjUJShw1OaAA2BIkBNj7TE0D6JAZIUfwziIUGYEOY/54lQ8CVFL+mQWgA0mcNMrQEaxoAgChGGt7miyUBuArFd3++5RIAiGJ6AgCIIjQAAFGEBgAgitAAAEQRGgCAKEIDABBFaFjE0NBQ2iXAVapcLpfL5bSrgKvUit2f0AAARBEaAIAoQgMAEEVoAACi+MKqxQ0fP5d2CXA1Gh2dCCFM1v0HhBScfGtm+QZCw+L+8Zv/m3YJAHClPXBgub2mJwCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABEERoAgChCAwAQRWgAAKIIDQBAFKEBAIiyLt9yWSqVhoeH1+PMAMB6K5VKc6/nd+ixIw3zj19qCwDQ6mY/+c+Z392bngAAolxuaJgNIKX/t0yDRZuV5pnffqnXK14OAFgna7CmYf4KhgWrGZbaNft6mcbNXQ4AuEwLpiSaWdOw/NkX3b6gR4/s3edqnQsWC04lJQDA+klhTYMxAABoM+sVGhZkEwCg1cWuaViwBCFmIOHSVQtNXKvpkwAATVhmTcMqFkLOP8uqFigs1XiZsgCAtCzVI2eSJLnCpWx8Q0NDX/v+G2lXAQBX2uPf+tgyez3cCQCIIjQAAFGEBgAgitAAAEQRGgCAKEIDABBFaAAAoggNAEAUoQEAiCI0AABRhAYAIIrQAABEERoAgChCAwAQJZ92ARvU8t8NCqyTcrkcQti+fXvahcDVaGhoaPkGRhoAgChCAwAQRWgAAKIIDQBAFKEBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEMVjpBf3d1/9Zdol0LzvfOW+tEsAaENCw+JOvVVJuwSa9+Iro7ffVEy7CoB2Y3oCAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACiCA0AQBShAQCIIjQAAFHa/zHSF2vh0OsTz43MjFYajRD6OzK3Xpu/e3fvzr5c2qUBQCtp29CQVCdDrfL06a7vHnzzD7Vc96bebd2ZfDZTvlA7/MepY8dOfuKe3aX6qa7izrQrBYDWsC6hoVQqhRCGh4fX4+SRxp5+/HdPH3n0wgcuZnMP7XnsVP7mX1U+lcsk52eq4fzEUycr7wivT24r3Hz6tf7b7k6xTgBoFYuHhtlef87w8HCpVIoMAfEtV7z0UueZa7PMhY4fOnLdsSd+PPifmS1JNSnc8tojm/sqvZnpxky1c3yiemosc+Oud7/r2ddeONOf3BEym5oumA0r5t8SAPGWHGlY8CZ7Zd5zFwSORfNHTChJGrVrs0crvbnxRj43lWkcn/npc/edHSh+ZeujPbWp3MVKvl7/zmMvfO7DO0q3v9yY/kW265Nr/8uQqph/SwCsSuzdE7Mf2ub/OftizoJm819c2uDS17NWfFuPfOufPPrMxLGjST0k9ZBMh/w12U3v2f+zHf9wzZmz+fJo9fiJyZFy/cK5J5/5RSa3rX7hcMRfAC1GRABYc6te0zDXbS/6SW7+RMbyDZr+5Bcz5jzxyvO1qZDNhmw1JFNh6mz+2yMDR86MZkKoV87Xp6bqE2f3773phuvemdQ7f/vDp+76UhOFAMDVZcnQsFTffAU+wC2/ZCFmzHlmfLI6EzryoZFPjh+qfyN74Fihp5A7VWtkc9XxZHIsma6MvXq0tOXNTMe+I2f671qn34SNwdwEwJqIXdOwqEvnF2KsOMwwt6vp9/rs5sHp6ZDLhdAIW6/Pfn3g1998dU+hJ9z/3hMH39j284Od1Yvn9+ybrL3Vm930k4/feU8Tl6AlbIQbeQDaxmXdctn0/MLlTE/E2HTHXZNT2Vy20ZUN2UKoj9Ueue65aqXxXz/qO5rvy1TD5IXKQx89NlWpT768uXfLA+tUBukywACwttbsMdLNjTpEnmS1J+/esbtz1y0TE5mZydCohnw2+d6R/r/65a6vjWx76fV6burMg/vHeitd5w71vvw/XZMZz3dqQxIDwJprfqRhdrRg/o8xDebeyhcdbGjunJfKZLM3PfTw4Yc/H0KmL0k6G+HTN49/uFR5cqSnu6P+odL01uvrZ36TaUxljpa3f/COvav6xWkVlz5uJK1KANpDJkmStGtYF41G4/dffeTEEz/o6Mv09oauzpDvCJlCyOZDtisk9VCfCp354rYv/1vfu96z4NihoaGvff+NVMpmTfzL3//57TcV066CZpTL5RDC9u3b0y4ErkZDQ0N79y73Qbptv3uiWq1O33f/yRdfHnzp+ep06OoJnZ0hnw+5XMhkwqlKYbza3fuFLw5suyHtSgGgNbRtaMjn87tv3D36mQcP/2xz8cgLW0bHNueTTCFJ8tlKd9/prbuvuffeW+/c29fXl3alANAa2jY05HK5YrF44MCBffv2jYyMlMvl8bFzoVbr2tS/c3DwfYODAwMD3d3daZcJAC2jbUPDrEKhUCwWi8Xinj170q4FAFrbmt1yCQC0N6EBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACiCA0AQBShAQCI0uaPkW7a49/6WNolAMDGYqQBAIgiNAAAUYQGACCK0AAARBEaAIAoQgMAEEVoAACiCA0AQBShAQCIIjQAAFE8Rnpx3//vl9IuYR399QO3pV0CAK1HaFjc4wePpV3COhIaAGiC6QkAIIrQAABEERoAgChCAwAQRWgAAKIIDQBAFKEBAIgiNAAAUYQGACCK0AAARGn/x0hfrIVDr088NzIzWmk0QujvyNx6bf7u3b07+3JplwYAraRtQ0NSnQy1ytOnu7578M0/1HLdm3q3dWfy2Uz5Qu3wH6eOHTv5iXt2l+qnuoo7064UAFrDwtBQKpXmXg8PD6/rtWOuNddmrkFkhWNPP/67p488euEDF7O5h/Y8dip/868qn8plkvMz1XB+4qmTlXeE1ye3FW4+/Vr/bXevwS8DAO3uT0JDqVSa3w0v+HFtxVzr0o3xFR4/dOS6Y0/8ePA/M1uSalK45bVHNvdVejPTjZlq5/hE9dRY5sZd737Xs6+9cKY/uSNkNq3db9YyZuPXekdDANrG2wshL+2Ah4eHZ/uVuT9nzT9kwcb57Rc9JN6igSCyh0satWuzR/O9ufFG18WpnsnjyU9/d9+3fv+34dSFntFzHWfPd9Tr33nshVp2R+n20cb0L5oor9WtayIEoC3FrmmY38fMvl7qQ//87QsOWW1xTc+VTB59ZuLY0dARQj0k0yG/NbvpPfv/o/GRa0bOJpWJmfPnqvVafar+5DPP/uWf7apfOJzt+uRqa2t1EgMAqxUbGuL7mDXsjZaaibh0ocMCE688X5sK2WzIVkMyFabO5r89MnDkzGgmhHrlfH1qqj5xdv/em2647p1JvfO3P3zqri+tVckA0LYu6+6JFecdlmkwN/fRhBUHMGbGJ6szoSMfGvnk+KH6N7IHjhV6CrlTtUY2Vx1PJseS6crYq0dLW97MdOw7cqb/rubqAICryWWFhuUHFRYdG1jq8KYDxKKymwenp0MuF0IjbL0++/WBX3/z1T2FnnD/e08cfGPbzw92Vi+e37NvsvZWb3bTTz5+5z1reGkAaFdvL4S89KP/qhYiXE6vv2K8WO1VNt1x1+RUdnoqZOohlw1hrPbIdc/9U9ezf/zRhaO/vZCpTk9eqDz00aNTleG3Dm/uLj7QdOUAcPX4k5GGBblhqZGA2e3LNF70bJdafmnCoudf8aKzunfs7tx1y8TrL2czSUcI+a7ke0f6f/hq/2ius6Ne7y2ceXD/+d5K17lD4dUXC7d9dufVeMMlAKzSwumJpbrhpfr15bcsP1Cx4jkjL3qpTDZ700MPH3748yFk+pKksxE+ffP4h0uVJ0d6ujvqHypNb72+fuY3mcZU5mh5+wfv2LviCdvPgrtk3UwBwIra9jHS79j/F7s+8skTT/ygVsv01kKtGno6avdvHc/mQ3YmnP5DqE+FzvzA33z9X3O9/WkXmwIpAYDVigoNrdjBVKvV6fvuP/niy4MvPV+dDl09obMz5PMhlwuZTDhVKYxXu3u/8MWBbTekXSkAtIa2HWnI5/O7b9w9+pkHD/9sc/HIC1tGxzbnk0whSfLZSnff6a27r7n33lvv3NvX15d2pQDQGto2NORyuWKxeODAgX379o2MjJTL5fGxc6FW69rUv3Nw8H2DgwMDA93d3WmXCQAto21Dw6xCoVAsFovF4p49e9KuBQBaW3blJgAAQgMAEEloAACiCA0AQBShAQCIIjQAAFGEBgAgitAAAEQRGgCAKEIDABBFaAAAorT5d0807cuffX/aJQDAxiI0LO79796edgkAsLGYngAAoggNAEAUoQEAiCI0AABRMkmSpF0DANACjDQAAFGEBgAgitAAAEQRGgCAKEIDABBFaAAAoggNAEAUoQEAiPJ/E8XLPfAkKdgAAAAASUVORK5CYII="
                                 height="200"
                 width="700"
                 margin="0 auto"/>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index ad7646551b..af138fed8e 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index 9fa6be9dba..7b18efc17e 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
@@ -9,11 +9,14 @@
 				<url>http://example.org/index.htm</url>
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 11:22:33</serverTimePretty>
 				<pageId>1</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267874553</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime>
@@ -29,24 +32,30 @@
 				<url>http://example.org/index2.htm</url>
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>3</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 11:25:33</serverTimePretty>
 				<pageId>2</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267874733</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/index3.htm</url>
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>4</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 11:28:33</serverTimePretty>
 				<pageId>3</pageId>
+				<bandwidth />
 				<interactionPosition>2</interactionPosition>
 				<icon />
 				<timestamp>1267874913</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime>
@@ -62,37 +71,46 @@
 				<url>http://example.org/no-user-id-set-but-should-appear-in-user-id-visit</url>
 				<pageTitle>no User Id set but it should appear in email@example.com!</pageTitle>
 				<pageIdAction>6</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 13:16:33</serverTimePretty>
 				<pageId>4</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267881393</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/index.htm</url>
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 13:22:33</serverTimePretty>
 				<pageId>5</pageId>
-				<interactionPosition>2</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
 				<icon />
 				<timestamp>1267881753</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/index.htm</url>
 				<pageTitle>second page</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 13:28:33</serverTimePretty>
 				<pageId>6</pageId>
+				<bandwidth />
 				<interactionPosition>3</interactionPosition>
 				<icon />
 				<timestamp>1267882113</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime>
@@ -108,11 +126,14 @@
 				<url>http://example.org/index.htm</url>
 				<pageTitle>a new user id was set -&gt; new visit</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 13:34:33</serverTimePretty>
 				<pageId>7</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267882473</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:34:33</lastActionDateTime>
@@ -128,11 +149,14 @@
 				<url>http://example.org/home</url>
 				<pageTitle>pageview - should not be tracked by our user id but in a new visit</pageTitle>
 				<pageIdAction>10</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty>
 				<pageId>10</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267892913</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime>
@@ -148,26 +172,32 @@
 				<url>http://example.org/home</url>
 				<pageTitle>same user id was set -&gt; this is the same unique user</pageTitle>
 				<pageIdAction>10</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 16:22:33</serverTimePretty>
 				<pageId>8</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1267892553</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/home</url>
 				<pageTitle>second pageview - by this user id</pageTitle>
 				<pageIdAction>10</pageIdAction>
+				
 				<serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty>
 				<pageId>9</pageId>
-				<interactionPosition>2</interactionPosition>
+				<bandwidth />
 				<timeSpent>721</timeSpent>
 				<timeSpentPretty>12 min 1s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
 				<icon />
 				<timestamp>1267892913</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -211,11 +241,14 @@
 				<url>http://example.org/index.htm</url>
 				<pageTitle>Page view by email@example.com</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 14, 2010 11:22:33</serverTimePretty>
 				<pageId>11</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1268565753</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:22:33</lastActionDateTime>
@@ -231,11 +264,14 @@
 				<url>http://example.org/index.htm</url>
 				<pageTitle>A page view by new-user-id@one-weeklater</pageTitle>
 				<pageIdAction>2</pageIdAction>
+				
 				<serverTimePretty>Mar 14, 2010 11:46:33</serverTimePretty>
 				<pageId>12</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				<timestamp>1268567193</timestamp>
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:46:33</lastActionDateTime>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index f7851cf7dc..0c074f1d71 100644
--- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 05562d2c49..0e0a47e94c 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -51,13 +51,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>ordered</visitEcommerceStatus>
 		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -93,6 +98,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
+		<totalEcommerceConversions>4</totalEcommerceConversions>
+		<totalEcommerceItems>12</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>3</totalAbandonedCarts>
+		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -138,17 +149,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
-		<totalEcommerceConversions>4</totalEcommerceConversions>
-		<totalEcommerceItems>12</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>3</totalAbandonedCarts>
-		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -162,7 +162,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>14</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -181,11 +188,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -193,7 +196,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>15</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -212,11 +222,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -224,7 +230,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>16</pageId>
+				<bandwidth />
+				<timeSpent>361</timeSpent>
+				<timeSpentPretty>6 min 1s</timeSpentPretty>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -239,11 +252,7 @@
 						<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>361</timeSpent>
-				<timeSpentPretty>6 min 1s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -284,13 +293,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
 		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -326,6 +340,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
+		<totalEcommerceConversions>4</totalEcommerceConversions>
+		<totalEcommerceItems>12</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>3</totalAbandonedCarts>
+		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -371,16 +391,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
-		<totalEcommerceConversions>4</totalEcommerceConversions>
-		<totalEcommerceItems>12</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>3</totalAbandonedCarts>
-		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 4e5f4357ea..2fe9e01574 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -12,7 +12,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>11</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -31,11 +38,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -43,7 +46,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>12</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -62,11 +72,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -74,7 +80,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>361</timeSpent>
+				<timeSpentPretty>6 min 1s</timeSpentPretty>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -89,11 +102,7 @@
 						<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>361</timeSpent>
-				<timeSpentPretty>6 min 1s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -134,13 +143,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>abandonedCart</visitEcommerceStatus>
 		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.png</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -176,6 +190,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
+		<totalEcommerceConversions>4</totalEcommerceConversions>
+		<totalEcommerceItems>12</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>3</totalAbandonedCarts>
+		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -221,17 +241,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
-		<totalEcommerceConversions>4</totalEcommerceConversions>
-		<totalEcommerceItems>12</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>3</totalAbandonedCarts>
-		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -245,18 +254,21 @@
 				<pageTitle>Looking at Electronics &amp; Cameras page with a page level custom variable</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth />
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName5>_pkc</customVariablePageName5>
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -264,18 +276,21 @@
 				<pageTitle>Looking at Electronics &amp; Cameras page again</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>6</pageId>
+				<bandwidth />
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName5>_pkc</customVariablePageName5>
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -283,7 +298,14 @@
 				<pageTitle>Looking at product page</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>7</pageId>
+				<bandwidth />
+				<timeSpent>720</timeSpent>
+				<timeSpentPretty>12 min 0s</timeSpentPretty>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -302,11 +324,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>720</timeSpent>
-				<timeSpentPretty>12 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>ecommerceOrder</type>
@@ -372,7 +390,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>8</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>4</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -391,11 +416,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>4</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -403,7 +424,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>9</pageId>
+				<bandwidth />
+				<timeSpent>180</timeSpent>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<interactionPosition>5</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -422,11 +450,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>5</interactionPosition>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -434,7 +458,14 @@
 				<pageTitle>View product left in cart</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>10</pageId>
+				<bandwidth />
+				<timeSpent>361</timeSpent>
+				<timeSpentPretty>6 min 1s</timeSpentPretty>
+				<interactionPosition>6</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -449,11 +480,7 @@
 						<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>6</interactionPosition>
-				<timeSpent>361</timeSpent>
-				<timeSpentPretty>6 min 1s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -494,13 +521,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>2</visitCount>
-		
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
 		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -536,6 +568,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
+		<totalEcommerceConversions>4</totalEcommerceConversions>
+		<totalEcommerceItems>12</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>3</totalAbandonedCarts>
+		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -581,17 +619,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
-		<totalEcommerceConversions>4</totalEcommerceConversions>
-		<totalEcommerceItems>12</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>3</totalAbandonedCarts>
-		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -616,7 +643,14 @@
 				<pageTitle>incredible title!</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -635,11 +669,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>1</interactionPosition>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -647,7 +677,14 @@
 				<pageTitle>Another Product page</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -666,11 +703,7 @@
 						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -678,7 +711,14 @@
 				<pageTitle>Another Product page with no category</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName2>_pkp</customVariablePageName2>
@@ -697,11 +737,7 @@
 						<customVariablePageValue5 />
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -709,7 +745,12 @@
 				<pageTitle>Another Product page with multiple categories</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth />
+				<interactionPosition>4</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName3>_pks</customVariablePageName3>
@@ -724,9 +765,7 @@
 						<customVariablePageValue5>[&quot;Multiple Category 1&quot;,&quot;&quot;,0,&quot;Multiple Category 2&quot;,&quot;Electronics &amp; Cameras&quot;,&quot;Multiple Category 4&quot;,&quot;Multiple Category 5&quot;,&quot;SHOULD NOT BE REPORTEDSSSSSSSSSSSSSSssssssssssssssssssssssssssstttttttttttttttttt</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>4</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -736,13 +775,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -778,6 +822,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
+		<totalEcommerceConversions>4</totalEcommerceConversions>
+		<totalEcommerceItems>12</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>3</totalAbandonedCarts>
+		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -819,16 +869,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>13351.11</totalEcommerceRevenue>
-		<totalEcommerceConversions>4</totalEcommerceConversions>
-		<totalEcommerceItems>12</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>3</totalAbandonedCarts>
-		<totalAbandonedCartsItems>12</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 7de861d54e..47c2b21ecd 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -731,7 +731,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAG2klEQVR4nO3dv2sbZwDHYflHIGQMZPLgQSGQrcSdMnjopCUlgf4HhpI/IFP3djJkNYVuJVMJGT1kCnTrmW4BN6LExV4EHUoxgfxQB8P1LEvWN7ask07PM4To7iS/sVDuw/ve2Uv9fr8FADDOct0DAADmg2gAACKiAQCIiAYAICIaAICIaAAAIqJhpHa7PWrj0F3nPAsAGkA0XES32x27Sz0A0DCiYaRutztw4m+32+fkAgA022rdA6jZDz/9NrDlu60vxz6rrIdqVZRbytoo9w70h/IAYB4tejT88dc/79+/Lx9eu3bt8PBwbW0tee7AxEP14UklVJcqRh0JAPPC8kTruKLVah0dHZW7qjMEY8/0eQcoBgDmkWi4uJOkSC54zI8EgJm16MsTl1S9siGZh0iOBIDZJBpaN27cOGdvuUIx9jbL5EqF/EgAmDWLHg2PvmofHR5e7Ln5uV8lANAAix4NX2+ut1rrF3vu+TdSVve65RKABljq9/t1jwEAmAPungAAIqIBAIiIBgAgIhoAgEiT755wwwLMIB9MmE3VO/5GHdPYaPA7omAG+WDCbAo/jJYngOmRCDCD8nxv7EwDABAK1w1FAzBtydIpME3huqFoAKat/P/INQ0wX1zTAABERAMwPdV1U2DuNPkXVrkdHGaQDybMoPCD2eRoAAAmyPIEABARDQBARDQAABHRAABERAMAEBENAECk+dFQFEXdQwAG+WDCDBr7wWx+NAAAEyEaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIis1j2Aafjxl9/rHgJwSq/3d/GnDyZX69tvvqh7CE2zENGw++ufdQ8BOGP/37pHQMOJhomzPAEAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARFbrHsB4vV7v1atXnz59Gnvk8vLy5ubmrVu3pjAqAFg0k4mGdrvd7XYn8lJndTqdvb298OB79+4VRXFFIwGARfZ/NLTb7eqOy0fApEpib2/vyZMnjx8/Hnvkzs7O9vb25b8iAHDWqZmG6jn+SicPPtfNmzcHmmbUYVMYDADz4uy5Y3ZObfNo5PJEt9stu6H6TS+/3eXGgTfg5Fkne0/+HPUi1SPPvg4AXJ6TywSNv6ZhYMqhPNMPfRvK7QPHDH2Rge0zNbcBAAyY5N0TFzjrqwQArtTQyXIuJoqGoWtC1aWHlnkCAGbP0AX0ugbTAFE0DP0WD6wvnLNmAQA0wMifCHnOVQujnlK9qhEAaJhTMw1DF34GUmDgVoiBsKjON1SXMIa+yKiveNbx8XGv1xv7jzk+Ph57DACLwxT4ZC31+/26vnb4Xt69e3d/fz98zTt37rx+/bq6pSiK738+uMj4AJhnz58+arkQ8nMURbGxsXHOAXPwuydevny5u7v74cOHcsvu7u6LFy9ardbDhw87nU65fXV1tfoQAITCBNUZDeEbuba2trW1VT58+/btmzdvTv5++/btTqezvr5+JeMDACrmYKah6uPHj/fv3z86Ojp5uL29/ezZs4ODg5WVlXoHBgCNN2fRsLKysrOz8+7du3LL9evXFQMATMGcRUOr1Xrw4EHdQwCARTTy5zQAAFSJBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIis1j2AaXj+9FHdQwBOKYpiY2Oj7lEAn8dMAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABBZ6vf7dY8BAJgDZhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAIPIfXhPyLH3NW9sAAAAASUVORK5CYII="
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAG3klEQVR4nO3dv2sbZwDH4fOPZMgYyOQhBBmyGtwhk4cOJmRoEuh/UFLyB2Tq3k6GrMHQJXQsIVPwlCHQrSJe00YYUuwhgg6leEhI1MFwPcuS9Y0t66TT8wwB3Z3kNxbKfXjfu2ih1+sVAACjLNY9AABgNogGACAiGgCAiGgAACKiAQCIiAYAICIahmq1WsM2Dtx1yrMAoAFEw1l0Op2Ru9QDAA0jGobqdDp9J/5Wq3VKLgBAsy3XPYCa/fTz731bfvjuq5HPKuuhWhXllrI2yr19/aE8AJhF8x4Nf/71z8ePH8uHly5d2t/fX1lZSZ7bN/FQfXhUCdWlimFHAsCssDxRHFYURXFwcFDuqs4QjDzT5x2gGACYRaLh7I6SIrngMT8SAKbWvC9PnFP1yoZkHiI5EgCmk2gorly5csrecoVi5G2WyZUK+ZEAMG3mPRruf9062N8/23Pzc79KAKAB5j0avtm4XhTXz/bc02+krO51yyUADbDQ6/XqHgMAMAPcPQEAREQDABARDQBARDQAAJEm3z3hhgWYQj6YMJ2qd/wNO6ax0eA7omAK+WDCdAo/jJYngMmRCDCF8nxv7EwDABAK1w1FAzBpydIpMEnhuqFoACat/PfINQ0wW1zTAABERAMwOdV1U2DmNPkLq9wODlPIBxOmUPjBbHI0AABjZHkCAIiIBgAgIhoAgIhoAAAiogEAiIgGACDS/Ghot9t1DwHo54MJU2jkB7P50QAAjIVoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACCyXPcAJmH71926hwAc0+3+3d7zweRiff/tWt1DaJq5iIad3/bqHgJwwh//1j0CGk40jJ3lCQAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgslz3AEbrdruvXr36/PnzyCMXFxc3NjauXbs2gVEBwLwZTzS0Wq1OpzOWlzppc3Nzd3c3PHhtbe3169cXNBIAmGf/R0Or1aruOH8EjKskdnd3Hz169PDhw5FHPnnyZGtr6/w/EQA46dhMQ/Ucf6GTB1/q6tWrfU0z7LAJDAaAWXHy3DE9p7ZZNHR5otPplN1Q/aWXv+5yY98bcPSso71Hfw57keqRJ18HAM7PyWWMRl/T0DflUJ7pB74N5fa+Ywa+SN/2qZrbAAD6jPPuiTOc9VUCABdq4GQ5ZxNFw8A1oerSQ2GeAIDpM3ABva7BNEAUDQN/xX3rC6esWQAADTD0f4Q85aqFYU+pXtUIADTMsZmGgQs/fSnQdytEX1hU5xuqSxgDX2TYTzzp8PCw2+2O/MscHh6OPAaA+WEKfLwWer1eXT87fC9v3rz59u3b8DVXV1ffvHlT3dJut3/85d1ZxgfALHv2+H7hQsgv0W6319fXTzlgBr574uXLly9evKh+98TOzs7z58+Lorh3797t27fL7YuLi3fu3KlhiABMK6EwRnVGQ/hGrqysPHjwoHy4t7dXTjysrq5ubm7euHHjQsYHAFTMwExD1adPn27duvX+/fujh1tbW0+fPj04OFhaWqp3YADQeDMWDUtLS9vb2x8+fCi3XL58WTEAwATMWDQURXH37t26hwAA82jo/9MAAFAlGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACCyXPcAJuHZ4/t1DwE4pt1ur6+v1z0K4MuYaQAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiC71er+4xAAAzwEwDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAET+A2Z98kqgHtNWAAAAAElFTkSuQmCC"
                                 height="200"
                 width="700"
                 margin="0 auto"/>
@@ -1007,7 +1007,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAHXUlEQVR4nO3dz2+bdwHH8a8dO23TUrGBBm0lxuRLQUMaEhI3fh04IaRJSPwBSJw5Im5cgBsnLkjwByC0M/8AJ1ZpEhqg0IwKFmusTTY6NaRJOnOo5D7Ysf2p4+TrxK/XoYr9PLa+deV+336+zxO3BoNBAQCYpV17AADA+SAaAICIaAAAIqIBAIiIBgAgIhoAgIhoOF29Xm/SncdumvIoAKhLNFSztbU1c5N6AGB5iIbTtbW1NTLx93q9KbkAAEurU3sAF8HPfvPmyD0/+cFXZj5qWA/NqhjeM6yN4daR/lAeAJwx0bAAf//Xw8PDw+HNbre7vb1969at5LEjBx6aN59WQnOpYtKeAHAGLE8sxl5DKaXf7w83NY8QzJzp8w5QDACcMdFQ2dOkSE54zPcEgNNgeaK+5pkNyXGIZE8AWDjRsBgbGxtTtg5XKGZeZpmcqZDvCQALJBoW4PVv9frb2/M9Np/7VQIAdYmGBfju114u5eX5Hjv9QsrmVpdcAlBXazAY1B4DAHAOuHoCAIiIBgAgIhoAgIhoAAAirp6YwQULcMa86aCK5sV6k/YRDdP4jig4Y950UEX4XrM8ASwRiQBnL69zRxoAYNWFy4KiAVg6ydoqsEDhsqBoAJbO8D8s5zTAUnFOAwAQEQ3AEmkurALLxhdWzeCScThj3nRw9sL3nWgAACKWJwCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIhcufOndpDgNXS7/f7/X7tUcBqmTnZiQYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIh0ag/g3Pj179+qPQRYIY8ePSqlXL36fu2BcEH88Huv1R7CRSAaUn/44z9qDwGAOYmGhbA8AQBERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEOrUHUNmTwWB3v9z74Ghz9+ju+/t37+/95d8HmzuPP/rp7dpDA4DlskLRcPjx4MF+690PDzd3j+7tHnzx0503+49/+6cPHzw6OnrypPboAGDZnVY09Hq9ra2tU3ryOXz5V9v9/zze3XvWBz/++qfe2T147+HjugMDgPPiWTSMTPPH3qybApOG1Nxn0vDeevfh6Q4OgOU2Ml+UyVMGkzzfkYa6r2+zWpoBMaV1AGDIBHFCz66eaH5qH/kQ35yqm38+NXyGXsOUO0e2jv88/iQAQHVzntPQ/EB/7MrFMCye9zDA9H2GKaMWAXhezY+j5pE5zBkNJ3mth4Ux/ufczznTd25fW19rdRq/luLVz1566dpaKWVjvb2+1iqltNc6Hw9ObwgA1DQyy1jOnsMx0TB8Hauc+TjHsYSkHDe6rac/tFuty93W5U7r2np7b71983q3lNJpl9JqtS9ttNutE40eAC6u/4uG8YsRSo0WGz/VcXwwk06EnOR3f/5o5J5PXl7bfHDwxtvN+3eGP/38G1+YY+QAcIEd82ukm3PwfLkw8xzG5jGM6ldyArAKnF9/cgv75U7NoxTNJYbnPeuk+STjm5pHF06eGh3fvAGwMuaYkhgxGg3jL+L4gYeRfY5dJpi5djDpeMb0SyfGb/pXByBkyjihVfmsffszV69fWV+dvy8ALNyqfGHVX3/0uf8eDd7bK/d2DzZ3ntzb2X/tRvegrL30iYPmF1IAAJOsSjSUUq50Wq9cL69cv/TNz5dSNkop3/9S+cW3X3yw3/rnB4ebu0fv3N+/e3/vb/cP7u4c1B0qACyhFYqGY3XbrRsb5cZG96u3uqVcKeWF2iMCgCVljR8AiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiHRqD+DceOOXr9ceAqyQfr9fSrl582btgQDPONIAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARFqDwaD2GACAc8CRBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCI/A/oMlmctGOZzwAAAABJRU5ErkJggg=="
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAHcUlEQVR4nO3dz2+bdwHH8e/jOOmalkoMqWyt0JgsoSFNE0hIu40fFzghTeLCGYkzR8SNC3DjxAUJiTNCnDjsH9gFUWkSSKuyGSporNElKWwkS/PLHILcZ3Ycf+o4eZz49TqktZ/H1reu3Oft7/d56qrf7xcAgElaTQ8AALgcRAMAEBENAEBENAAAEdEAAEREAwAQEQ3nq9PpjLvzxE2nPAoAmiUaGtPtdiduUg8AzA/RcL663e7Qgb/T6ZySCwAwt9pND+Aq+Nlv/jx0z09+8LWJjxrUQ70qBvcMamOwdag/lAcAF0w0zMB7//xof39/cHN5eXl9ff3u3bvJY4cmHuo3jyuhvlQxbk8AuACWJ2Zjp6aU0uv1BpvqMwQTj/R5BygGAC6YaGjYcVIkJzzmewLAebA80bz6mQ3JPESyJwDMnGiYjdXV1VO2DlYoJl5mmZypkO8JADMkGmbgzW91euvr0z02P/arBACaJRpm4LtvvFTKS9M99vQLKetbXXIJQLOqfr/f9BgAgEvA1RMAQEQ0AAAR0QAAREQDABBx9cQELliAC+ZNB42oX6w3bh/RcBrfEQUXzJsOGhG+1yxPAHNEIsDFy+vcTAMALLpwWVA0AHMnWVsFZihcFhQNwNwZ/IPlnAaYK85pAAAiogGYI/WFVWDe+MKqCVwyDhfMmw4uXvi+Ew0AQMTyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDRE7t271/QQYLH0er1er9f0KGCxTDzYiQYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIi0mx7ApfHr37/T9BBggWxvb5dSbtx41PRAuCJ++L2vND2Eq0A0pN56++9NDwGAKYmGmbA8AQBERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABE2k0PoGGH/f7WbvXg8f7a1sH7j3bXHu3c/3BvbePJxz99pemhAcB8WaBo2D/qb+xWD/+9f3/z4MHmk1dvL//p4ZPf3nu8sX14cHjY9OgAYN6dVzR0Op1ut3tOTz6Fr/6q9/DxztYnR0dH/++DH3/9c+9v7n3w0V6zAwOAy+JpNAwd5k+82WwKjBtSfZ9xw3vn4X/Od3AAzLeh40UZf8hgnGebaWj29a1XSz0gTmkdABhwgDijp1dP1D+1D32Irx+q6z+PDZ6hU3PKnUNbR38/+iQAQOOmPKeh/oH+xJWLQVg86zTA6fsMUkYtAvCs6h9HHUemMGU0nOW1HhTG6M+pn3Oi73zpxnPtamWpKqUc9Usp5dUXrt2+udSqSrtV3bzWalWllHJUWqWqzm8YADRl6ChjOXsKJ0TD4HVs5MzHKeYSknK8de3pQsxz7Wp1pbW63FpZqm7fbJdS2q2qVZVWVVorq6320vSjB4Cr61PRMHoxQmmixUZPdRwdzLgTIcf53V8+Hrrn+etLf/3Xkz/e/++n7946/uXn3/jyFCMHgCvshP9Gun4Mni4XJp7DWJ/DaPBKzuPVCgAWgfPrz25m/7lTfZaivsTwrGed1J9kdFN9duHsqdHSDAALY4pDEkOGo2H0RRydeBja58RlgolrB+PmM06/dGL0pr91AEIOGWe0KN9y+crnb966vrI4f14AmLlF+cKqd3/0hU8O+h/slAdbe2ubhw82d197YXmvv3T7M3sb2weDL6QAAMZZlGgopVxvVy/fKi/fuvbNL5ZSVksp33+t/OLbz2/sVv94vL+2dfC3D3fXHu2sbeytbfgWKwAYtkDRcKLlVvXianlxdfn1u8ulXC/ls02PCADmlDV+ACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACDSbnoAl8Yffvlm00OABdLr9Uopd+7caXogwFNmGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAIBI1e/3mx4DAHAJmGkAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgMj/AG3eWrE4NG7oAAAAAElFTkSuQmCC"
                                 height="200"
                 width="700"
                 margin="0 auto"/>
@@ -1077,7 +1077,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAJY0lEQVR4nO3db2zcdR3A8e/9a7te6dgYjK6DjR2QBTL+OCQBgn94oGiMChqNfxNDwEfyQBMfGJ8hRIPRGB+YaNQnxoARURNFIiQyBBdDycAgbqRMGD22MTZW1r/Xu58PmpRatvazttv1eq/Xg6XX+9366SW33/t+399vl8uyLAEALCTf7AEAgNYgGgCAENEAAISIBgAgRDQAACGiAQAIafdoqFQqp/rmSe+a51EAsLq1ezTMY3BwcMG71AMA7aPdo2FwcHDOjr9SqcyTCwDQtorNHuBsuO/nz8z5zrfuuG7BR83Uw+yqmPnOTG3M3DunP5QHAKtMW0TDSweGa7XazM1SqTQ0NNTf3x957JwDD7NvTlfC7KWKU20JAKtAuyxPjM6SUqpWqzN3zT5CsOCePt4BigGAVaZdomHRppMicsJjfEsAaEVtsTyxRLPPbIgch4hsCQAtp12iobu7e557Z1YoFrzMMnKmQnxLAGghbRENt91SqQ4NLe6x8X2/SgBgdWuLaPj4+7aktGVxj53/QsrZ97rkEoDVLZdlWbNnAABagKsnAIAQ0QAAhIgGACBENAAAIS1/9YQLFmCF8yKFljD7YsBTbdPa0eAzomCF8yKFlhB8bVqeAM4giQArX7zmW/tIAwCwdMFlRNEAnHGRtVKgiYLLiKIBOONm/gFyTgO0NOc0AAAhogE4g2YvlAKtruU/sMol4LDCeZHCyhd8nbZ8NAAAZ4flCQAgRDQAACGiAQAIEQ0AQIhoAABCRAMAELJKomFgYKDZIwDzqVar1Wq12VMA81lwZ7pKogEAONNEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQEix2QMsm5/+dk+zRwBOaWRkJKVULh9u9iC0i7s+fU2zR1iFVk80/OWp/c0eAYCV4srKhpuu3dzsKVYbyxMAQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQEix2QOcxIla2vXqyJ5Dk4dHGo2UejtyV5xXunlr90U9hWaPBgDtawVFQ1YbS/Xxpw51/Ozx1/4zVViztty3JlfM56pvT+3+77G9e6c+e8sl26YOd52/udmTAkA7WrZoqFQqKaXBwcFF/w3Hnn74maefv/f4zSfyhTt3PHSoePnfRj9XyGXHJ2vp+MjfXx89L71yY1/p8sODvVe+f7nGBgCC3omG6b3+jMHBwUqlEoyA+JbzOPDEnv6XHn7wwgdzF2S1rLR9/z3n9oyWcxONyVrn8Ejt0LHctouvuuKZ/f96sze7JuXWLvHHAbC6zdmvpaW9syXNOdIw59k8m09u1phaX9g7Wi4MN4qF8VzjwOQfnv3w0Q3nf3vjfd1T44UTo8V6/ScPPX/Hrf2VK19sTDya7/rMWZsNgBalEpbXfFdPTDfa7D+nv5gxZ7PZX7x7g3d/PdvYvt0j+/Zm9ZTVUzaRiufk1157wx/7v37OkaPF6hu1A0NjB6v1t9/a9Y9HcoW+xondS/y1AYDTFTqnYWb1Yc4yxPTN2QsZ828wzyrG6Et7psZTPp/ytZSNp/GjxR8d3PDckTdyKdVHj9fHx+sjR2/YednWzZdm9c5//nrXjXcv6dcGoB3MfqfqqMPS/V80nOrJPQtP9MTxsdpk6iimRjE78GT9+/kP7St1lwqHphr5Qm04GzuWTYwee3lv5YLXch3X7znSe+OZHgiAFjdn57Usp9+1ufnOaTipU60vzG/B0yrz526cmEiFQkqNtHFL/v4NT/zg5R2l7vSR64Yef7XvT4931k4c33H92NSb5fza39z+ng8uYgYAYClO+5LLxWXagssTa6++aWw8X8g3uvIpX0r1Y1P3bH62Ntr4/QM9e4s9uVoae3v0zk/uGx+tj714bvmCjy1iBgBgKZb030gv7qjDSa3pv6RzyxUjI7nJsdSopWI++8VzvR999OJ7D/a98Eq9MH7kSzccK492vfVk+cU/d43lLlqunwvAarWMOymmnd6RhumjBbNvRjaYOcAwz8GGXD5/2V137/7aV1PK9WRZZyN9/vLhWyujuw52r+mo31KZ2LilfuTpXGM8t/f1TR+4eudpjQ1AG1pwn8XpymVZ1uwZ3vHv73335Qd+2dWTK5dTV2cqdqRcKeWLKd+Vsnqqj6euzo2bvvnj7u1XzXngwMDAvb96tSkzA7ACfePL773pWh87cHoGBgZ27pzvbfkK+uyJWq3W+4Uvdhw6MvnXR2oT9a7u1NmZisVUKKRcLh0aKU0W1l36nftzWy5r9qQA0I5WUDSUSqV169b13/GVF7ZdknvssYkD+7uHJ/OlfL6jmJ23vnb1jv5P3HbhtkpHR0ezJwWAdrSCoiGlVC6Xt2/fvnXr1uFP3X706NHR4eFco1Hq6Vm/fn1vb293d3epVGr2jADQplZWNKSUCoVCuVwul8t9fX3NngUAeMeSLrkEANqHaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAEBIsdkDLJvf/fC2Zo8AnFK1Wk0pbdq0qdmDAIvnSAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABCSy7Ks2TMAAC3AkQYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAIT8DwgEvECVe3CZAAAAAElFTkSuQmCC"
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAJZUlEQVR4nO3db2zcdR3A8e/96fqXbcF2/2GME8IfJ47BErIEBZIBxhgxxqgJ+oBgTIyS6AMT4zOEJxqNPjHR6CPjf0BJFH1AoozJonRhKJkbKRNGj+6PK+vWa7vr3c8HNaWWrf2s3Xa93uv1YLnr/W779JLb793f9/fr5bIsSwAA88k3egAAoDmIBgAgRDQAACGiAQAIEQ0AQIhoAABCWj0aSqXS+b54zofmeBYALG+tHg1zGBgYmPch9QBA62j1aBgYGJi14y+VSnPkAgC0rGKjB7gcHv/xi7O+8vWHbpv3WdP1MLMqpr8yXRvTj87qD+UBwDLTEtHw6pGRarU6fbetrW1wcHDjxo2R58468DDz7lQlzFyqON+WALAMtMryRGWGlFK5XJ5+aOYRgnn39PEOUAwALDOtEg0LNpUUkRMe41sCQDNqieWJRZp5ZkPkOERkSwBoOq0SDV1dXXM8Or1CMe9llpEzFeJbAkATaYloeODuUnlwcGHPje/7VQIAy1tLRMNH79yc0uaFPXfuCylnPuqSSwCWt1yWZY2eAQBoAq6eAABCRAMAECIaAIAQ0QAAhDT91RMuWIAlzpsUmsLMiwHPt01zR4PPiIIlzpsUmkLwvWl5AriEJAIsffGab+4jDQDA4gWXEUUDcMlF1kqBBgouI4oG4JKb/g/IOQ3Q1JzTAACEiAbgEpq5UAo0u6b/wCqXgMMS500KS1/wfdr00QAAXB6WJwCAENEAAISIBgAgRDQAACGiAQAIEQ0AQMgyiYb+/v5GjwDMpVwul8vlRk8BzGXenekyiQYA4FITDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACHFRg9w0fzwNy81egTgvEZHR1NK3d3HGj0IreLzn/hAo0dYhpZPNPxxz+FGjwDAUnFzqXfntk2NnmK5sTwBAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAIQUGz3AOZyZTLtfH903dPZ4pV5PaeWK3I1XFu/c0n1VT6HRowFA61pC0ZBVx9JkZc+xjh89++a/Jgudq7rXd+aK+Vz59OTef48fOvTWJ+/aUqod7ei7qtGTAkArumjRUCqVUkoDAwML/huG9zz59z37Hz/9wTP5wsNbnzhavP7PlU8Xctmps9V0avT5tyrvSa+PrW+7/tjhlTffebHGBgCC3omGqb3+tIGBgVKpFIyA+JZzOLJ7/6ZDT/1y3a9za7Jq1nbD4UdX91S6cxP1s9X2kdHq0eHctVe//6YXD798YmV2S8qtWuQ/B8DyNmu/lhb3ky1p1pGGWa/m5Xxxs/rklfmDle7CSL1YGM/Vj5z93b57T/b2fWPt412T44UzlWKt9oMnXn7ovo2l9x2oTzyT7/jUZZsNgCalEi6uua6emGq0mX9O3Zg2a7OZN969wbtvzzR28IXRQwezWspqKZtIxSvyq7bd8fTGr1xx4mSxfLx6ZHBsqFw7/fZzLzyTK6yvnd67yG8bALhQoXMaplcfZi1DTN2duZAx9wZzrGKMvvrS5HjK51O+mrLxNH6y+L2h3v0njudSqlVO1cbHa6Mn79h+3TWb3pvV2v/28+d3fnlR3zYArWDmT6qOOize/0XD+V7cy/BCnx0Zq55NK4qpXsyO7K59O7/rUFtXW+HoZD1fqI5kY8PZRGX4tYOlNW/mVuzYf2Llzks9EABNbtbO66Kcftfi5jqn4ZzOt74wt3lPq8yvXjcxkQqFlOpp7eb8t3r/8p3XtrZ1pftvG3z2jfW/f7a9eubU1h1jk//pzq/61cdvvWsBMwAAi3HBl1wuLNPmXZ5YdcvOsfF8IV/vyKd8W6oNTz66aV+1Uv/tL3oOFnty1TR2uvLwxw6NV2pjB1Z3r/nIAmYAABZjUb9GemFHHc6pc+OW9qtvGB3NnR1L9Woq5rOf7F/54T9d/djQ+lderxXGTzx4x3B3pePt3d0H/tAxlvP7nQCYx0XcSTHlwo40TB0tmHk3ssH0AYY5Djbk8vnrHn5k7yNfSCnXk2Xt9fSZ60fuK1WeG+rqXFG7uzSxdnPtxF9z9fHcwfKGD92y/YLGBqAFzbvP4kLlsixr9Az/U6/X//HNRwef+tmKnlx3d+poT8UVKdeW8sWU70hZLdXGU3uxb/3Xvt9z07ZZz+3v73/sp280ZGwAlqCvfvb2nds2NXqKJtPf3799+1w/li+hz56oVqsT997/1j8PrHvlpepE6uhK7e2pWEyFQsrl0tFK20i1s/uLX+pdf02jJwWAVrSEoqFYLG65dsvxzz249+nVfftfXnN8eHUxy7VlWTFf6ew5tnbLFffcc+Ot23t6eho9KQC0oiUUDYVCoa+vb9euXTt27BgaGiqXyyPDb6fJyY5VK69at+72det6e3s7OzsbPSYAtKglFA1T2tra+vr6+vr6tm7d2uhZAIB3LOqSSwCgdYgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhBQbPcBF8+R3H2j0CMB5lcvllNKGDRsaPQiwcI40AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIbksyxo9AwDQBBxpAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAyH8Bzj7E5PJetLgAAAAASUVORK5CYII="
                                 height="200"
                 width="700"
                 margin="0 auto"/>
@@ -1147,7 +1147,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAJeUlEQVR4nO3dXWyddR3A8f95a7ue0rHxMrqCGztAFsgAHSEBgy9cKBqjDo3GtwtDwCu58MIL4x1CNBiJ8cJEo94YA0ZATRSJkMgQXAwlA4O4kTJh7LCNsbGyvp6e83gxUw7d1v7ouj097edzsbR9nuf037OcPd/+/8+zU8iyLAEAzKeY9wAAgM4gGgCAENEAAISIBgAgRDQAACGiAQAIEQ2nq1arneqLJ900x1EAsJSJhjNoeHh43k3qAYBOIRpO1/Dw8KwTf61WmyMXAKBDlfMeQGe45xfPzPrKd267bt6jZuqhvSpmvjJTGzNbZ/WH8gBgSRENIS/tHWk0GjOfViqVffv2DQ4ORo6dNfHQ/unxSmhfqjjVngCQO8sTUWNtUkr1en1mU/sMwbxn+ngHKAYAlhTRcMYdT4rIBY/xPQHg7LM8cTa0X9kQmYeI7AkAZ5loiOrt7Z1j68wKxby3WUauVIjvCQBnjWgI2XZzrb5v38KOjZ/7VQIAS5loCPn0hzaktGFhx859I2X7VrdcArCUFbIsy3sMAEAHcPcEABAiGgCAENEAAISIBgAgxN0TJ3k3KeBs8hqEpaD9Vr5T7bPSo8F7REG+vAZhKQi+9CxPAHmSCJC7eKyv9JkGACC4SigagPxFFlOBMye4SigagPzN/AvlmgZYylzTAACEiAYgT+0rqcAS5w2r3CMOOfMahNwFX4aiAQAIsTwBAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRMP/DQ0N5T0EWNHq9Xq9Xs97FLCizXsqFA0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACCnnPYAl5Ge/25n3EGDlGh0dTSlVqwfzHgjLzR2fvzbvISwfouEdf3lqT95DAGCRiYZFZHkCAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgp5z2AM+JYI21/dXTngamDo61WSv1dhSvPq9y0sfeSvlLeQwOATrWsoiFrjKfmxFMHun7++Gv/mS6tWl0dWFUoFwv1t6d3/PfIrl3TX7z50k3TB3suuDjvkQJA51m0aKjVaiml4eHhxXrABTjy9MPPPP383UdvOlYs3b7lwQPlK/429qVSITs61UhHR//++th56ZUbBypXHBzuv+rDOY4TADrRO9Fw/Kw/Y3h4uFarBSMgvuepDm//vnPvM8c32vvEzsGXHn7gogcKF2aNrLJ5z13n9o1VC5OtqUb3yGjjwJHCpvddfeUze/71Zn92bSqsXvCAAeggs05wKe9fcTvXu2YaZj2JZ+c5nRUcJ+2PSJRkrem1pV1j1dJIq1yaKLT2Tv3h2Y8fPv+C7667p3d6onRsrNxs/vTB52+7ZbB21YutyUeLPV9Y/B8GgCVJJSyKue6eOJ5m7X8e/2DGrN3aPzhxhxM/Pm7ev8jgNMb47h2ju3dlzZQ1UzaZyucUV7//hj8OfuucQ4fL9Tcae/eN7683335r+z8eKZQGWsd2zPuAAEC70DUNM6ftk84KtC9kzL3DglcxIusXYy/tnJ5IxWIqNlI2kSYOl3+8//znDr1RSKk5drQ5MdEcPXzD1ss3XnxZ1uz+52+233jnAgYCQEeKnEeY17ui4VTP6Vl4fue+ZGHe9YuU0uTR8cZU6iqnVjnb+2Tzh8WP7a70VkoHplvFUmMkGz+STY4deXlX7cLXCl3X7zzUf+MZ+kkAWGJmnTVO8zq8lWyuaxpO6sT1hYh5pxlmNi3477J47rrJyVQqpdRK6zYU7z3/iR+9vKXSmz5x3b7HXx340+PdjWNHt1w/Pv1mtbj6t7d+4KML+BYAsJK951suF7y+cDrLExGrr/ng+ESxVGz1FFOxkppHpu+6+NnGWOv39/ftKvcVGmn87bHbP7t7Yqw5/uK51Qs/dYaGAQDL1Wn9N9ILm3UIPsh7ffBVg5d2b7hydLQwNZ5ajVQuZr98rv+Tj77v7v0DL7zSLE0c+toNR6pjPW89WX3xzz3jhUtOf+QAdIRFOVuR3utMw/HZgvZPIzvMTDCcdLJhYY95okKxePkdd+745jdSKvRlWXcrffmKkVtqY9v3967qat5cm1y3oXno6UJrorDr9fUfuWbre/rBAehcwfMI8ypkWZb3GBbTv3/w/Zfv/1VPX6FaTT3dqdyVCpVULKdiT8qaqTmRerrXrf/2T3o3Xz3rwKGhobt//WouYwbgzHnovm15D6FjDA0Nbd061y/Vy+q9JxqNRv9Xvtp14NDUXx9pTDZ7elN3dyqXU6mUCoV0YLQyVVpz2ffuLWy4PO+RAkDnWVbRUKlU1qxZM3jb11/YdGnhsccm9+7pHZkqVorFrnJ23trGNVsGP7Ptok21rq6uvEcKAJ1nWUVDSqlarW7evHnjxo0jn7v18OHDYyMjhVar0te3du3a/v7+3t7eSqWS9xgBoCMtt2hIKZVKpWq1Wq1WBwYG8h4LACwfp3XLJQCwcogGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhJTzHsAS8tB92/IeAqxc9Xo9pbR+/fq8BwKckpkGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgpJBlWd5jAAA6gJkGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACE/A8SGO4FFaNKsAAAAABJRU5ErkJggg=="
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAJeklEQVR4nO3dXWyddR3A8f956frKtmC7V2CMIwTQiTBcQkhQIBlgjBFjjJoQLwjGxCiJNybGO4QbjURvTDR6ZXwHlETRCxJlTBalhKFkbqRMGD10L66sW0/bnZ7zeFFTSre1v3Xdnp7287lYenqe5/Tf05w93/7/z9NTyLIsAQDMp5j3AACA1iAaAIAQ0QAAhIgGACBENAAAIaIBAAgRDReqUqmc65NnvWuOvQBgKRMNF9HAwMC8d6kHAFqFaLhQAwMDsw78lUpljlwAgBZVznsAreGxn7w46zPffPDWefearoeZVTH9menamL53Vn8oDwCWFNEQ8tqhkXq9Pn2zra1tcHBw8+bNkX1nTTzMvDlVCTOXKs61JQDkzvJEVG2GlFK1Wp2+a+YMwbxH+ngHKAYAlhTRcNFNJUXkhMf4lgBw6VmeuBRmntkQmYeIbAkAl5hoiOrq6prj3ukVinkvs4ycqRDfEgAuGdEQcv9dlerg4ML2jR/7VQIAS5loCPnkHVtS2rKwfee+kHLmvS65BGApK2RZlvcYAIAW4OoJACBENAAAIaIBAAgRDQBAiKsnzvJuUsCl5DUIS8HMS/nOtc1KjwbvEQX58hqEpSD40rM8AeRJIkDu4rG+0mcaAIDgKqFoAPIXWUwFLp7gKqFoAPI3/T+UcxpgKXNOAwAQIhqAPM1cSQWWOG9Y5RpxyJnXIOQu+DIUDQBAiOUJACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhr+r7+/P+8hwIpWrVar1Wreo4AVbd5DoWgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQEg57wEsIT/67ct5DwFWrtHR0ZRSd/eRvAfCcvOlz3w47yEsH6LhXX/afTDvIQCwyETDIrI8AQCEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACElPMewEVxajLtemP0paHTR2vNZkqrVxVuuLx8x9buK3tKeQ8NAFrVsoqGrD6WJmu7j3T8+Nm3/j1Z6lzTvbGzUC4Wqicn9/xn/MCBtz9759ZK43BH35V5jxQAWs+iRUOlUkkpDQwMLNYDLsDw7if/sXvvYyc/eqpYemjbE4fL1/2l9vlSITtxup5OjD7/du196Y2xjW3XHTm4+gN35DhOAGhF70bD1FF/2sDAQKVSCUZAfMtz7T7z6869zRxf6NCuvVcceOpXG35TWJfVs7brDz6ytqfWXZhonq63j4zWDw8XrrnqQze+ePCVY6uzm1JhzYIHDEALmXWAS3n/itu63jPTMOtJvDTP6azgOGt/RKIka05eXtxf6y6NNMul8ULz0Onfv3TP8d6+b61/rGtyvHSqVm40fvjEKw/eu7nywX3NiWeKHZ9b/G8GgCVJJSyKua6emEqzmf9OfTBt1mYzPzhzgzM/njLvDzI4jTG2/4XRA/uzRsoaKZtI5cuKa26+7enNX7/s2PFy9Wj90ODYULVx8p3nXnimUNrYOLln3gcEAGYKndMwfdg+66zAzIWMuTdY8CpGZP1i9LWXJ8dTsZiK9ZSNp/Hj5e8P9e49drSQUqN2ojE+3hg9ftv2a6++4v1Zo/3vv3j+9q8tYCAAtKTIcYR5vScazvWcXoLnd+5TFuZdv0gpnR4Zq59Oq8qpWc4O7Wp8t7jzQFtXW+nwZLNYqo9kY8PZRG349f2VdW8VVu3Ye2z17RfpOwFgiZl11LjA8/BWsrnOaTirM9cXIuadZpi+a8E/y+LaDRMTqVRKqZnWbyl+p/ev33t9W1tXuu/WwWff3PiHZ9vrp05s2zE2+d/u4ppff/qWOxfwJQBgJTvvSy4XvL5wIcsTEWtuun1svFgqNjuKqdiWGsOTj1zxUr3W/N0ve/aXewr1NHay9tCnDozXGmP71nav+8RFGgYALFcX9GekFzbrEHyQ833wzs1b26+6fnS0cHosNeupXMx+unf1x/981aNDG199o1EaP/bAbcPdtY53dnXv+2PHWMHfdwJYKRblaEU635mGqdmCmTcjG0xPMJx1smFhj3mmQrF47UMP73n4yykVerKsvZm+cN3IvZXac0Ndnasad1Um1m9pHPtboTle2F/d9LGbtp/XNw5A6woeR5hXIcuyvMewaJrN5j+//cjgUz9f1VPo7k4d7am8KhXaUrGcih0pa6TGeGov9238xg96brx51r79/f2P/uzNXIYNwMXz5OP35z2EltHf3799+1y/VC+r956o1+sT99z39r/2bXj15fpE6uhK7e2pXE6lUioU0uFa20i9s/srX+3deHXeIwWA1rOsoqFcLm+9ZuvRLz6w5+m1fXtfWXd0eG05K7RlWblY6+w5sn7rZXfffcMt23t6evIeKQC0nmUVDaVSqa+vb+fOnTt27BgaGqpWqyPD76TJyY41q6/csOEjGzb09vZ2dnbmPUwAaEnLKhqmtLW19fX19fX1bdu2Le+xAMDycUGXXAIAK4doAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQEg57wEsIU8+fn/eQ4CVq1qtppQ2bdqU90CAczLTAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhBSyLMt7DABACzDTAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAkP8Bnez2qXnvWqEAAAAASUVORK5CYII="
                                 height="200"
                 width="700"
                 margin="0 auto"/>
@@ -1285,7 +1285,7 @@
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAHRUlEQVR4nO3dTW9cVwHH4TPjGSeZhAgKKiSRKNVsAgKpSEjseFuwQkiVkPgASKxZInZsgB0rNkjwAaqqa74AKxqpEiogkykR1KPSxG5JFePYToeFy83N+O1fe+w7d+Z5FtbMnbejiSb353Pu9XQmk0kBADhJt+kBAADtIBoAgIhoAAAiogEAiIgGACAiGgCAiGhIDYfDozYeetMxjwKANhINMzAajU68ST0A0HaiITUajaZ2/MPh8JhcAIAF02t6APPlF797fWrLz370tRMfVdVDvSqqLVVtVLdO9YfyAKAVRMMz/v6vh7u7u9XVfr+/vr5+69at5LFTEw/1q/uVUF+qOOqeADC3LE9M26oppYzH4+qm+gzBiXv6vAMUAwCtIBpmZj8pkgMe83sCwPywPDFL9SMbknmI5J4AMCdEw7TBYHDMrdUKxYmnWSZHKuT3BIDGiYZnvPyd4Xh9/XSPzff9KgGANhINz/j+N14o5YXTPfb4EynrtzrlEoA26kwmk6bHAAC0gLMnAICIaAAAIqIBAIiIBgAgskRnTzhhAeaHzyPMm/opfkfdZ1miwXdEwfzweYR5E34MLU8AF00iwFzJw31ZZhoAgKOEK4aiAWhGsoAKXIxwxVA0AM2o/ldyTAO0hWMaAICIaAAuWn31FGiRJfrCKueFw/zweYS5En4klygaAICzsDwBAEREAwAQEQ0AQEQ0AAAR0QAAREQDABBZumi4c+dO00MAPjIej8fjcdOjAD5y4i5y6aIBADgd0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApNf0ABrw21ffaHoIQCmlPHr0qJRy9eq7TQ+EhfXjH7zU9BAWyjJGwx/++I+mhwDARRANs2V5AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCI9JoewMw8mUw2t8u99/bWNvfuvrt99/7WX/69s7bx+IOf3256aACwCFoZDbsfTh5sd95+f3dtc+/e5s6XPtN7ffz49396/8Gjvb0nT5oeHQAspvOKhuFwOBqNzuOZv/qb9fF/Hm9uPe2Dn37z029t7rzz8PF5vBwAsO9pNEzt5g+9en4pkHvj7YfNDgCAFhkOh1NbGt+RtdfHm2nwRgPQOnZes/L07In9iYT9y9W8Qv1q+X+vVT/3Vc8wrDlm49StBy8ffBIAoHGnPKahvk5x6MpFFRbHLHmc+MwAcHb130LtYs7ilNFwlje9KoyDP5OHf+/2tdWVTq/2Bya+/LlLz19bKaUMVrurK51SSnel9+Hk1AMEYHFM7Vz8anoWh0RD9YY2cuRjtSxy1OsO+p39C91O53K/c7nXubba3Vrt3rzeL6X0uqV0Ot1Lg263c2FjBoBl8Ew01I9jqDTSDce87it//mBqyycvr6w92Hntzfr2jerSL7/1xfMYJAAsm0P+jHR9V326XDjxGMb6HMacnMkJwEJyWP0MzeyPO9VnKepLDB/38JP6k+Sv3vMdGgAc5hR7Io4yHQ0H382DEw9T96muHjpFcdQ/z1HzGf45AZgte5ZZad9v6Lc/e/X6ldU2jhwAWq19X1j11598/r97k3e2yr3NnbWNJ/c2tl+60d8pK89/Yqf+hRQAwGy1LxpKKVd6nRevlxevX/r2F0opg1LKD79SfvXd5x5sd/753u7a5t5b97fv3t/62/2duxs7zQ4VABZGK6PhUP1u58ag3Bj0v36rX8qVUj7V9IgAYKE4MgAAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiPSaHkADXvv1y00PASillPF4XEq5efNm0wMBImYaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgEhnMpk0PQYAoAXMNAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBA5H+XniDkbEkn1gAAAABJRU5ErkJggg=="
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAHV0lEQVR4nO3dz2ukdwHH8e8zmWS72XXBCmu7i9QyIBVKURB6qz8uehIKXjwLnj2KNy/qzZMXQfAs4slD/4FexIWCQpe0o4tuhrpNstqaNJtf4yHr7JPJr0+TSZ55Mq/XIZt55teXCbPPO9/v82Sq4XBYAABO02l6AABAO4gGACAiGgCAiGgAACKiAQCIiAYAICIaUr1e77iNR151wr0AoI1EwwT0+/1Tr1IPALSdaEj1+/2xHX+v1zshFwDgiuk2PYDp8rPf/Hlsy09+8LVT7zWqh3pVjLaMamN07Vh/KA8AWkE0HPDePz/a3t4eXZyfn19eXr57925y37GJh/rF/UqoL1Ucd0sAmFqWJ8Zt1JRSBoPB6Kr6DMGpe/q8AxQDAK0gGiZmPymSAx7zWwLA9LA8MUn1IxuSeYjklgAwJUTDuMXFxROuHa1QnHqaZXKkQn5LAGicaDjgzW/1BsvLZ7tvvu9XCQC0kWg44LtvvFTKS2e778knUtavdcolAG1UDYfDpscAALSAsycAgIhoAAAiogEAiIgGACAyQ2dPOGEBpof3I0yb+il+x91mVqLBZ0TB9PB+hGkTvg0tTwCXTSLAVMnDfVZmGgCA44QrhqIBaEaygApcjnDFUDQAzRj9r+SYBmgLxzQAABHRAFy2+uop0CIz9IFVzguH6eH9CFMlfEvOUDQAAOdheQIAiIgGACAiGgCAiGgAACKiAQCIiAYAIDJz0XDv3r2mhwA8NRgMBoNB06MAnjp1Fzlz0QAAnI1oAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACDSbXoADfj1799peghAKaWsr6+XUm7ceNT0QLiyfvi9rzQ9hCtlFqPhrbf/3vQQALgMomGyLE8AABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJFu0wOYmN3hcG2zevB4e2lt5/1Hm0uPNu5/uLW08uTjn77S9NAA4CpoZTRs7w1XNquH/96+v7rzYPXJq7fn//TwyW/vPV5Z393Z3W16dABwNV1UNPR6vX6/fxGP/NVfDR4+3lj7ZG9v72kf/Pjrn3t/deuDj7Yu4ukAgH3PomFsN3/kxYtLgdw7D//T7AAAaJFerze2pfEdWXt9upkGLzQArWPnNSnPzp7Yn0jY/340r1C/WP7fa6Ov+0aP0Ks5YePYtYe/P/wgAEDjznhMQ32d4siVi1FYnLDkceojA8D51X8LtYs5jzNGw3le9FFhHP6a3P07X7rxXLdamKtKKXvDUkp59YVrt2/OdarS7VQ3r3U6VSml7JVOqaozDxKAq2Fs5+JX0/M4IhpGL2gjRz6OlkWOe95b154tqTzXrRYXOovznYW56vbNbiml26k6VelUpbOw2OnOXc6YAWAWHIiG+nEMI410wwnP+7u/fDy25fnrc3/915M/3v/vwc1r+//8/BtfvohBAsCsOeLPSNd31WfLhVOPYazPYUxkPmN/tQIAxjisfoIm9sed6rMU9SWGT3v4Sf1B8mfvaAYAjnKGPRHHGY+Gw6/m4YmHsduMLh45RXHcj+e4+Qw/TgAmy55lUtr3KZevfP7mresLbRw5ALRa+z6w6t0ffeGTneEHG+XB2tbS6u6D1c3XXpjfGs7d/szWyvrO6AMpAIDJal80lFKud6uXb5WXb1375hdLKYullO+/Vn7x7edXNqt/PN5eWtv524ebS482lla2llZ8ihUATEYro+FI853qxcXy4uL863fnS7leymebHhEAXCmODAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIt2mB9CAP/zyzaaHAJRSymAwKKXcuXOn6YEAETMNAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQKQaDodNjwEAaAEzDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQ+R9XuCH5N6C8aAAAAABJRU5ErkJggg=="
                                 height="200"
                 width="700"
                 margin="0 auto"/>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index 54f8ef015b..92b703b31c 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
index f9e416485f..68fa0feeb8 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
@@ -12,10 +12,13 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth />
 				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -108,17 +122,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -143,10 +146,13 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -156,13 +162,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -198,6 +209,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -239,17 +256,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -274,12 +280,15 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -298,7 +307,14 @@
 				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Status user</customVariablePageName4>
@@ -309,11 +325,7 @@
 						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -321,7 +333,12 @@
 				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Language</customVariablePageName1>
@@ -336,9 +353,7 @@
 						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -348,13 +363,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -369,7 +389,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>this keyword should be ranked</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;source=web&amp;cd=1&amp;ved=0CB4QFjAA&amp;url=http://piwik.org/&amp;rct=j&amp;q=this keyword should be ranked&amp;ei=V8WfTePkKKLfiALrpZWGAw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -390,6 +410,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -435,16 +461,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index f9e416485f..68fa0feeb8 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -12,10 +12,13 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth />
 				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -108,17 +122,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -143,10 +146,13 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -156,13 +162,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -198,6 +209,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -239,17 +256,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -274,12 +280,15 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -298,7 +307,14 @@
 				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Status user</customVariablePageName4>
@@ -309,11 +325,7 @@
 						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -321,7 +333,12 @@
 				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Language</customVariablePageName1>
@@ -336,9 +353,7 @@
 						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -348,13 +363,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -369,7 +389,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>this keyword should be ranked</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;source=web&amp;cd=1&amp;ved=0CB4QFjAA&amp;url=http://piwik.org/&amp;rct=j&amp;q=this keyword should be ranked&amp;ei=V8WfTePkKKLfiALrpZWGAw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -390,6 +410,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -435,16 +461,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index df5bcc5ceb..6f59d16f8f 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -1,55 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	
 	<totalVisits>2</totalVisits>
 	<totalVisitDuration>361</totalVisitDuration>
 	<totalActions>2</totalActions>
-	<totalEvents>0</totalEvents>
 	<totalOutlinks>1</totalOutlinks>
 	<totalDownloads>0</totalDownloads>
 	<totalSearches>0</totalSearches>
 	<totalPageViews>1</totalPageViews>
+	<totalUniquePageViews>1</totalUniquePageViews>
+	<totalRevisitedPages>0</totalRevisitedPages>
 	<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
+	<searches>
+	</searches>
 	<totalGoalConversions>1</totalGoalConversions>
 	<totalConversionsByGoal>
 		<row idgoal="1">1</row>
 	</totalConversionsByGoal>
+	<totalEvents>0</totalEvents>
 	<hasLatLong>0</hasLatLong>
 	<totalRevenueByGoal>
 		<row idgoal="1">1000</row>
 	</totalRevenueByGoal>
-	<searches>
-	</searches>
-	<continents>
-		<row>
-			<continent>eur</continent>
-			<nb_visits>2</nb_visits>
-			<prettyName>Europe</prettyName>
-		</row>
-	</continents>
-	<countries>
-		<row>
-			<country>fr</country>
-			<nb_visits>2</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
-			<prettyName>France</prettyName>
-		</row>
-	</countries>
-	<totalVisitDurationPretty>6 min 1s</totalVisitDurationPretty>
-	<firstVisit>
-		
-		
-		
-		<referrerType>campaign</referrerType>
-		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
-	</firstVisit>
-	<lastVisit>
-		
-		
-		
-		<referrerType>campaign</referrerType>
-		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
-	</lastVisit>
-	<visitsAggregated>2</visitsAggregated>
 	<lastVisits>
 		<row>
 			<idSite>1</idSite>
@@ -63,10 +35,13 @@
 					<pageTitle />
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>5</pageId>
+					<bandwidth />
 					<interactionPosition />
 					<icon>plugins/Morpheus/images/link.png</icon>
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -76,13 +51,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -118,6 +98,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
@@ -159,17 +145,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -194,10 +169,13 @@
 					<pageTitle>Homepage</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>4</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>1</goalConversions>
@@ -207,13 +185,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>1</visitConverted>
 			<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -249,6 +232,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
@@ -290,21 +279,79 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 	</lastVisits>
-	<userId>0</userId>
-	
 	
 	
+	<totalVisitDurationPretty>6 min 1s</totalVisitDurationPretty>
+	<userId>0</userId>
+	<firstVisit>
+		
+		
+		
+		<referrerType>campaign</referrerType>
+		<referrerUrl />
+		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
+	</firstVisit>
+	<lastVisit>
+		
+		
+		
+		<referrerType>campaign</referrerType>
+		<referrerUrl />
+		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
+	</lastVisit>
+	<visitsAggregated>2</visitsAggregated>
+	<visitedPages>
+		<row key="http://example.org/homepage">1</row>
+	</visitedPages>
+	<devices>
+		<Desktop>
+			<count>2</count>
+			<icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>2</count>
+				</row>
+			</devices>
+		</Desktop>
+	</devices>
+	<continents>
+		<row>
+			<continent>eur</continent>
+			<nb_visits>2</nb_visits>
+			<prettyName>Europe</prettyName>
+		</row>
+	</continents>
+	<countries>
+		<row>
+			<country>fr</country>
+			<nb_visits>2</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
+			<prettyName>France</prettyName>
+		</row>
+	</countries>
+	<customVariables>
+		<visit>
+			<row>
+				<name>VisitorType</name>
+				<values>
+					<row>
+						<value>LoggedOut</value>
+						<count>2</count>
+					</row>
+				</values>
+			</row>
+			<row>
+				<name>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</name>
+				<values>
+					<row>
+						<value>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</value>
+						<count>2</count>
+					</row>
+				</values>
+			</row>
+		</visit>
+	</customVariables>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml
index f9e416485f..68fa0feeb8 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml
@@ -12,10 +12,13 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth />
 				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -108,17 +122,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -143,10 +146,13 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -156,13 +162,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -198,6 +209,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -239,17 +256,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -274,12 +280,15 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -298,7 +307,14 @@
 				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Status user</customVariablePageName4>
@@ -309,11 +325,7 @@
 						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -321,7 +333,12 @@
 				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Language</customVariablePageName1>
@@ -336,9 +353,7 @@
 						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -348,13 +363,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -369,7 +389,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>this keyword should be ranked</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;source=web&amp;cd=1&amp;ved=0CB4QFjAA&amp;url=http://piwik.org/&amp;rct=j&amp;q=this keyword should be ranked&amp;ei=V8WfTePkKKLfiALrpZWGAw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -390,6 +410,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -435,16 +461,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml
index f9e416485f..68fa0feeb8 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml
@@ -12,10 +12,13 @@
 				<pageTitle />
 				<pageIdAction>6</pageIdAction>
 				
+				
 				<pageId>5</pageId>
+				<bandwidth />
 				<interactionPosition />
 				<icon>plugins/Morpheus/images/link.png</icon>
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -25,13 +28,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -67,6 +75,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -108,17 +122,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -143,10 +146,13 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>4</pageId>
+				<bandwidth />
 				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -156,13 +162,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -198,6 +209,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -239,17 +256,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -274,12 +280,15 @@
 				<pageTitle>Homepage</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
-				<interactionPosition>1</interactionPosition>
+				<bandwidth />
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
+				<interactionPosition>1</interactionPosition>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>goal</type>
@@ -298,7 +307,14 @@
 				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>2</pageId>
+				<bandwidth />
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<interactionPosition>2</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName4>Status user</customVariablePageName4>
@@ -309,11 +325,7 @@
 						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
-				<interactionPosition>2</interactionPosition>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
 				<type>action</type>
@@ -321,7 +333,12 @@
 				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
+				
 				<pageId>3</pageId>
+				<bandwidth />
+				<interactionPosition>3</interactionPosition>
+				<icon />
+				
 				<customVariables>
 					<row>
 						<customVariablePageName1>Language</customVariablePageName1>
@@ -336,9 +353,7 @@
 						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -348,13 +363,18 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -369,7 +389,7 @@
 		<referrerName>Google</referrerName>
 		<referrerKeyword>this keyword should be ranked</referrerKeyword>
 		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerUrl>http://www.google.com/url?sa=t&amp;source=web&amp;cd=1&amp;ved=0CB4QFjAA&amp;url=http://piwik.org/&amp;rct=j&amp;q=this keyword should be ranked&amp;ei=V8WfTePkKKLfiALrpZWGAw&amp;usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&amp;sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<languageCode>fr</languageCode>
@@ -390,6 +410,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -435,16 +461,5 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
index df5bcc5ceb..6f59d16f8f 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
@@ -1,55 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	
 	<totalVisits>2</totalVisits>
 	<totalVisitDuration>361</totalVisitDuration>
 	<totalActions>2</totalActions>
-	<totalEvents>0</totalEvents>
 	<totalOutlinks>1</totalOutlinks>
 	<totalDownloads>0</totalDownloads>
 	<totalSearches>0</totalSearches>
 	<totalPageViews>1</totalPageViews>
+	<totalUniquePageViews>1</totalUniquePageViews>
+	<totalRevisitedPages>0</totalRevisitedPages>
 	<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
+	<searches>
+	</searches>
 	<totalGoalConversions>1</totalGoalConversions>
 	<totalConversionsByGoal>
 		<row idgoal="1">1</row>
 	</totalConversionsByGoal>
+	<totalEvents>0</totalEvents>
 	<hasLatLong>0</hasLatLong>
 	<totalRevenueByGoal>
 		<row idgoal="1">1000</row>
 	</totalRevenueByGoal>
-	<searches>
-	</searches>
-	<continents>
-		<row>
-			<continent>eur</continent>
-			<nb_visits>2</nb_visits>
-			<prettyName>Europe</prettyName>
-		</row>
-	</continents>
-	<countries>
-		<row>
-			<country>fr</country>
-			<nb_visits>2</nb_visits>
-			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
-			<prettyName>France</prettyName>
-		</row>
-	</countries>
-	<totalVisitDurationPretty>6 min 1s</totalVisitDurationPretty>
-	<firstVisit>
-		
-		
-		
-		<referrerType>campaign</referrerType>
-		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
-	</firstVisit>
-	<lastVisit>
-		
-		
-		
-		<referrerType>campaign</referrerType>
-		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
-	</lastVisit>
-	<visitsAggregated>2</visitsAggregated>
 	<lastVisits>
 		<row>
 			<idSite>1</idSite>
@@ -63,10 +35,13 @@
 					<pageTitle />
 					<pageIdAction>6</pageIdAction>
 					
+					
 					<pageId>5</pageId>
+					<bandwidth />
 					<interactionPosition />
 					<icon>plugins/Morpheus/images/link.png</icon>
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -76,13 +51,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
 			<visitConvertedIcon />
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -118,6 +98,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
@@ -159,17 +145,6 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 		<row>
 			<idSite>1</idSite>
@@ -194,10 +169,13 @@
 					<pageTitle>Homepage</pageTitle>
 					<pageIdAction>2</pageIdAction>
 					
+					
 					<pageId>4</pageId>
+					<bandwidth />
 					<interactionPosition>1</interactionPosition>
 					<icon />
 					
+					<bandwidth_pretty>0 M</bandwidth_pretty>
 				</row>
 			</actionDetails>
 			<goalConversions>1</goalConversions>
@@ -207,13 +185,18 @@
 			
 			
 			
+			
+			
+			
+			
+			
+			
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>1</visitConverted>
 			<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 			<visitCount>1</visitCount>
-			
 			<visitEcommerceStatus>none</visitEcommerceStatus>
 			<visitEcommerceStatusIcon />
 			<daysSinceFirstVisit>0</daysSinceFirstVisit>
@@ -249,6 +232,12 @@
 			<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
+			<totalEcommerceRevenue>0</totalEcommerceRevenue>
+			<totalEcommerceConversions>0</totalEcommerceConversions>
+			<totalEcommerceItems>0</totalEcommerceItems>
+			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+			<totalAbandonedCarts>0</totalAbandonedCarts>
+			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 			<events>0</events>
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
@@ -290,21 +279,79 @@
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			
-			
-			
-			
-			
-			<totalEcommerceRevenue>0</totalEcommerceRevenue>
-			<totalEcommerceConversions>0</totalEcommerceConversions>
-			<totalEcommerceItems>0</totalEcommerceItems>
-			<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-			<totalAbandonedCarts>0</totalAbandonedCarts>
-			<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		</row>
 	</lastVisits>
-	<userId>0</userId>
-	
 	
 	
+	<totalVisitDurationPretty>6 min 1s</totalVisitDurationPretty>
+	<userId>0</userId>
+	<firstVisit>
+		
+		
+		
+		<referrerType>campaign</referrerType>
+		<referrerUrl />
+		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
+	</firstVisit>
+	<lastVisit>
+		
+		
+		
+		<referrerType>campaign</referrerType>
+		<referrerUrl />
+		<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
+	</lastVisit>
+	<visitsAggregated>2</visitsAggregated>
+	<visitedPages>
+		<row key="http://example.org/homepage">1</row>
+	</visitedPages>
+	<devices>
+		<Desktop>
+			<count>2</count>
+			<icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon>
+			<devices>
+				<row>
+					<name>Unknown</name>
+					<count>2</count>
+				</row>
+			</devices>
+		</Desktop>
+	</devices>
+	<continents>
+		<row>
+			<continent>eur</continent>
+			<nb_visits>2</nb_visits>
+			<prettyName>Europe</prettyName>
+		</row>
+	</continents>
+	<countries>
+		<row>
+			<country>fr</country>
+			<nb_visits>2</nb_visits>
+			<flag>plugins/Morpheus/icons/dist/flags/fr.png</flag>
+			<prettyName>France</prettyName>
+		</row>
+	</countries>
+	<customVariables>
+		<visit>
+			<row>
+				<name>VisitorType</name>
+				<values>
+					<row>
+						<value>LoggedOut</value>
+						<count>2</count>
+					</row>
+				</values>
+			</row>
+			<row>
+				<name>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</name>
+				<values>
+					<row>
+						<value>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</value>
+						<count>2</count>
+					</row>
+				</values>
+			</row>
+		</visit>
+	</customVariables>
 </result>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
index fc3b19e165..773ccd9532 100644
--- a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
+++ b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3c4e5fd742348492ca86f4409f9cbf9371221cd2d7198919e22ac72501fb49f
-size 467356
+oid sha256:d56c62a6f297a7866d9ea336e95c53d5ef51f301a35f5f8c5142498190b0a287
+size 481935
diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png
index df2c731a99..5ac6209265 100644
--- a/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c6d41eed07679db507039b41e64fce5642e088ad84515c86b4c33cbe72d8792
-size 367005
+oid sha256:0fdeb09d9b6425fbca2575f59bfc2a833075e8efdbf2979a4aa490ba6a1b89c1
+size 367116
diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index ff309ef54d..574141e42a 100644
--- a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62ffe7dcbec7a3ead69c8e0207626fce141e4b11c08a893a4b776a420f7bc871
-size 538373
+oid sha256:449f425cc77004078f3f3c09728711b8a30feeb392a9579d6bd1c107eb758cff
+size 538472
diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png
index 361fb00ce1..5993bf020a 100644
--- a/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6895c2be1eda5182ad1af3399e3568ed1c18232fd128782da34e77a375b4f562
-size 537986
+oid sha256:bbeb35ce3e9a2838c7c94a0b472cb85d28085b34a6617f08706fd6317e34ca87
+size 538089
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
index 4977052015..dabf8d83a0 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8b3052ed220a9ae9e545542b63266be0dd46d5a8b1038c41a64f9a5b2006dff
-size 285366
+oid sha256:af4ed3243c4aeb8f8bf6810fe315d347d02d814be510c564620e512d66d61904
+size 285441
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index a21b21832b..a259f28be4 100644
--- a/tests/UI/expected-screenshots/Theme_home.png
+++ b/tests/UI/expected-screenshots/Theme_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24cdccb593c6ba67d2cc860c4158b5aedc330a0f7ac2c217b504d5102f12152a
-size 536808
+oid sha256:2e6fdd9eb56716700d3b1bae0fd0678385447ffd3fe117bf06ed9861c7136ff6
+size 537059
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index fcc21e542a..4ded8a1ed4 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e031150dc2301b35ef6152bad026b8e46de58268560c8c73127c7f0ef87c2884
-size 488287
+oid sha256:40a21bd01fc8adbb2843749b6d501fb6703aa3848adc2551b1db45f796496933
+size 488237
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
index b0e4bc66d1..f6fe7f0843 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c40d0c035178428f43c16012a48aba6b9c212228a523c83d862192508d100df3
-size 1441332
+oid sha256:b299c3b8f869d00c4c5c706b6bc07131cf10ba38139e4d87196cbfc0a1c5bd42
+size 1497267
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
index 93b6f70d28..798b3cee5e 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e8bac31646c54e6bf3addbe0286b6f16245a83e3a09558a07d1289cabb27e06
-size 428512
+oid sha256:46ca26af9215104bf2dff118462ecf6db5447e0577b368d9d6c0116a14ea8e54
+size 428797
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
index ee8f18da7b..ca52688032 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54d5a5bf44ada674991c3ae24e94641cefbb5e44612b27faa454e7ed556eaf13
-size 448409
+oid sha256:e30af083d154a5a3125f4037610d36c8ada3ab4ce67e75d12c4f0ca8535d5707
+size 472701
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
index f450918005..78946b9d5a 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e23745bddadefed522e96fe8cf5dc52b9212edf5fd2167b5158839824b01892
-size 56223
+oid sha256:c3ff7a55a5685ed4056623e165c5ae301edd5fcd0dedfb18197c137d3f427fba
+size 60885
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
index 80b7468a87..b6383bf1af 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46ae4e1a6f608ebdd704c81597571d7641b21bb3e7262f5b266e07a990763e56
-size 97011
+oid sha256:0cf9245e77cc1e4f6e46a84ad258ab0fad70a6742a92cdae3204ab45ff4229e2
+size 97107
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
index 8d1a585afa..20b7d4c291 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da0c046486ba3267e744047e9e8ca98d9a452f8ac6dc1214f1478e0ee6052315
-size 794021
+oid sha256:a9e1dbebb762226c741d620cc316c40c8f166da87b321aa0f3ddf2796dc8c1d5
+size 733576
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
index 188bcf0d0d..37b38ffd5a 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b167ae0aa509eed89f1b9fa1104573d808ec0775338bd8e778c9382a5764f36d
-size 243601
+oid sha256:62cd7d868c9c1815abba501c7ed77a91c4ca0c09c45718ec2213c6a91bc79f38
+size 188330
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png
index 8db5369088..54691afddb 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3ea993fb905140ec9e37c9c8668469415ef0a8c876ffd3f2d01ee52e1f579c8
-size 93832
+oid sha256:1be626ec7d6c0fd1ef7d42e8ed870053a9b08e2c8e4e34da4f2174b613e84d1e
+size 93807
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
index 2beb08cbc3..918743c31f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cac417b09917b065ff27f3ace234ccc537e2c99aca6d375c3456f84cfd9d0eeb
-size 113169
+oid sha256:d523d13853c0e82e7f6339dff2e2c424ce341dc04ebc8cbf467a629779393fde
+size 113163
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png
index be2dca4560..6639f86941 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be0e3980058d3e261dbf6e02fcda32f9794ace4f9955926dab5099180f7d1aed
-size 161089
+oid sha256:cb7aafe4c5e9f3425b4a2103e7ac102e276e66c15a7accc946bdafa3198a2107
+size 161150
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png
index 4440cc5798..dfb544f60f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf2276f3d97d6a06769672b8daea66634a55d4e3791669b9421560c61cc42b01
-size 107714
+oid sha256:8dc82f3e55494e00ce628b64f12ad7d058b52c6138794ae7d144a7e4f7f84c4c
+size 105563
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
index f4a15eebb3..8de89faa1f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:028f3354d882d0ac8291f81e67e64d8e841ca1b9dbd6a68ae473ae7ce06b7b3b
-size 442772
+oid sha256:b13666a16d8bd8593fd4292bd786781ffbe3ddba5f1baaa56e202bf0b2bf953c
+size 451458
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
index aff97fe1f0..d89211bd12 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:216cb48f4299ef58d9c9c2995ce1cbdbda9d2089811b0d96e9aa90eb09a04236
-size 627627
+oid sha256:15b25e9c9e55e0ac897dbd23ef2fe0529fadf9cacd98012f8b03c024fa49fbb1
+size 688840
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
index 8711e209ad..84d8036766 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e205ef29771a9bd531351d66ee207f7e301893e4d9b214d1be49ced93669b622
-size 65037
+oid sha256:9bea7aa77b14b5f33a6180abb6e1791e3dd2bc7e668c8157eb1a64a24ceafb61
+size 66050
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
index bae3187e57..88313f60e3 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a1e26b90b295ae91ca7a830822862758fa1e3197aa0b958635895cfeac1b2ef
-size 71028
+oid sha256:b7579b4d9bcf75eb18d9aadb91541a716087088ca4dc2f2485a0bda294356e08
+size 71508
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png
index 8eeb243a0e..0aa5456715 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03e6dced21f3097b4da767b4c148f25bd2f95a6f4a0470845b655700d8c0e437
-size 38735
+oid sha256:967b6adf1b7f51b671200860c4626eb913e11ab5314f6044a614e12262fb6cb5
+size 38787
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
index 81a7ba915f..9b4e00c8be 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fddef92dd6c82ab2b30d9dfe5b390021d26f96fd6820838a6ab79a860dbd6ca
-size 70794
+oid sha256:63023d24fadff099ede1fc04ac0cf80e62e096e66cfa62788fb3c96e91a4131c
+size 71043
diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js
index 261a40e06e..1e2008c3a2 100644
--- a/tests/UI/specs/Dashboard_spec.js
+++ b/tests/UI/specs/Dashboard_spec.js
@@ -197,6 +197,11 @@ describe("Dashboard", function () {
             page.click('.dashboard-manager .title');
             page.click('li[data-action=resetDashboard]');
             page.click('.modal.open .modal-footer a:contains(Yes)', 4000);
+            page.evaluate(function(){
+                $('#widgetReferrersgetReferrerType').hide();
+                $('#widgetReferrersgetReferrerType').offsetHeight;
+                $('#widgetReferrersgetReferrerType').show();
+            }, 100);
             page.mouseMove('.dashboard-manager');
         }, done);
     });
diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js
index 42115a8d79..40e77752ff 100644
--- a/tests/lib/screenshot-testing/support/app.js
+++ b/tests/lib/screenshot-testing/support/app.js
@@ -142,7 +142,7 @@ Application.prototype.loadTestModules = function () {
         // we apply this option only if not a specific plugin or test suite was requested. Only there for travis to
         // split tests into multiple jobs.
         var numTestsFirstHalf = Math.round(mocha.suite.suites.length / 2);
-        numTestsFirstHalf += 8;
+        numTestsFirstHalf += 10;
         mocha.suite.suites = mocha.suite.suites.filter(function (suite, index) {
             if (options['run-first-half-only'] && index < numTestsFirstHalf) {
                 return true;
diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css
index bda7f2a260..4a148e4fd9 100644
--- a/tests/resources/screenshot-override/override.css
+++ b/tests/resources/screenshot-override/override.css
@@ -2,10 +2,6 @@
     visibility: hidden;
 }
 
-.visitor-profile-widget-link>strong {
-    display:none;
-}
-
 .visitor-profile-important-visits>div>div>p:first-child {
     display:none;
 }