diff --git a/.gitattributes b/.gitattributes
index 4ada93025c7b31ac339a7345a90ddbefa980a61f..6c1aa0c906264ffa6c3be35bb17cde3e9fae7b0e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-tests/UI/expected-screenshots/*.png filter=lfs diff=lfs merge=lfs -crlf
+tests/UI/expected-screenshots/*.png filter=lfs diff=lfs merge=lfs
 
 # auto detect text files and perform LF normalization
 * text eol=lf
diff --git a/.travis.yml b/.travis.yml
index 8ece4388a1756befadf5f3d93cde03fe83941a08..6afdbe50fa71f8711072290f92b65e4ed64ff64c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,8 +102,8 @@ install:
 
   # travis now complains about this failing 9 times out of 10, so removing it
   #- travis_retry composer self-update
-  - '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install' 
- 
+
+  - '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install'
 
 
 before_script:
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
index 3ae44e1e2e092261b14aaa9c7b1a12a60a43b6f8..2dcd87cc62702df62dde78155d5d872c24b994a0 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png and b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
index ca5cfe5a66f4a1c8362f1c36df003b375702abf6..c9ef9d4405dd76cadd8c97a0e918ea518ce64252 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png and b/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
index 0319ffe93e6fc458ac1b4f2b1ec5cc8ea1bdd66f..12350faf691e621d0c391ffad6124225c5df664b 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png and b/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
index 457e3717a8c379f92cf9e70b4e2e9f8b2d87dbfc..3db5b5a6c73d5991712d27450047d0a142ea24fe 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_flattened.png and b/tests/UI/expected-screenshots/ActionsDataTable_flattened.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/tests/UI/expected-screenshots/ActionsDataTable_initial.png
index d4a6fb500d10ecf7923d9fdb8384a3f4ea60e9b9..a467d07fb610c9e4fb3e5f5fad8e3410ab88630b 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_initial.png and b/tests/UI/expected-screenshots/ActionsDataTable_initial.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
index 239f3cebb77d853ddfc93aad2c26aee2699f2157..281556b6f9d5c06f1965b7f74ea01799b213175a 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png and b/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_search.png b/tests/UI/expected-screenshots/ActionsDataTable_search.png
index 78a8270a7503e178cdca1dba74253faa901615f2..adf644bfa0572b7a99cf6c842d61da53b8d496e8 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_search.png and b/tests/UI/expected-screenshots/ActionsDataTable_search.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
index 328dd19b7bf9112cfd45b783d2a11bbe62cf0669..e393f732b7eb8e489d38a0bb642d2a5719cd50ea 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png and b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
index bcf9f77b766ed8da0a68b748d1ff916790d428fb..220723a4bd193c8adfdeda5bd0497068f0c2a376 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png and b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
index dd7f82ca5b5e774c1bb46a049a1b7d2a35a7ff6e..30492939ed0b47deb44431452f0291a53beab01a 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png and b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
index 8d99a58bf84556b08b3e64bb00a0134dda657f39..10b6bd31ab27336931c8469ac69fbe7c94657e2f 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png and b/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png differ
diff --git a/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
index 1927bfffdd8fe6c68e4c89717493692a26c86263..7121d9a1db8e656a31413ec003d3c42d3b94edad 100644
Binary files a/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png and b/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png differ
diff --git a/tests/UI/expected-screenshots/BarGraph_load.png b/tests/UI/expected-screenshots/BarGraph_load.png
index 6e95a4dec79613fbb44b150cdc95f02410cea7b1..50cbfdc5a3dc4b96646913d203f9a71e2a6b776e 100644
Binary files a/tests/UI/expected-screenshots/BarGraph_load.png and b/tests/UI/expected-screenshots/BarGraph_load.png differ
diff --git a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png
index 96cde07334a12afa4c0d239a8441265d0b61b360..65938172644f3ca0619542ddb07ddf5540de916c 100644
Binary files a/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png and b/tests/UI/expected-screenshots/BarGraph_metric_picker_shown.png differ
diff --git a/tests/UI/expected-screenshots/BarGraph_other_metric.png b/tests/UI/expected-screenshots/BarGraph_other_metric.png
index 7b99c9b04765b433a9de8fe885f2a78d9e29be9c..4688d60c5b1880639191abf44521c0320c2dc00e 100644
Binary files a/tests/UI/expected-screenshots/BarGraph_other_metric.png and b/tests/UI/expected-screenshots/BarGraph_other_metric.png differ
diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png
index 8e9fddb75be2fc60506b8b251251195bd9767fb4..ab726cc5c5f50437ccbd3ba1375faedb2fc12fad 100644
Binary files a/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png and b/tests/UI/expected-screenshots/CoreUpdaterCode_httpUpdateSuccess.png differ
diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png b/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png
index 258f4639d3974d5a98f0ddaf73c6215338c527ec..23c20ee89a7106e2b14fd3823a9c8279624939f8 100644
Binary files a/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png and b/tests/UI/expected-screenshots/CoreUpdaterCode_httpsUpdateFail.png differ
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageCSV.txt b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageCSV.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9197a7572d7d5e5108eeea4a0eb5483816cbfad3
--- /dev/null
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageCSV.txt
@@ -0,0 +1 @@
+Error: Database Upgrade Required. Your Piwik database is out-of-date, and must be upgraded before you can continue.
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageJSON.txt b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageJSON.txt
new file mode 100644
index 0000000000000000000000000000000000000000..75d504da6a3950bb6b4b62dde4cd99ff84b66102
--- /dev/null
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageJSON.txt
@@ -0,0 +1 @@
+{"result":"error","message":"Database Upgrade Required. Your Piwik database is out-of-date, and must be upgraded before you can continue."}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessagePHP.txt b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessagePHP.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5834ed03dea9022d1634fc7954826f0fe9e377c1
--- /dev/null
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessagePHP.txt
@@ -0,0 +1 @@
+a:2:{s:6:"result";s:5:"error";s:7:"message";s:108:"Database Upgrade Required. Your Piwik database is out-of-date, and must be upgraded before you can continue.";}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageTSV.txt b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageTSV.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9197a7572d7d5e5108eeea4a0eb5483816cbfad3
--- /dev/null
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageTSV.txt
@@ -0,0 +1 @@
+Error: Database Upgrade Required. Your Piwik database is out-of-date, and must be upgraded before you can continue.
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageXML.txt b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageXML.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b929a52c5bf263593f5b42f470c8eb3d4c36a91d
--- /dev/null
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_CoreUpdater.API.ErrorMessageXML.txt
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<error message="Database Upgrade Required. Your Piwik database is out-of-date, and must be upgraded before you can continue." />
+</result>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png
index f6bc84438ce525111c3484a9243e791dce74d26d..bfb51966c5866aceec450e3ae14b0e6c77c558ea 100644
Binary files a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png and b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png differ
diff --git a/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png b/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c95f6ecbdbc30e0a52adc04dc2e65f5699d7397
Binary files /dev/null and b/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png differ
diff --git a/tests/UI/expected-screenshots/DBStats_admin_page.png b/tests/UI/expected-screenshots/DBStats_admin_page.png
index 6ebd75673953bd6369943e28e49a7834e2847217..cbaef7162ca079a178e9ff23c0ed8bf986bd2ff8 100644
Binary files a/tests/UI/expected-screenshots/DBStats_admin_page.png and b/tests/UI/expected-screenshots/DBStats_admin_page.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..e36639ec0e44a5f04041d17c03133a99d344a73b
Binary files /dev/null and b/tests/UI/expected-screenshots/DashboardManager_create_new.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_expanded.png b/tests/UI/expected-screenshots/DashboardManager_expanded.png
index c9349457cea1c5055c280f1cf3e89d693e3374de..33b9dad5964ed6aff5c00b61701ce3a593977a4a 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_expanded.png and b/tests/UI/expected-screenshots/DashboardManager_expanded.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_loaded.png b/tests/UI/expected-screenshots/DashboardManager_loaded.png
index 6e4c7e1d8ddb7afe6c698bbd98a7d089974507ed..41e3e4fc10d7d2d980899b1abaee1e70bcdff795 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_loaded.png and b/tests/UI/expected-screenshots/DashboardManager_loaded.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1d9246f493770c5a31fa098fb712738d16b36c3
Binary files /dev/null and b/tests/UI/expected-screenshots/DashboardManager_removed.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
index c6c80105e31cd822874aef048e71ff2fa30cb15f..e941e2ff47129721093bc40e75a925be098e7a08 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png and b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
index 5a85e2b601258a214d4c543f5e6ad72ad5d82780..b2ad71483dcfb5754d3af00228e1ccce0de8ea29 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png and b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_selected.png b/tests/UI/expected-screenshots/DashboardManager_widget_selected.png
index 6e4c7e1d8ddb7afe6c698bbd98a7d089974507ed..41e3e4fc10d7d2d980899b1abaee1e70bcdff795 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_widget_selected.png and b/tests/UI/expected-screenshots/DashboardManager_widget_selected.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_change_layout.png b/tests/UI/expected-screenshots/Dashboard_change_layout.png
index 110b9b646ac9d85638ed66041c54dfecb7878332..09c219b92068642ddd3e6be6285eb9dda296d073 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_change_layout.png and b/tests/UI/expected-screenshots/Dashboard_change_layout.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_copied.png b/tests/UI/expected-screenshots/Dashboard_copied.png
index c159f6a333c2aab4442129fcf78db9003b0fc142..b2b669cd093b1fe92e2a7199e4135c34ebe4c8b3 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_copied.png and b/tests/UI/expected-screenshots/Dashboard_copied.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_create_new.png b/tests/UI/expected-screenshots/Dashboard_create_new.png
index ca258e747e7754dd13a1db9af0dcf12418744745..1e998c1c6a6ec49a4e6d530703c424644d02734d 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_create_new.png and b/tests/UI/expected-screenshots/Dashboard_create_new.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png b/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png
index 6b80bb0d020cd2020aafe0e5fe5fb97e9fb37a80..ccb079cc6eabd33a717680958fc7264d5be32dce 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png and b/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_loaded.png b/tests/UI/expected-screenshots/Dashboard_loaded.png
index e4a2d0f1475640dfc68c69d98302fcff1af160aa..f0fe3f27aba6ce02b9bc7c1cbb8e4a4fbe8f76cd 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_loaded.png and b/tests/UI/expected-screenshots/Dashboard_loaded.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png
index 5cde7e7695fe5038aef04076cbdd168569567ca2..78f32fda5b680c53b793c108295be14fcd891a73 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_removed.png and b/tests/UI/expected-screenshots/Dashboard_removed.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_rename.png b/tests/UI/expected-screenshots/Dashboard_rename.png
index 6b80bb0d020cd2020aafe0e5fe5fb97e9fb37a80..25df3e3057076bc1e870a9e675a9285c1f986134 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_rename.png and b/tests/UI/expected-screenshots/Dashboard_rename.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png
index 96fdcd18f0cee87a52ee4d11bae2e3f7ae56682c..0e0ada8bd5bda7da61a5a231d23a9f3f749386be 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_reset.png and b/tests/UI/expected-screenshots/Dashboard_reset.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
index 5d0cdbcb57a3960b223e6d6637ea194f254a4d3a..b70cb9ee053b1f0a7cdc93793e501b2dd91aa55d 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png and b/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
index 69a62e0f60a07ce5decce70987d4f0f2c2635ca5..a07d7afac4bff91005ba56a9aac5322b99200efd 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_maximise.png and b/tests/UI/expected-screenshots/Dashboard_widget_maximise.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_minimised.png b/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
index c1a1b1abef2ac2331c932d8e15090a5e874d36a4..24fcd1b022a7ebb131b1bfd3ac50743b615b3b0f 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_minimised.png and b/tests/UI/expected-screenshots/Dashboard_widget_minimised.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_move.png b/tests/UI/expected-screenshots/Dashboard_widget_move.png
index ff5c631c1d5339c84412d3087f0f2c4d00c0e9ec..aa7b0fafd25b4a1438e7a0b04a3adc32d46dcda5 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_move.png and b/tests/UI/expected-screenshots/Dashboard_widget_move.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png b/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5f69d77893ae2a65b3118b3307b0582580d788
Binary files /dev/null and b/tests/UI/expected-screenshots/Dashboard_widget_move_refresh.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png b/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5f69d77893ae2a65b3118b3307b0582580d788
Binary files /dev/null and b/tests/UI/expected-screenshots/Dashboard_widget_move_removed.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png b/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5f69d77893ae2a65b3118b3307b0582580d788
Binary files /dev/null and b/tests/UI/expected-screenshots/Dashboard_widget_move_unmaximise.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png b/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5f69d77893ae2a65b3118b3307b0582580d788
Binary files /dev/null and b/tests/UI/expected-screenshots/Dashboard_widget_move_unminimised.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_refresh.png b/tests/UI/expected-screenshots/Dashboard_widget_refresh.png
index ff5c631c1d5339c84412d3087f0f2c4d00c0e9ec..f0403ba35d1514b0272d80bbc7e379876140af14 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_refresh.png and b/tests/UI/expected-screenshots/Dashboard_widget_refresh.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_removed.png b/tests/UI/expected-screenshots/Dashboard_widget_removed.png
index ff5c631c1d5339c84412d3087f0f2c4d00c0e9ec..f0403ba35d1514b0272d80bbc7e379876140af14 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_removed.png and b/tests/UI/expected-screenshots/Dashboard_widget_removed.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png b/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
index ff5c631c1d5339c84412d3087f0f2c4d00c0e9ec..f0403ba35d1514b0272d80bbc7e379876140af14 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png and b/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_unminimised.png b/tests/UI/expected-screenshots/Dashboard_widget_unminimised.png
index ff5c631c1d5339c84412d3087f0f2c4d00c0e9ec..f0403ba35d1514b0272d80bbc7e379876140af14 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_widget_unminimised.png and b/tests/UI/expected-screenshots/Dashboard_widget_unminimised.png differ
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
index 570d51b622cceefb771e915f67d073294cbdf563..b94f6af64a3971c2d7e99060e188d0d4e2b94ca2 100644
Binary files a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png and b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png
index ee191ec09f01b19118c4c5ca2611003679599e26..e90398fe411a6b4b91222286d4b5141188111206 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png
index 502fbe04ec6e6634deebba963b5b6575b19c080d..0e927e0ac5ae0afffa4e181a77a641b457a75648 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png
index 23043fbcdb4a3f3c810d5d7798bf120ab6dbb54d..46ba125f434f402f0b49105d3ef2c609517c7858 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png
index 6ab18268749eb26aaa682f2d53498c29377ac4aa..d7b8ef2319e75e3ce65e0b929ddbdbba87ef0240 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png
index 9fdbe7bbc425c26e8e243b2f00520eda029a3209..0d325cf38c483bb60949815019031712a7c5353a 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png
index ee191ec09f01b19118c4c5ca2611003679599e26..e90398fe411a6b4b91222286d4b5141188111206 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png
index 234e1bbff6e590676aedf08413491e7f06f7e801..fe17e579d01c0d435e9a433caa55ae420fe4d97e 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png and b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
index 72a205663aa8829c97d0c24b1fab388ea889ea5d..2e249e67883ff4d7698ec1b8e2c48c14d960b029 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png and b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_export_image.png b/tests/UI/expected-screenshots/EvolutionGraph_export_image.png
index a68da8af274c77fc9a8894ad0f47beb34f6dc9ca..2d900ab50d587fc486659f65212257fa8fc08852 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_export_image.png and b/tests/UI/expected-screenshots/EvolutionGraph_export_image.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_initial.png b/tests/UI/expected-screenshots/EvolutionGraph_initial.png
index a4b2d74dc1669471ebfc99b7bc196ac13c1814a5..fca8cd6557b4acfca9000ece5d573e6a522b6032 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_initial.png and b/tests/UI/expected-screenshots/EvolutionGraph_initial.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png b/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png
index 8f9a90803ce31ba56e64336a38b022bf843d8885..55a84f519a24d67efc0bc631ddc207a28ab188b5 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png and b/tests/UI/expected-screenshots/EvolutionGraph_label_ticks_cutout.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png b/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png
index 2e9094a46a99c19a1b2e610db028caa9d452a760..7da169bd4fe80b3fcc5f9bfb24edce49560960e3 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png and b/tests/UI/expected-screenshots/EvolutionGraph_limit_changed.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png
index c8733c83ca48300178531b7e2893eb60a355fedd..444ddadbb129f271191953634545bf0f4ee224d1 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png and b/tests/UI/expected-screenshots/EvolutionGraph_metric_picker_shown.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png
index 74094ab5ae92b2e8225e6fb9b6c43d249a9bbcc4..2a04ea4546ee476bfaf1a06766f964c05af3b871 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png and b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png
index 5b3f28b99fd75542bee6102689b0c2ddb5f19040..01c650aafb4d988ffa0ac0223c27cab6424e2b96 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png and b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_one_series.png b/tests/UI/expected-screenshots/EvolutionGraph_one_series.png
index ac313f9bc3a9bb8093313c32400a2959423c4b92..ba450c301b0ef68824efb6a8abc78e8d33b2c450 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_one_series.png and b/tests/UI/expected-screenshots/EvolutionGraph_one_series.png differ
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png b/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png
index 93e1e0d5f714c6ae33b11fdfc04d9d0919a9e465..ffde75e0b21654915df4c39290cc283b549a801d 100644
Binary files a/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png and b/tests/UI/expected-screenshots/EvolutionGraph_two_metrics.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png
index d8ff5f5fa0e2796674b7cef0fcc32c5bf8a254e3..944bdc8e13be13fcfe5695e428a6d8407fa98649 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png and b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png
index d9a13e5ffa8e9acc07be181a8c4d2182a663a3e2..ebef3d6a4bb52874a5e4540018f477c4daacf462 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png and b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png
index 4c1556f63193c6a18bd7dec21ef2e432912b4251..eea54e0262ada53e30c942fc170a184e18e48791 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png and b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png
index a000f0c59aa54cc131a714081404b3ecf0eae45b..6bef3bb9415d87e3852a76d573094e90d4829812 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png and b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png
index 96f28f86cdecbb3f799584e7bbbe7c8a374f20f5..4d00d1f48f85fd8eeca6e83d2d719e2fc09cbd18 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png and b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png differ
diff --git a/tests/UI/expected-screenshots/GoalsTable_initial.png b/tests/UI/expected-screenshots/GoalsTable_initial.png
index b8580f58926130bdccb02de9429411604ebbe7be..ed2b020b400b68c3b08784fc4a97fd04dec7034c 100644
Binary files a/tests/UI/expected-screenshots/GoalsTable_initial.png and b/tests/UI/expected-screenshots/GoalsTable_initial.png differ
diff --git a/tests/UI/expected-screenshots/Insights_initial.png b/tests/UI/expected-screenshots/Insights_initial.png
index fc6d0178a781d9b9040d55c8f9d3d7d710d29013..08b05847be9c574e14272757df35df866b963e76 100644
Binary files a/tests/UI/expected-screenshots/Insights_initial.png and b/tests/UI/expected-screenshots/Insights_initial.png differ
diff --git a/tests/UI/expected-screenshots/Installation_access_no_config.png b/tests/UI/expected-screenshots/Installation_access_no_config.png
index cc1ffcae35570e161545bbc40c4924c2ab69b240..bb980073cdc9333977793d56f0c8fcd265a023b9 100644
Binary files a/tests/UI/expected-screenshots/Installation_access_no_config.png and b/tests/UI/expected-screenshots/Installation_access_no_config.png differ
diff --git a/tests/UI/expected-screenshots/Installation_congrats.png b/tests/UI/expected-screenshots/Installation_congrats.png
index 1c65e6113b97ee8b6093708083127151610fe031..7541f0545ceab610b8f7ee7f95e5b0216fb108ff 100644
Binary files a/tests/UI/expected-screenshots/Installation_congrats.png and b/tests/UI/expected-screenshots/Installation_congrats.png differ
diff --git a/tests/UI/expected-screenshots/Installation_db_created.png b/tests/UI/expected-screenshots/Installation_db_created.png
index 9eaa642fbeb1707f00e4ba013fc854d7c1fb67d1..ab2fd5f9ddb23a90719b73d0766053aed1680a49 100644
Binary files a/tests/UI/expected-screenshots/Installation_db_created.png and b/tests/UI/expected-screenshots/Installation_db_created.png differ
diff --git a/tests/UI/expected-screenshots/Installation_db_setup_fail.png b/tests/UI/expected-screenshots/Installation_db_setup_fail.png
index 531ca2a37a32d2245cac41c1dccb9320ad6b0c2a..ed2f6a5bf3b5ba2e75e838cdeb7829a59c56b6e8 100644
Binary files a/tests/UI/expected-screenshots/Installation_db_setup_fail.png and b/tests/UI/expected-screenshots/Installation_db_setup_fail.png differ
diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png
index 9711cf71c4b6a74e22b390d135cf9793ba854307..184761834e3b4037d51e6d9bec2e8f7af803ca34 100644
Binary files a/tests/UI/expected-screenshots/Installation_js_tracking.png and b/tests/UI/expected-screenshots/Installation_js_tracking.png differ
diff --git a/tests/UI/expected-screenshots/Installation_setup_website.png b/tests/UI/expected-screenshots/Installation_setup_website.png
index fa73ae66b2cbe1497e62998df82c9220edb274b3..3dc55dfd81fb687501f67d1d6357078e629c5285 100644
Binary files a/tests/UI/expected-screenshots/Installation_setup_website.png and b/tests/UI/expected-screenshots/Installation_setup_website.png differ
diff --git a/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/tests/UI/expected-screenshots/Installation_setup_website_fail.png
index 56bbdc31052f408749f18e407912db80e12415f7..c39d25b437892619cd99288b2cbe9d45bc203d30 100644
Binary files a/tests/UI/expected-screenshots/Installation_setup_website_fail.png and b/tests/UI/expected-screenshots/Installation_setup_website_fail.png differ
diff --git a/tests/UI/expected-screenshots/Installation_superuser.png b/tests/UI/expected-screenshots/Installation_superuser.png
index 93c52650e9c72d2334f8a65aea2f0911d9ae8b5e..1ea9c20e5bf01dea708e4fcd0da9e845c50aafd0 100644
Binary files a/tests/UI/expected-screenshots/Installation_superuser.png and b/tests/UI/expected-screenshots/Installation_superuser.png differ
diff --git a/tests/UI/expected-screenshots/Installation_superuser_de.png b/tests/UI/expected-screenshots/Installation_superuser_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda3c0c5e5cf1e8f0da684b599c171eefc10091b
Binary files /dev/null and b/tests/UI/expected-screenshots/Installation_superuser_de.png differ
diff --git a/tests/UI/expected-screenshots/Installation_superuser_fail.png b/tests/UI/expected-screenshots/Installation_superuser_fail.png
index b823297f2a4803199322d0a8a317586ba42fe2b7..9277ddfcd94014b294bc1832e93543a70ce9f4ed 100644
Binary files a/tests/UI/expected-screenshots/Installation_superuser_fail.png and b/tests/UI/expected-screenshots/Installation_superuser_fail.png differ
diff --git a/tests/UI/expected-screenshots/Installation_system_check.png b/tests/UI/expected-screenshots/Installation_system_check.png
index 51e3fa83b46327e8ed61346d5641709c8ed2cdc0..e050b283dd332bc47deab922626a4f738978951b 100644
Binary files a/tests/UI/expected-screenshots/Installation_system_check.png and b/tests/UI/expected-screenshots/Installation_system_check.png differ
diff --git a/tests/UI/expected-screenshots/Login_forgot_password.png b/tests/UI/expected-screenshots/Login_forgot_password.png
index 27616afa84aee2b2b6ca8cc6ccef512605fd4a19..780719c7c0bbf383f4706dabfb4bb1b343d914b2 100644
Binary files a/tests/UI/expected-screenshots/Login_forgot_password.png and b/tests/UI/expected-screenshots/Login_forgot_password.png differ
diff --git a/tests/UI/expected-screenshots/Login_login_fail.png b/tests/UI/expected-screenshots/Login_login_fail.png
index 069ecefbc3d96346ff899320c4a8f83d604c53d7..7c02d37078ad93ddc1258f519d23c26b0b501610 100644
Binary files a/tests/UI/expected-screenshots/Login_login_fail.png and b/tests/UI/expected-screenshots/Login_login_fail.png differ
diff --git a/tests/UI/expected-screenshots/Login_login_form.png b/tests/UI/expected-screenshots/Login_login_form.png
index 4f9d8fc3d67e77514e30c326d0487628004b7792..edbf57567703bd21ea1617e6d090b3cf03a79b9b 100644
Binary files a/tests/UI/expected-screenshots/Login_login_form.png and b/tests/UI/expected-screenshots/Login_login_form.png differ
diff --git a/tests/UI/expected-screenshots/Login_logout_form.png b/tests/UI/expected-screenshots/Login_logout_form.png
index 4f9d8fc3d67e77514e30c326d0487628004b7792..edbf57567703bd21ea1617e6d090b3cf03a79b9b 100644
Binary files a/tests/UI/expected-screenshots/Login_logout_form.png and b/tests/UI/expected-screenshots/Login_logout_form.png differ
diff --git a/tests/UI/expected-screenshots/Login_password_reset.png b/tests/UI/expected-screenshots/Login_password_reset.png
index ebd1f2747c9b350d161e61bb0b8484566c7a50cc..06776da76b97a835288faf95dc3b81e0d1c09169 100644
Binary files a/tests/UI/expected-screenshots/Login_password_reset.png and b/tests/UI/expected-screenshots/Login_password_reset.png differ
diff --git a/tests/UI/expected-screenshots/Login_password_reset_complete.png b/tests/UI/expected-screenshots/Login_password_reset_complete.png
index c4301e39538fa5e7588ef5d1d5d2d6c5acf4fde6..754c18c8e660ba8a2690c2ae8d974ccf57b7b8a4 100644
Binary files a/tests/UI/expected-screenshots/Login_password_reset_complete.png and b/tests/UI/expected-screenshots/Login_password_reset_complete.png differ
diff --git a/tests/UI/expected-screenshots/Login_password_reset_error.png b/tests/UI/expected-screenshots/Login_password_reset_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..b68043cd5354477e668d7f579d5f7e98030922e6
Binary files /dev/null and b/tests/UI/expected-screenshots/Login_password_reset_error.png differ
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index 796314b8327b0548b1e35939feb7482d7b81ea1b..089bce68e89bc0262c96c0618f48417b701143f1 100644
Binary files a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png and b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png differ
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png
index a49806ece981b98644cd5d64da26905b6c352029..7d88b3840b531b543463404915d1ff8b1880fde4 100644
Binary files a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png and b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png differ
diff --git a/tests/UI/expected-screenshots/MeasurableManager_loaded.png b/tests/UI/expected-screenshots/MeasurableManager_loaded.png
index 9686e21ccdaef744f9a76a27cfbd575138e0418e..42ada720ce4ddcc9ce638d6c5639d0907bc42608 100644
Binary files a/tests/UI/expected-screenshots/MeasurableManager_loaded.png and b/tests/UI/expected-screenshots/MeasurableManager_loaded.png differ
diff --git a/tests/UI/expected-screenshots/MeasurableManager_measurable_menu_item.png b/tests/UI/expected-screenshots/MeasurableManager_measurable_menu_item.png
index bb74dd939a6a9e5bcd4ab8b8771897049d32fb58..187467df2ab05220d3ce301ab45652e3ad923874 100644
Binary files a/tests/UI/expected-screenshots/MeasurableManager_measurable_menu_item.png and b/tests/UI/expected-screenshots/MeasurableManager_measurable_menu_item.png differ
diff --git a/tests/UI/expected-screenshots/Menus_admin_changed.png b/tests/UI/expected-screenshots/Menus_admin_changed.png
index 46c22a7dd61f523d7f4fef7a5cc2b5ee4afabc06..ae80c083c5a2a34b17e3a4f7bf4f26b111f65d6c 100644
Binary files a/tests/UI/expected-screenshots/Menus_admin_changed.png and b/tests/UI/expected-screenshots/Menus_admin_changed.png differ
diff --git a/tests/UI/expected-screenshots/Menus_admin_loaded.png b/tests/UI/expected-screenshots/Menus_admin_loaded.png
index 3650afe6963debbb9b29106c8e8280331ae8dc0f..4893dedc595adc2fe3cae27f8d71369cf364db01 100644
Binary files a/tests/UI/expected-screenshots/Menus_admin_loaded.png and b/tests/UI/expected-screenshots/Menus_admin_loaded.png differ
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png b/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png
index 7e70fcb1933bb85bfdc546bf56aa3a044a708cdf..838bebbdb3ab2b70fc55cfde303c50f1acdb3a34 100644
Binary files a/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png and b/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png differ
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png b/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png
index d0e9adf443a3f445b77085482fd52c9dac769308..71c4c3ba9d91caf79a81c1cda30679bece44e713 100644
Binary files a/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png and b/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png differ
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png b/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png
index 88e2c509eb4b2e172632141426d7ea5a65f18d98..4f7072ccd3c06cf8cd360c494eea9aeeabc06b56 100644
Binary files a/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png and b/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png differ
diff --git a/tests/UI/expected-screenshots/Menus_user_changed.png b/tests/UI/expected-screenshots/Menus_user_changed.png
index f4153d8efb365431fff9aa33f4a9c7a261406c4b..5dd3b3d86c614e549ec7be54729fe0761ecb31c4 100644
Binary files a/tests/UI/expected-screenshots/Menus_user_changed.png and b/tests/UI/expected-screenshots/Menus_user_changed.png differ
diff --git a/tests/UI/expected-screenshots/Menus_user_loaded.png b/tests/UI/expected-screenshots/Menus_user_loaded.png
index f13ffc29a113d74dd6b4ff65f5d0576976ca1d93..ba75fc5620fd75443185a33ef2b3704f8ae769ea 100644
Binary files a/tests/UI/expected-screenshots/Menus_user_loaded.png and b/tests/UI/expected-screenshots/Menus_user_loaded.png differ
diff --git a/tests/UI/expected-screenshots/Morpheus_load.png b/tests/UI/expected-screenshots/Morpheus_load.png
index 86ba1c68ccfcab3e0760f4f72a27d1cc5a5564dc..2f6d3384b9a0a3936381044bb2697b2408a9f0d5 100644
Binary files a/tests/UI/expected-screenshots/Morpheus_load.png and b/tests/UI/expected-screenshots/Morpheus_load.png differ
diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index 0f7ac6a23a42d8760587b7f5795bee4717f5cb86..ca6bfcddbd9d5c65781ce2e8e3243a4dbcc1f7d5 100644
Binary files a/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png and b/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png differ
diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index 56377e926e18459ad3df3286c5ea6b1929b5aca3..7c25d71ffaba4b1d0546f722b73eebc3e28768f3 100644
Binary files a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png and b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png differ
diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index 0f7ac6a23a42d8760587b7f5795bee4717f5cb86..ca6bfcddbd9d5c65781ce2e8e3243a4dbcc1f7d5 100644
Binary files a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png and b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png differ
diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index d78e8ee124e31a4076c2ffbbf9e7cd4a3d29a83c..92dcf2edc477657988c09b0df8424553676ed02d 100644
Binary files a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png and b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_loaded.png b/tests/UI/expected-screenshots/Overlay_loaded.png
index 623f909484e58a301bf392f35cbae647dac73d8a..4bc0ef3d9b749da5f878283c62346a90c0585680 100644
Binary files a/tests/UI/expected-screenshots/Overlay_loaded.png and b/tests/UI/expected-screenshots/Overlay_loaded.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
new file mode 100644
index 0000000000000000000000000000000000000000..a96b9683924d9329f2ea697c96a18fa6660227ac
Binary files /dev/null and b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_page_change.png b/tests/UI/expected-screenshots/Overlay_page_change.png
index c130e288df53b9a8777dd4b17dc57b7b0c82ceef..6ae223e1819eb4836ad4422558956c88f2b444d5 100644
Binary files a/tests/UI/expected-screenshots/Overlay_page_change.png and b/tests/UI/expected-screenshots/Overlay_page_change.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
index 69c313b5001d8eeac631900bb351882f71bbd1da..4d97d89a8db617454a1509d19de4459d28c1835c 100644
Binary files a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png and b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_page_new_links.png b/tests/UI/expected-screenshots/Overlay_page_new_links.png
index b4dad540d66a793f47384e9e884b1132dde220a9..e7d5cf62558fe9acb8a68ad81f21e2434eee7cff 100644
Binary files a/tests/UI/expected-screenshots/Overlay_page_new_links.png and b/tests/UI/expected-screenshots/Overlay_page_new_links.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_period_change.png b/tests/UI/expected-screenshots/Overlay_period_change.png
index ed2656297cb505d7a113975b01ebbcd941071076..860f779110ec743451898706d338da211739e467 100644
Binary files a/tests/UI/expected-screenshots/Overlay_period_change.png and b/tests/UI/expected-screenshots/Overlay_period_change.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_row_evolution.png b/tests/UI/expected-screenshots/Overlay_row_evolution.png
index 96b06f2d75e79d944836c9aab771b4a76a015a10..ed346874a611d703ffc791c49d42a4e6d98fdb3d 100644
Binary files a/tests/UI/expected-screenshots/Overlay_row_evolution.png and b/tests/UI/expected-screenshots/Overlay_row_evolution.png differ
diff --git a/tests/UI/expected-screenshots/Overlay_transitions.png b/tests/UI/expected-screenshots/Overlay_transitions.png
index 7e70eb2a33634e9fdada8705791b67435b1b6729..261c5ecaa60150a94d96ec8408ced07f8aede0bb 100644
Binary files a/tests/UI/expected-screenshots/Overlay_transitions.png and b/tests/UI/expected-screenshots/Overlay_transitions.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png b/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png
index 4706e0691e6658a5b763ef72b0e7638c0ec5d0e1..4ae3b9755a8bc88ecb8f919e89a6713dfaa96f5e 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png and b/tests/UI/expected-screenshots/PeriodSelector_date_range_selected.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_day_selected.png b/tests/UI/expected-screenshots/PeriodSelector_day_selected.png
index fce9bc557d69f146c8f9bc1f6ed4aff869437a28..7cc2f18a2d54aa164504af9003b693b271396e64 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_day_selected.png and b/tests/UI/expected-screenshots/PeriodSelector_day_selected.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_expanded.png b/tests/UI/expected-screenshots/PeriodSelector_expanded.png
index c4cf2e3d1872610a9d080124331bc6aebcf6b7af..5d22402d034eb9ee59e4c989cd5bb2197a9cba52 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_expanded.png and b/tests/UI/expected-screenshots/PeriodSelector_expanded.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_loaded.png b/tests/UI/expected-screenshots/PeriodSelector_loaded.png
index 67a6dcf2a2dc51dfc5941be2f59736e096087c5b..ae1d7f2254264c0f2ee9d6611e8048e97cc00d14 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_loaded.png and b/tests/UI/expected-screenshots/PeriodSelector_loaded.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_month_changed.png b/tests/UI/expected-screenshots/PeriodSelector_month_changed.png
index 37c11484b838b442954dfa934a538625b00ce21b..998b8ba8c5d7c708821c5cf702190d94279152e4 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_month_changed.png and b/tests/UI/expected-screenshots/PeriodSelector_month_changed.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_month_selected.png b/tests/UI/expected-screenshots/PeriodSelector_month_selected.png
index a1fe5d4d65389b71d6595ef484b9f4cd845224d7..6472b3f17d1025019fab36f8e11e4b6d7dc5eb53 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_month_selected.png and b/tests/UI/expected-screenshots/PeriodSelector_month_selected.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png b/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png
index 9afeaee552b6a4efee8436ff7623dc9e36312400..cd5e7dc83a5ae78283a64e7abfc89a400bcd1e56 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png and b/tests/UI/expected-screenshots/PeriodSelector_range_picker_displayed.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_week_selected.png b/tests/UI/expected-screenshots/PeriodSelector_week_selected.png
index 02d8f371939a09540ea5a638dad4f9be3264a1e1..0e9bfc834c19ce11cee92e4cc3b9543db0c15499 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_week_selected.png and b/tests/UI/expected-screenshots/PeriodSelector_week_selected.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_year_changed.png b/tests/UI/expected-screenshots/PeriodSelector_year_changed.png
index 5acea5abef6f149ae53974c1368975486659b579..5a7bb21ec511db4926db2c3964f3c62a8e779f76 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_year_changed.png and b/tests/UI/expected-screenshots/PeriodSelector_year_changed.png differ
diff --git a/tests/UI/expected-screenshots/PeriodSelector_year_selected.png b/tests/UI/expected-screenshots/PeriodSelector_year_selected.png
index 679ffb1826599bd2c3bc369fb5cb927c57057f11..9bcbf1a9104e5723c9757dbc1ee6ac557deccc90 100644
Binary files a/tests/UI/expected-screenshots/PeriodSelector_year_selected.png and b/tests/UI/expected-screenshots/PeriodSelector_year_selected.png differ
diff --git a/tests/UI/expected-screenshots/PieGraph_load.png b/tests/UI/expected-screenshots/PieGraph_load.png
index f1b5c5c50c580744d76cf542331c81fc3d4f9ffe..b4730ba31d8341bca415b3b41ef9f5d3af425047 100644
Binary files a/tests/UI/expected-screenshots/PieGraph_load.png and b/tests/UI/expected-screenshots/PieGraph_load.png differ
diff --git a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png
index c43f701a22cfd9b8ff679d1801440cba4175b6ef..79824c6658d86d5b48e5acfd8c8feb48e01c2064 100644
Binary files a/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png and b/tests/UI/expected-screenshots/PieGraph_metric_picker_shown.png differ
diff --git a/tests/UI/expected-screenshots/PieGraph_other_metric.png b/tests/UI/expected-screenshots/PieGraph_other_metric.png
index 72b7fd01a1995b6852fe5bbd30c1aa1329bc30c3..b41e27c111b0e3e4d011a49ecc19cfc573eef6e9 100644
Binary files a/tests/UI/expected-screenshots/PieGraph_other_metric.png and b/tests/UI/expected-screenshots/PieGraph_other_metric.png differ
diff --git a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png
index 9aa9d26d7414075978cc1402b77a6673c53f6d6b..6bc47c38e2e710ee0fc7ed15d9126c4b5af41895 100644
Binary files a/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png and b/tests/UI/expected-screenshots/PieGraph_pie_segment_tooltip.png differ
diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png
index 075fc899d04a186ca53d996698ceddd9ab74f397..5fb24b79b203bf449d731543533a839d7dea8f40 100644
Binary files a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png and b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png differ
diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png
index 3900a9436cdf040bf8275eb01dcc4436dd31cbea..a723119569f4eb6e33eecd1c6fa46abb935775a2 100644
Binary files a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png and b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_initially.png b/tests/UI/expected-screenshots/QuickAccess_initially.png
new file mode 100644
index 0000000000000000000000000000000000000000..86378fb20a476bbde8cd222b01a1d7775d969ac7
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_initially.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_1.png b/tests/UI/expected-screenshots/QuickAccess_search_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a89a33cfad5894a74bb0c292086c9ec0d852278
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_search_1.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_2.png b/tests/UI/expected-screenshots/QuickAccess_search_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..095d04083aac68de6f8747a4d6e1ef40c9253d14
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_search_2.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_category.png b/tests/UI/expected-screenshots/QuickAccess_search_category.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b1e2bb5a5a75ed9070141da1fbed2ae237d87b
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_search_category.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_no_result.png b/tests/UI/expected-screenshots/QuickAccess_search_no_result.png
new file mode 100644
index 0000000000000000000000000000000000000000..63e0f98d7dae6ec31496af9d67c0a2aa1c0d0f21
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_search_no_result.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_sites.png b/tests/UI/expected-screenshots/QuickAccess_search_sites.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed4626089a541e751f52932a39c072351dca228c
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_search_sites.png differ
diff --git a/tests/UI/expected-screenshots/QuickAccess_shortcut.png b/tests/UI/expected-screenshots/QuickAccess_shortcut.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbf0b6198dcf32c1cdbd69a159ba499f634f0844
Binary files /dev/null and b/tests/UI/expected-screenshots/QuickAccess_shortcut.png differ
diff --git a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.csv.txt b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.csv.txt
index 6fa1a1b1b683580b3c09b7f7618db8f51dd88b25..2f8863f45be66d0989cb58e25c0402a92a166324 100644
--- a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.csv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.csv.txt
@@ -1,18 +1,18 @@
-Label,Visits,Actions,Maximum actions in one visit,Total time spent by visitors (in seconds),Bounces,Conversions (Goal idgoal=1),Visits with Conversions (Goal idgoal=1),Revenue (Goal idgoal=1),Conversions,Revenue,Unique visitors (daily sum),Users (daily sum),Metadata: segment
-referrer.com,9,43,7,7398,0,9,9,45,9,45,9,0,referrerName==referrer.com
-www.referrer1.com,8,12,3,28,6,8,8,40,8,40,8,0,referrerName==www.referrer1.com
-www.referrer2.com,8,12,3,28,6,8,8,40,8,40,8,0,referrerName==www.referrer2.com
-www.referrer3.com,8,12,3,28,6,8,8,40,8,40,8,0,referrerName==www.referrer3.com
-www.referrer0.com,7,7,1,28,7,7,7,35,7,35,7,0,referrerName==www.referrer0.com
-www.referrer4.com,6,6,1,24,6,6,6,30,6,30,6,0,referrerName==www.referrer4.com
-whatever0.com,4,4,1,0,4,4,4,20,4,20,3,0,referrerName==whatever0.com
-anothersite.com,2,6,5,723,1,2,2,10,2,10,2,0,referrerName==anothersite.com
-whatever1.com,2,2,1,0,2,2,2,10,2,10,2,0,referrerName==whatever1.com
-mutantregistration.com,1,1,1,1,1,1,1,5,1,5,1,0,referrerName==mutantregistration.com
-myotherreferrerwebsite.com,1,2,2,362,0,1,1,5,1,5,1,0,referrerName==myotherreferrerwebsite.com
-myreferrerwebsite.com,1,1,1,1,1,1,1,5,1,5,1,0,referrerName==myreferrerwebsite.com
-piwik.org,1,2,2,2,0,1,1,5,1,5,1,0,referrerName==piwik.org
-sn110w.snt110.mail.live.com,1,2,2,2,0,1,1,5,1,5,1,0,referrerName==sn110w.snt110.mail.live.com
-whatever.com1,1,1,1,0,1,1,1,5,1,5,1,0,referrerName==whatever.com1
-whatever3.com,1,1,1,0,1,1,1,5,1,5,1,0,referrerName==whatever3.com
-www.external.com.vn,1,8,8,2,0,1,1,5,1,5,1,0,referrerName==www.external.com.vn
\ No newline at end of file
+Label,Visits,Actions,Maximum actions in one visit,Total time spent by visitors (in seconds),Bounces,Conversions (Goal idgoal=1),Visits with Conversions (Goal idgoal=1),Revenue (Goal idgoal=1),Conversions,Revenue,Unique visitors (daily sum),Users (daily sum),Metadata: segment,Conversions (Goal idgoal=2),Visits with Conversions (Goal idgoal=2),Revenue (Goal idgoal=2)
+referrer.com,9,43,7,7398,0,21,9,105,21,105,9,0,referrerName==referrer.com,,,
+www.referrer1.com,8,12,3,2194,6,8,8,40,14,70,8,0,referrerName==www.referrer1.com,6,6,30
+www.referrer2.com,8,12,3,2194,6,8,8,40,14,70,8,0,referrerName==www.referrer2.com,6,6,30
+www.referrer3.com,8,12,3,2194,6,8,8,40,14,70,8,0,referrerName==www.referrer3.com,6,6,30
+www.referrer0.com,7,7,1,2555,7,7,7,35,14,70,7,0,referrerName==www.referrer0.com,7,7,35
+www.referrer4.com,6,6,1,2190,6,6,6,30,12,60,6,0,referrerName==www.referrer4.com,6,6,30
+whatever0.com,4,4,1,0,4,4,4,20,4,20,3,0,referrerName==whatever0.com,,,
+anothersite.com,2,6,5,723,1,4,2,20,4,20,2,0,referrerName==anothersite.com,,,
+whatever1.com,2,2,1,0,2,2,2,10,2,10,2,0,referrerName==whatever1.com,,,
+www.external.com.vn,2,7,4,1804,0,7,2,35,7,35,2,0,referrerName==www.external.com.vn,,,
+mutantregistration.com,1,1,1,1,1,1,1,5,1,5,1,0,referrerName==mutantregistration.com,,,
+myotherreferrerwebsite.com,1,2,2,362,0,2,1,10,2,10,1,0,referrerName==myotherreferrerwebsite.com,,,
+myreferrerwebsite.com,1,1,1,1,1,1,1,5,1,5,1,0,referrerName==myreferrerwebsite.com,,,
+piwik.org,1,2,2,2,0,1,1,5,1,5,1,0,referrerName==piwik.org,,,
+sn110w.snt110.mail.live.com,1,2,2,2,0,1,1,5,1,5,1,0,referrerName==sn110w.snt110.mail.live.com,,,
+whatever.com1,1,1,1,0,1,1,1,5,1,5,1,0,referrerName==whatever.com1,,,
+whatever3.com,1,1,1,0,1,1,1,5,1,5,1,0,referrerName==whatever3.com,,,
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.json.txt b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.json.txt
index 2ca773af64045bbb05b3e532099257c4b6e2fd01..3ec980d730b295d6c9894ccd6105c4f457cfb956 100644
--- a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.json.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.json.txt
@@ -1 +1 @@
-[{"label":"referrer.com","nb_visits":9,"nb_actions":43,"max_actions":7,"sum_visit_length":7398,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":9,"nb_visits_converted":9,"revenue":45}},"nb_conversions":9,"revenue":45,"sum_daily_nb_uniq_visitors":9,"sum_daily_nb_users":0,"idsubdatatable":11252,"segment":"referrerName==referrer.com","subtable":[{"label":"http:\/\/referrer.com\/Other_Page.htm","nb_visits":8,"nb_actions":36,"max_actions":5,"sum_visit_length":5776,"bounce_count":0,"nb_visits_converted":8,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0},{"label":"http:\/\/referrer.com\/page.htm?param=valuewith some spaces","nb_visits":1,"nb_actions":7,"max_actions":7,"sum_visit_length":1622,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer1.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":28,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40}},"nb_conversions":8,"revenue":40,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":11254,"segment":"referrerName==www.referrer1.com","subtable":[{"label":"http:\/\/www.referrer1.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer2.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":28,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40}},"nb_conversions":8,"revenue":40,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":11255,"segment":"referrerName==www.referrer2.com","subtable":[{"label":"http:\/\/www.referrer2.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer3.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":28,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40}},"nb_conversions":8,"revenue":40,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":11256,"segment":"referrerName==www.referrer3.com","subtable":[{"label":"http:\/\/www.referrer3.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer0.com","nb_visits":7,"nb_actions":7,"max_actions":1,"sum_visit_length":28,"bounce_count":7,"goals":{"idgoal=1":{"nb_conversions":7,"nb_visits_converted":7,"revenue":35}},"nb_conversions":7,"revenue":35,"sum_daily_nb_uniq_visitors":7,"sum_daily_nb_users":0,"idsubdatatable":11265,"segment":"referrerName==www.referrer0.com","subtable":[{"label":"http:\/\/www.referrer0.com\/theReferrerPage0.html","nb_visits":4,"nb_actions":4,"max_actions":1,"sum_visit_length":16,"bounce_count":4,"nb_visits_converted":4,"sum_daily_nb_uniq_visitors":4,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer0.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0}]},{"label":"www.referrer4.com","nb_visits":6,"nb_actions":6,"max_actions":1,"sum_visit_length":24,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30}},"nb_conversions":6,"revenue":30,"sum_daily_nb_uniq_visitors":6,"sum_daily_nb_users":0,"idsubdatatable":11266,"segment":"referrerName==www.referrer4.com","subtable":[{"label":"http:\/\/www.referrer4.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer4.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":12,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0}]},{"label":"whatever0.com","nb_visits":4,"nb_actions":4,"max_actions":1,"sum_visit_length":0,"bounce_count":4,"goals":{"idgoal=1":{"nb_conversions":4,"nb_visits_converted":4,"revenue":20}},"nb_conversions":4,"revenue":20,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0,"idsubdatatable":11253,"segment":"referrerName==whatever0.com","subtable":[{"label":"http:\/\/whatever0.com\/0","nb_visits":2,"nb_actions":2,"max_actions":1,"sum_visit_length":0,"bounce_count":2,"nb_visits_converted":2,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever0.com\/1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever0.com\/2","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"anothersite.com","nb_visits":2,"nb_actions":6,"max_actions":5,"sum_visit_length":723,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":2,"nb_visits_converted":2,"revenue":10}},"nb_conversions":2,"revenue":10,"sum_daily_nb_uniq_visitors":2,"sum_daily_nb_users":0,"idsubdatatable":11257,"segment":"referrerName==anothersite.com","subtable":[{"label":"http:\/\/anothersite.com\/whatever.html","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/anothersite.com\/whatever.html?whatever=Ato","nb_visits":1,"nb_actions":5,"max_actions":5,"sum_visit_length":722,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever1.com","nb_visits":2,"nb_actions":2,"max_actions":1,"sum_visit_length":0,"bounce_count":2,"goals":{"idgoal=1":{"nb_conversions":2,"nb_visits_converted":2,"revenue":10}},"nb_conversions":2,"revenue":10,"sum_daily_nb_uniq_visitors":2,"sum_daily_nb_users":0,"idsubdatatable":11258,"segment":"referrerName==whatever1.com","subtable":[{"label":"http:\/\/whatever1.com\/0","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever1.com\/2","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"mutantregistration.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11259,"segment":"referrerName==mutantregistration.com","subtable":[{"label":"http:\/\/mutantregistration.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"myotherreferrerwebsite.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":362,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11260,"segment":"referrerName==myotherreferrerwebsite.com","subtable":[{"label":"http:\/\/myotherreferrerwebsite.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":362,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"myreferrerwebsite.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11261,"segment":"referrerName==myreferrerwebsite.com","subtable":[{"label":"http:\/\/myreferrerwebsite.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"piwik.org","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11279,"segment":"referrerName==piwik.org","subtable":[{"label":"http:\/\/piwik.org\/contribute%","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"sn110w.snt110.mail.live.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11280,"segment":"referrerName==sn110w.snt110.mail.live.com","subtable":[{"label":"http:\/\/sn110w.snt110.mail.live.com\/mail\/InboxLight.aspx?n=184083971","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever.com1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11262,"segment":"referrerName==whatever.com1","subtable":[{"label":"http:\/\/whatever.com1\/1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever3.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11263,"segment":"referrerName==whatever3.com","subtable":[{"label":"http:\/\/whatever3.com\/3","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.external.com.vn","nb_visits":1,"nb_actions":8,"max_actions":8,"sum_visit_length":2,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11264,"segment":"referrerName==www.external.com.vn","subtable":[{"label":"http:\/\/www.external.com.vn\/referrerPage-notCounted.html","nb_visits":1,"nb_actions":8,"max_actions":8,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]}]
\ No newline at end of file
+[{"label":"referrer.com","nb_visits":9,"nb_actions":43,"max_actions":7,"sum_visit_length":7398,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":21,"nb_visits_converted":9,"revenue":105}},"nb_conversions":21,"revenue":105,"sum_daily_nb_uniq_visitors":9,"sum_daily_nb_users":0,"idsubdatatable":8,"segment":"referrerName==referrer.com","subtable":[{"label":"http:\/\/referrer.com\/Other_Page.htm","nb_visits":8,"nb_actions":36,"max_actions":5,"sum_visit_length":5776,"bounce_count":0,"nb_visits_converted":8,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0},{"label":"http:\/\/referrer.com\/page.htm?param=valuewith some spaces","nb_visits":1,"nb_actions":7,"max_actions":7,"sum_visit_length":1622,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer1.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":2194,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40},"idgoal=2":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30}},"nb_conversions":14,"revenue":70,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":5,"segment":"referrerName==www.referrer1.com","subtable":[{"label":"http:\/\/www.referrer1.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer1.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer2.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":2194,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40},"idgoal=2":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30}},"nb_conversions":14,"revenue":70,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":6,"segment":"referrerName==www.referrer2.com","subtable":[{"label":"http:\/\/www.referrer2.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer2.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer3.com","nb_visits":8,"nb_actions":12,"max_actions":3,"sum_visit_length":2194,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":8,"nb_visits_converted":8,"revenue":40},"idgoal=2":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30}},"nb_conversions":14,"revenue":70,"sum_daily_nb_uniq_visitors":8,"sum_daily_nb_users":0,"idsubdatatable":7,"segment":"referrerName==www.referrer3.com","subtable":[{"label":"http:\/\/www.referrer3.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/sub\/dir\/page1.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer3.com\/sub\/dir\/page2.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.referrer0.com","nb_visits":7,"nb_actions":7,"max_actions":1,"sum_visit_length":2555,"bounce_count":7,"goals":{"idgoal=1":{"nb_conversions":7,"nb_visits_converted":7,"revenue":35},"idgoal=2":{"nb_conversions":7,"nb_visits_converted":7,"revenue":35}},"nb_conversions":14,"revenue":70,"sum_daily_nb_uniq_visitors":7,"sum_daily_nb_users":0,"idsubdatatable":14,"segment":"referrerName==www.referrer0.com","subtable":[{"label":"http:\/\/www.referrer0.com\/theReferrerPage0.html","nb_visits":4,"nb_actions":4,"max_actions":1,"sum_visit_length":1460,"bounce_count":4,"nb_visits_converted":4,"sum_daily_nb_uniq_visitors":4,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer0.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0}]},{"label":"www.referrer4.com","nb_visits":6,"nb_actions":6,"max_actions":1,"sum_visit_length":2190,"bounce_count":6,"goals":{"idgoal=1":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30},"idgoal=2":{"nb_conversions":6,"nb_visits_converted":6,"revenue":30}},"nb_conversions":12,"revenue":60,"sum_daily_nb_uniq_visitors":6,"sum_daily_nb_users":0,"idsubdatatable":15,"segment":"referrerName==www.referrer4.com","subtable":[{"label":"http:\/\/www.referrer4.com\/theReferrerPage0.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0},{"label":"http:\/\/www.referrer4.com\/theReferrerPage1.html","nb_visits":3,"nb_actions":3,"max_actions":1,"sum_visit_length":1095,"bounce_count":3,"nb_visits_converted":3,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0}]},{"label":"whatever0.com","nb_visits":4,"nb_actions":4,"max_actions":1,"sum_visit_length":0,"bounce_count":4,"goals":{"idgoal=1":{"nb_conversions":4,"nb_visits_converted":4,"revenue":20}},"nb_conversions":4,"revenue":20,"sum_daily_nb_uniq_visitors":3,"sum_daily_nb_users":0,"idsubdatatable":2,"segment":"referrerName==whatever0.com","subtable":[{"label":"http:\/\/whatever0.com\/0","nb_visits":2,"nb_actions":2,"max_actions":1,"sum_visit_length":0,"bounce_count":2,"nb_visits_converted":2,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever0.com\/1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever0.com\/2","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"anothersite.com","nb_visits":2,"nb_actions":6,"max_actions":5,"sum_visit_length":723,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":4,"nb_visits_converted":2,"revenue":20}},"nb_conversions":4,"revenue":20,"sum_daily_nb_uniq_visitors":2,"sum_daily_nb_users":0,"idsubdatatable":13,"segment":"referrerName==anothersite.com","subtable":[{"label":"http:\/\/anothersite.com\/whatever.html","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/anothersite.com\/whatever.html?whatever=Ato","nb_visits":1,"nb_actions":5,"max_actions":5,"sum_visit_length":722,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever1.com","nb_visits":2,"nb_actions":2,"max_actions":1,"sum_visit_length":0,"bounce_count":2,"goals":{"idgoal=1":{"nb_conversions":2,"nb_visits_converted":2,"revenue":10}},"nb_conversions":2,"revenue":10,"sum_daily_nb_uniq_visitors":2,"sum_daily_nb_users":0,"idsubdatatable":3,"segment":"referrerName==whatever1.com","subtable":[{"label":"http:\/\/whatever1.com\/0","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/whatever1.com\/2","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"www.external.com.vn","nb_visits":2,"nb_actions":7,"max_actions":4,"sum_visit_length":1804,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":7,"nb_visits_converted":2,"revenue":35}},"nb_conversions":7,"revenue":35,"sum_daily_nb_uniq_visitors":2,"sum_daily_nb_users":0,"idsubdatatable":12,"segment":"referrerName==www.external.com.vn","subtable":[{"label":"http:\/\/www.external.com.vn\/referrerPage-counted.html","nb_visits":1,"nb_actions":3,"max_actions":3,"sum_visit_length":722,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0},{"label":"http:\/\/www.external.com.vn\/referrerPage-notCounted.html","nb_visits":1,"nb_actions":4,"max_actions":4,"sum_visit_length":1082,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"mutantregistration.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":9,"segment":"referrerName==mutantregistration.com","subtable":[{"label":"http:\/\/mutantregistration.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"myotherreferrerwebsite.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":362,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":2,"nb_visits_converted":1,"revenue":10}},"nb_conversions":2,"revenue":10,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":10,"segment":"referrerName==myotherreferrerwebsite.com","subtable":[{"label":"http:\/\/myotherreferrerwebsite.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":362,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"myreferrerwebsite.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":11,"segment":"referrerName==myreferrerwebsite.com","subtable":[{"label":"http:\/\/myreferrerwebsite.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":1,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"piwik.org","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":16,"segment":"referrerName==piwik.org","subtable":[{"label":"http:\/\/piwik.org\/contribute%","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"sn110w.snt110.mail.live.com","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":17,"segment":"referrerName==sn110w.snt110.mail.live.com","subtable":[{"label":"http:\/\/sn110w.snt110.mail.live.com\/mail\/InboxLight.aspx?n=184083971","nb_visits":1,"nb_actions":2,"max_actions":2,"sum_visit_length":2,"bounce_count":0,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever.com1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":1,"segment":"referrerName==whatever.com1","subtable":[{"label":"http:\/\/whatever.com1\/1","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]},{"label":"whatever3.com","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"goals":{"idgoal=1":{"nb_conversions":1,"nb_visits_converted":1,"revenue":5}},"nb_conversions":1,"revenue":5,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0,"idsubdatatable":4,"segment":"referrerName==whatever3.com","subtable":[{"label":"http:\/\/whatever3.com\/3","nb_visits":1,"nb_actions":1,"max_actions":1,"sum_visit_length":0,"bounce_count":1,"nb_visits_converted":1,"sum_daily_nb_uniq_visitors":1,"sum_daily_nb_users":0}]}]
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.php.txt b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.php.txt
index f40d02990898a3f4acd1cfdad51e6bacb0b8443d..c4acee7f1aafdffdb5872fe3a4a3889b006dc426 100644
--- a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.php.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.php.txt
@@ -1 +1 @@
-a:17:{i:0;a:14:{s:5:"label";s:12:"referrer.com";s:9:"nb_visits";i:9;s:10:"nb_actions";i:43;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:7398;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:9;s:19:"nb_visits_converted";i:9;s:7:"revenue";d:45;}}s:14:"nb_conversions";i:9;s:7:"revenue";d:45;s:26:"sum_daily_nb_uniq_visitors";i:9;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11252;s:7:"segment";s:26:"referrerName==referrer.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:34:"http://referrer.com/Other_Page.htm";s:9:"nb_visits";i:8;s:10:"nb_actions";i:36;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:5776;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:8;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:56:"http://referrer.com/page.htm?param=valuewith some spaces";s:9:"nb_visits";i:1;s:10:"nb_actions";i:7;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:1622;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:1;a:14:{s:5:"label";s:17:"www.referrer1.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:28;s:12:"bounce_count";i:6;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}}s:14:"nb_conversions";i:8;s:7:"revenue";d:40;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11254;s:7:"segment";s:31:"referrerName==www.referrer1.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer1.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer1.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer1.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer1.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:2;a:14:{s:5:"label";s:17:"www.referrer2.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:28;s:12:"bounce_count";i:6;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}}s:14:"nb_conversions";i:8;s:7:"revenue";d:40;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11255;s:7:"segment";s:31:"referrerName==www.referrer2.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer2.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer2.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer2.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer2.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:3;a:14:{s:5:"label";s:17:"www.referrer3.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:28;s:12:"bounce_count";i:6;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}}s:14:"nb_conversions";i:8;s:7:"revenue";d:40;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11256;s:7:"segment";s:31:"referrerName==www.referrer3.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer3.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer3.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer3.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer3.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:4;a:14:{s:5:"label";s:17:"www.referrer0.com";s:9:"nb_visits";i:7;s:10:"nb_actions";i:7;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:28;s:12:"bounce_count";i:7;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:7;s:19:"nb_visits_converted";i:7;s:7:"revenue";d:35;}}s:14:"nb_conversions";i:7;s:7:"revenue";d:35;s:26:"sum_daily_nb_uniq_visitors";i:7;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11265;s:7:"segment";s:31:"referrerName==www.referrer0.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer0.com/theReferrerPage0.html";s:9:"nb_visits";i:4;s:10:"nb_actions";i:4;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:16;s:12:"bounce_count";i:4;s:19:"nb_visits_converted";i:4;s:26:"sum_daily_nb_uniq_visitors";i:4;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer0.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}}}i:5;a:14:{s:5:"label";s:17:"www.referrer4.com";s:9:"nb_visits";i:6;s:10:"nb_actions";i:6;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:24;s:12:"bounce_count";i:6;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}}s:14:"nb_conversions";i:6;s:7:"revenue";d:30;s:26:"sum_daily_nb_uniq_visitors";i:6;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11266;s:7:"segment";s:31:"referrerName==www.referrer4.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer4.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer4.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:12;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}}}i:6;a:14:{s:5:"label";s:13:"whatever0.com";s:9:"nb_visits";i:4;s:10:"nb_actions";i:4;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:4;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:4;s:19:"nb_visits_converted";i:4;s:7:"revenue";d:20;}}s:14:"nb_conversions";i:4;s:7:"revenue";d:20;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11253;s:7:"segment";s:27:"referrerName==whatever0.com";s:8:"subtable";a:3:{i:0;a:9:{s:5:"label";s:22:"http://whatever0.com/0";s:9:"nb_visits";i:2;s:10:"nb_actions";i:2;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:2;s:19:"nb_visits_converted";i:2;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:22:"http://whatever0.com/1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:22:"http://whatever0.com/2";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:7;a:14:{s:5:"label";s:15:"anothersite.com";s:9:"nb_visits";i:2;s:10:"nb_actions";i:6;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:723;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:2;s:19:"nb_visits_converted";i:2;s:7:"revenue";d:10;}}s:14:"nb_conversions";i:2;s:7:"revenue";d:10;s:26:"sum_daily_nb_uniq_visitors";i:2;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11257;s:7:"segment";s:29:"referrerName==anothersite.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:36:"http://anothersite.com/whatever.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:49:"http://anothersite.com/whatever.html?whatever=Ato";s:9:"nb_visits";i:1;s:10:"nb_actions";i:5;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:722;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:8;a:14:{s:5:"label";s:13:"whatever1.com";s:9:"nb_visits";i:2;s:10:"nb_actions";i:2;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:2;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:2;s:19:"nb_visits_converted";i:2;s:7:"revenue";d:10;}}s:14:"nb_conversions";i:2;s:7:"revenue";d:10;s:26:"sum_daily_nb_uniq_visitors";i:2;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11258;s:7:"segment";s:27:"referrerName==whatever1.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:22:"http://whatever1.com/0";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:22:"http://whatever1.com/2";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:9;a:14:{s:5:"label";s:22:"mutantregistration.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11259;s:7:"segment";s:36:"referrerName==mutantregistration.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:29:"http://mutantregistration.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:10;a:14:{s:5:"label";s:26:"myotherreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:362;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11260;s:7:"segment";s:40:"referrerName==myotherreferrerwebsite.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:33:"http://myotherreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:362;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:11;a:14:{s:5:"label";s:21:"myreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11261;s:7:"segment";s:35:"referrerName==myreferrerwebsite.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:28:"http://myreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:12;a:14:{s:5:"label";s:9:"piwik.org";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11279;s:7:"segment";s:23:"referrerName==piwik.org";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:28:"http://piwik.org/contribute%";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:13;a:14:{s:5:"label";s:27:"sn110w.snt110.mail.live.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11280;s:7:"segment";s:41:"referrerName==sn110w.snt110.mail.live.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:67:"http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:14;a:14:{s:5:"label";s:13:"whatever.com1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11262;s:7:"segment";s:27:"referrerName==whatever.com1";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:22:"http://whatever.com1/1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:15;a:14:{s:5:"label";s:13:"whatever3.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11263;s:7:"segment";s:27:"referrerName==whatever3.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:22:"http://whatever3.com/3";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:16;a:14:{s:5:"label";s:19:"www.external.com.vn";s:9:"nb_visits";i:1;s:10:"nb_actions";i:8;s:11:"max_actions";d:8;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11264;s:7:"segment";s:33:"referrerName==www.external.com.vn";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:55:"http://www.external.com.vn/referrerPage-notCounted.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:8;s:11:"max_actions";d:8;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}}
\ No newline at end of file
+a:17:{i:0;a:14:{s:5:"label";s:12:"referrer.com";s:9:"nb_visits";i:9;s:10:"nb_actions";i:43;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:7398;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:21;s:19:"nb_visits_converted";i:9;s:7:"revenue";d:105;}}s:14:"nb_conversions";i:21;s:7:"revenue";d:105;s:26:"sum_daily_nb_uniq_visitors";i:9;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:8;s:7:"segment";s:26:"referrerName==referrer.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:34:"http://referrer.com/Other_Page.htm";s:9:"nb_visits";i:8;s:10:"nb_actions";i:36;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:5776;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:8;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:56:"http://referrer.com/page.htm?param=valuewith some spaces";s:9:"nb_visits";i:1;s:10:"nb_actions";i:7;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:1622;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:1;a:14:{s:5:"label";s:17:"www.referrer1.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2194;s:12:"bounce_count";i:6;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}}s:14:"nb_conversions";i:14;s:7:"revenue";d:70;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:5;s:7:"segment";s:31:"referrerName==www.referrer1.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer1.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer1.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer1.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer1.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:2;a:14:{s:5:"label";s:17:"www.referrer2.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2194;s:12:"bounce_count";i:6;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}}s:14:"nb_conversions";i:14;s:7:"revenue";d:70;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:6;s:7:"segment";s:31:"referrerName==www.referrer2.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer2.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer2.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer2.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer2.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:3;a:14:{s:5:"label";s:17:"www.referrer3.com";s:9:"nb_visits";i:8;s:10:"nb_actions";i:12;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2194;s:12:"bounce_count";i:6;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:8;s:19:"nb_visits_converted";i:8;s:7:"revenue";d:40;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}}s:14:"nb_conversions";i:14;s:7:"revenue";d:70;s:26:"sum_daily_nb_uniq_visitors";i:8;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:7;s:7:"segment";s:31:"referrerName==www.referrer3.com";s:8:"subtable";a:4:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer3.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer3.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:43:"http://www.referrer3.com/sub/dir/page1.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:3;a:9:{s:5:"label";s:43:"http://www.referrer3.com/sub/dir/page2.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:4;a:14:{s:5:"label";s:17:"www.referrer0.com";s:9:"nb_visits";i:7;s:10:"nb_actions";i:7;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:2555;s:12:"bounce_count";i:7;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:7;s:19:"nb_visits_converted";i:7;s:7:"revenue";d:35;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:7;s:19:"nb_visits_converted";i:7;s:7:"revenue";d:35;}}s:14:"nb_conversions";i:14;s:7:"revenue";d:70;s:26:"sum_daily_nb_uniq_visitors";i:7;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:14;s:7:"segment";s:31:"referrerName==www.referrer0.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer0.com/theReferrerPage0.html";s:9:"nb_visits";i:4;s:10:"nb_actions";i:4;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1460;s:12:"bounce_count";i:4;s:19:"nb_visits_converted";i:4;s:26:"sum_daily_nb_uniq_visitors";i:4;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer0.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}}}i:5;a:14:{s:5:"label";s:17:"www.referrer4.com";s:9:"nb_visits";i:6;s:10:"nb_actions";i:6;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:2190;s:12:"bounce_count";i:6;s:5:"goals";a:2:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}s:8:"idgoal=2";a:3:{s:14:"nb_conversions";i:6;s:19:"nb_visits_converted";i:6;s:7:"revenue";d:30;}}s:14:"nb_conversions";i:12;s:7:"revenue";d:60;s:26:"sum_daily_nb_uniq_visitors";i:6;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:15;s:7:"segment";s:31:"referrerName==www.referrer4.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:46:"http://www.referrer4.com/theReferrerPage0.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:46:"http://www.referrer4.com/theReferrerPage1.html";s:9:"nb_visits";i:3;s:10:"nb_actions";i:3;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1095;s:12:"bounce_count";i:3;s:19:"nb_visits_converted";i:3;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;}}}i:6;a:14:{s:5:"label";s:13:"whatever0.com";s:9:"nb_visits";i:4;s:10:"nb_actions";i:4;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:4;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:4;s:19:"nb_visits_converted";i:4;s:7:"revenue";d:20;}}s:14:"nb_conversions";i:4;s:7:"revenue";d:20;s:26:"sum_daily_nb_uniq_visitors";i:3;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:2;s:7:"segment";s:27:"referrerName==whatever0.com";s:8:"subtable";a:3:{i:0;a:9:{s:5:"label";s:22:"http://whatever0.com/0";s:9:"nb_visits";i:2;s:10:"nb_actions";i:2;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:2;s:19:"nb_visits_converted";i:2;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:22:"http://whatever0.com/1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:2;a:9:{s:5:"label";s:22:"http://whatever0.com/2";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:7;a:14:{s:5:"label";s:15:"anothersite.com";s:9:"nb_visits";i:2;s:10:"nb_actions";i:6;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:723;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:4;s:19:"nb_visits_converted";i:2;s:7:"revenue";d:20;}}s:14:"nb_conversions";i:4;s:7:"revenue";d:20;s:26:"sum_daily_nb_uniq_visitors";i:2;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:13;s:7:"segment";s:29:"referrerName==anothersite.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:36:"http://anothersite.com/whatever.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:49:"http://anothersite.com/whatever.html?whatever=Ato";s:9:"nb_visits";i:1;s:10:"nb_actions";i:5;s:11:"max_actions";d:5;s:16:"sum_visit_length";i:722;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:8;a:14:{s:5:"label";s:13:"whatever1.com";s:9:"nb_visits";i:2;s:10:"nb_actions";i:2;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:2;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:2;s:19:"nb_visits_converted";i:2;s:7:"revenue";d:10;}}s:14:"nb_conversions";i:2;s:7:"revenue";d:10;s:26:"sum_daily_nb_uniq_visitors";i:2;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:3;s:7:"segment";s:27:"referrerName==whatever1.com";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:22:"http://whatever1.com/0";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:22:"http://whatever1.com/2";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:9;a:14:{s:5:"label";s:19:"www.external.com.vn";s:9:"nb_visits";i:2;s:10:"nb_actions";i:7;s:11:"max_actions";d:4;s:16:"sum_visit_length";i:1804;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:7;s:19:"nb_visits_converted";i:2;s:7:"revenue";d:35;}}s:14:"nb_conversions";i:7;s:7:"revenue";d:35;s:26:"sum_daily_nb_uniq_visitors";i:2;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:12;s:7:"segment";s:33:"referrerName==www.external.com.vn";s:8:"subtable";a:2:{i:0;a:9:{s:5:"label";s:52:"http://www.external.com.vn/referrerPage-counted.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:3;s:11:"max_actions";d:3;s:16:"sum_visit_length";i:722;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}i:1;a:9:{s:5:"label";s:55:"http://www.external.com.vn/referrerPage-notCounted.html";s:9:"nb_visits";i:1;s:10:"nb_actions";i:4;s:11:"max_actions";d:4;s:16:"sum_visit_length";i:1082;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:10;a:14:{s:5:"label";s:22:"mutantregistration.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:9;s:7:"segment";s:36:"referrerName==mutantregistration.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:29:"http://mutantregistration.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:11;a:14:{s:5:"label";s:26:"myotherreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:362;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:2;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:10;}}s:14:"nb_conversions";i:2;s:7:"revenue";d:10;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:10;s:7:"segment";s:40:"referrerName==myotherreferrerwebsite.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:33:"http://myotherreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:362;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:12;a:14:{s:5:"label";s:21:"myreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:11;s:7:"segment";s:35:"referrerName==myreferrerwebsite.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:28:"http://myreferrerwebsite.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:1;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:13;a:14:{s:5:"label";s:9:"piwik.org";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:16;s:7:"segment";s:23:"referrerName==piwik.org";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:28:"http://piwik.org/contribute%";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:14;a:14:{s:5:"label";s:27:"sn110w.snt110.mail.live.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:17;s:7:"segment";s:41:"referrerName==sn110w.snt110.mail.live.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:67:"http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971";s:9:"nb_visits";i:1;s:10:"nb_actions";i:2;s:11:"max_actions";d:2;s:16:"sum_visit_length";i:2;s:12:"bounce_count";i:0;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:15;a:14:{s:5:"label";s:13:"whatever.com1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:1;s:7:"segment";s:27:"referrerName==whatever.com1";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:22:"http://whatever.com1/1";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}i:16;a:14:{s:5:"label";s:13:"whatever3.com";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:1;s:19:"nb_visits_converted";i:1;s:7:"revenue";d:5;}}s:14:"nb_conversions";i:1;s:7:"revenue";d:5;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;s:14:"idsubdatatable";i:4;s:7:"segment";s:27:"referrerName==whatever3.com";s:8:"subtable";a:1:{i:0;a:9:{s:5:"label";s:22:"http://whatever3.com/3";s:9:"nb_visits";i:1;s:10:"nb_actions";i:1;s:11:"max_actions";d:1;s:16:"sum_visit_length";i:0;s:12:"bounce_count";i:1;s:19:"nb_visits_converted";i:1;s:26:"sum_daily_nb_uniq_visitors";i:1;s:18:"sum_daily_nb_users";i:0;}}}}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.tsv.txt b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.tsv.txt
index f0c1a4bd2f9be0f28ecadb7b26486326ca1013a5..054f0260084fd6685a4e438ad1d8090ce1673461 100644
--- a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.tsv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.tsv.txt
@@ -1,18 +1,18 @@
-Label	Visits	Actions	Maximum actions in one visit	Total time spent by visitors (in seconds)	Bounces	Conversions (Goal idgoal=1)	Visits with Conversions (Goal idgoal=1)	Revenue (Goal idgoal=1)	Conversions	Revenue	Unique visitors (daily sum)	Users (daily sum)	Metadata: segment
-referrer.com	9	43	7	7398	0	9	9	45	9	45	9	0	referrerName==referrer.com
-www.referrer1.com	8	12	3	28	6	8	8	40	8	40	8	0	referrerName==www.referrer1.com
-www.referrer2.com	8	12	3	28	6	8	8	40	8	40	8	0	referrerName==www.referrer2.com
-www.referrer3.com	8	12	3	28	6	8	8	40	8	40	8	0	referrerName==www.referrer3.com
-www.referrer0.com	7	7	1	28	7	7	7	35	7	35	7	0	referrerName==www.referrer0.com
-www.referrer4.com	6	6	1	24	6	6	6	30	6	30	6	0	referrerName==www.referrer4.com
-whatever0.com	4	4	1	0	4	4	4	20	4	20	3	0	referrerName==whatever0.com
-anothersite.com	2	6	5	723	1	2	2	10	2	10	2	0	referrerName==anothersite.com
-whatever1.com	2	2	1	0	2	2	2	10	2	10	2	0	referrerName==whatever1.com
-mutantregistration.com	1	1	1	1	1	1	1	5	1	5	1	0	referrerName==mutantregistration.com
-myotherreferrerwebsite.com	1	2	2	362	0	1	1	5	1	5	1	0	referrerName==myotherreferrerwebsite.com
-myreferrerwebsite.com	1	1	1	1	1	1	1	5	1	5	1	0	referrerName==myreferrerwebsite.com
-piwik.org	1	2	2	2	0	1	1	5	1	5	1	0	referrerName==piwik.org
-sn110w.snt110.mail.live.com	1	2	2	2	0	1	1	5	1	5	1	0	referrerName==sn110w.snt110.mail.live.com
-whatever.com1	1	1	1	0	1	1	1	5	1	5	1	0	referrerName==whatever.com1
-whatever3.com	1	1	1	0	1	1	1	5	1	5	1	0	referrerName==whatever3.com
-www.external.com.vn	1	8	8	2	0	1	1	5	1	5	1	0	referrerName==www.external.com.vn
\ No newline at end of file
+Label	Visits	Actions	Maximum actions in one visit	Total time spent by visitors (in seconds)	Bounces	Conversions (Goal idgoal=1)	Visits with Conversions (Goal idgoal=1)	Revenue (Goal idgoal=1)	Conversions	Revenue	Unique visitors (daily sum)	Users (daily sum)	Metadata: segment	Conversions (Goal idgoal=2)	Visits with Conversions (Goal idgoal=2)	Revenue (Goal idgoal=2)
+referrer.com	9	43	7	7398	0	21	9	105	21	105	9	0	referrerName==referrer.com			
+www.referrer1.com	8	12	3	2194	6	8	8	40	14	70	8	0	referrerName==www.referrer1.com	6	6	30
+www.referrer2.com	8	12	3	2194	6	8	8	40	14	70	8	0	referrerName==www.referrer2.com	6	6	30
+www.referrer3.com	8	12	3	2194	6	8	8	40	14	70	8	0	referrerName==www.referrer3.com	6	6	30
+www.referrer0.com	7	7	1	2555	7	7	7	35	14	70	7	0	referrerName==www.referrer0.com	7	7	35
+www.referrer4.com	6	6	1	2190	6	6	6	30	12	60	6	0	referrerName==www.referrer4.com	6	6	30
+whatever0.com	4	4	1	0	4	4	4	20	4	20	3	0	referrerName==whatever0.com			
+anothersite.com	2	6	5	723	1	4	2	20	4	20	2	0	referrerName==anothersite.com			
+whatever1.com	2	2	1	0	2	2	2	10	2	10	2	0	referrerName==whatever1.com			
+www.external.com.vn	2	7	4	1804	0	7	2	35	7	35	2	0	referrerName==www.external.com.vn			
+mutantregistration.com	1	1	1	1	1	1	1	5	1	5	1	0	referrerName==mutantregistration.com			
+myotherreferrerwebsite.com	1	2	2	362	0	2	1	10	2	10	1	0	referrerName==myotherreferrerwebsite.com			
+myreferrerwebsite.com	1	1	1	1	1	1	1	5	1	5	1	0	referrerName==myreferrerwebsite.com			
+piwik.org	1	2	2	2	0	1	1	5	1	5	1	0	referrerName==piwik.org			
+sn110w.snt110.mail.live.com	1	2	2	2	0	1	1	5	1	5	1	0	referrerName==sn110w.snt110.mail.live.com			
+whatever.com1	1	1	1	0	1	1	1	5	1	5	1	0	referrerName==whatever.com1			
+whatever3.com	1	1	1	0	1	1	1	5	1	5	1	0	referrerName==whatever3.com			
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.xml.txt b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.xml.txt
index 1ee8cebf62838c1f31517ab4b4cc3bf8376ab7f4..f1a7797c59b6d76ca2128342ad2da34c60ba9139 100644
--- a/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.xml.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_Referrers.getWebsites_exported.xml.txt
@@ -9,16 +9,16 @@
 		<bounce_count>0</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>9</nb_conversions>
+				<nb_conversions>21</nb_conversions>
 				<nb_visits_converted>9</nb_visits_converted>
-				<revenue>45</revenue>
+				<revenue>105</revenue>
 			</row>
 		</goals>
-		<nb_conversions>9</nb_conversions>
-		<revenue>45</revenue>
+		<nb_conversions>21</nb_conversions>
+		<revenue>105</revenue>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11252</idsubdatatable>
+		<idsubdatatable>8</idsubdatatable>
 		<segment>referrerName==referrer.com</segment>
 		<subtable>
 			<row>
@@ -50,7 +50,7 @@
 		<nb_visits>8</nb_visits>
 		<nb_actions>12</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>28</sum_visit_length>
+		<sum_visit_length>2194</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<goals>
 			<row idgoal='1'>
@@ -58,12 +58,17 @@
 				<nb_visits_converted>8</nb_visits_converted>
 				<revenue>40</revenue>
 			</row>
+			<row idgoal='2'>
+				<nb_conversions>6</nb_conversions>
+				<nb_visits_converted>6</nb_visits_converted>
+				<revenue>30</revenue>
+			</row>
 		</goals>
-		<nb_conversions>8</nb_conversions>
-		<revenue>40</revenue>
+		<nb_conversions>14</nb_conversions>
+		<revenue>70</revenue>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11254</idsubdatatable>
+		<idsubdatatable>5</idsubdatatable>
 		<segment>referrerName==www.referrer1.com</segment>
 		<subtable>
 			<row>
@@ -71,7 +76,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -82,7 +87,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -117,7 +122,7 @@
 		<nb_visits>8</nb_visits>
 		<nb_actions>12</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>28</sum_visit_length>
+		<sum_visit_length>2194</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<goals>
 			<row idgoal='1'>
@@ -125,12 +130,17 @@
 				<nb_visits_converted>8</nb_visits_converted>
 				<revenue>40</revenue>
 			</row>
+			<row idgoal='2'>
+				<nb_conversions>6</nb_conversions>
+				<nb_visits_converted>6</nb_visits_converted>
+				<revenue>30</revenue>
+			</row>
 		</goals>
-		<nb_conversions>8</nb_conversions>
-		<revenue>40</revenue>
+		<nb_conversions>14</nb_conversions>
+		<revenue>70</revenue>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11255</idsubdatatable>
+		<idsubdatatable>6</idsubdatatable>
 		<segment>referrerName==www.referrer2.com</segment>
 		<subtable>
 			<row>
@@ -138,7 +148,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -149,7 +159,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -184,7 +194,7 @@
 		<nb_visits>8</nb_visits>
 		<nb_actions>12</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>28</sum_visit_length>
+		<sum_visit_length>2194</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<goals>
 			<row idgoal='1'>
@@ -192,12 +202,17 @@
 				<nb_visits_converted>8</nb_visits_converted>
 				<revenue>40</revenue>
 			</row>
+			<row idgoal='2'>
+				<nb_conversions>6</nb_conversions>
+				<nb_visits_converted>6</nb_visits_converted>
+				<revenue>30</revenue>
+			</row>
 		</goals>
-		<nb_conversions>8</nb_conversions>
-		<revenue>40</revenue>
+		<nb_conversions>14</nb_conversions>
+		<revenue>70</revenue>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11256</idsubdatatable>
+		<idsubdatatable>7</idsubdatatable>
 		<segment>referrerName==www.referrer3.com</segment>
 		<subtable>
 			<row>
@@ -205,7 +220,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -216,7 +231,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -251,7 +266,7 @@
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
 		<max_actions>1</max_actions>
-		<sum_visit_length>28</sum_visit_length>
+		<sum_visit_length>2555</sum_visit_length>
 		<bounce_count>7</bounce_count>
 		<goals>
 			<row idgoal='1'>
@@ -259,12 +274,17 @@
 				<nb_visits_converted>7</nb_visits_converted>
 				<revenue>35</revenue>
 			</row>
+			<row idgoal='2'>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>7</nb_visits_converted>
+				<revenue>35</revenue>
+			</row>
 		</goals>
-		<nb_conversions>7</nb_conversions>
-		<revenue>35</revenue>
+		<nb_conversions>14</nb_conversions>
+		<revenue>70</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11265</idsubdatatable>
+		<idsubdatatable>14</idsubdatatable>
 		<segment>referrerName==www.referrer0.com</segment>
 		<subtable>
 			<row>
@@ -272,7 +292,7 @@
 				<nb_visits>4</nb_visits>
 				<nb_actions>4</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>16</sum_visit_length>
+				<sum_visit_length>1460</sum_visit_length>
 				<bounce_count>4</bounce_count>
 				<nb_visits_converted>4</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
@@ -283,7 +303,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -296,7 +316,7 @@
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
 		<max_actions>1</max_actions>
-		<sum_visit_length>24</sum_visit_length>
+		<sum_visit_length>2190</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<goals>
 			<row idgoal='1'>
@@ -304,12 +324,17 @@
 				<nb_visits_converted>6</nb_visits_converted>
 				<revenue>30</revenue>
 			</row>
+			<row idgoal='2'>
+				<nb_conversions>6</nb_conversions>
+				<nb_visits_converted>6</nb_visits_converted>
+				<revenue>30</revenue>
+			</row>
 		</goals>
-		<nb_conversions>6</nb_conversions>
-		<revenue>30</revenue>
+		<nb_conversions>12</nb_conversions>
+		<revenue>60</revenue>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11266</idsubdatatable>
+		<idsubdatatable>15</idsubdatatable>
 		<segment>referrerName==www.referrer4.com</segment>
 		<subtable>
 			<row>
@@ -317,7 +342,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -328,7 +353,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
 				<max_actions>1</max_actions>
-				<sum_visit_length>12</sum_visit_length>
+				<sum_visit_length>1095</sum_visit_length>
 				<bounce_count>3</bounce_count>
 				<nb_visits_converted>3</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
@@ -354,7 +379,7 @@
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11253</idsubdatatable>
+		<idsubdatatable>2</idsubdatatable>
 		<segment>referrerName==whatever0.com</segment>
 		<subtable>
 			<row>
@@ -401,16 +426,16 @@
 		<bounce_count>1</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
+				<nb_conversions>4</nb_conversions>
 				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
+				<revenue>20</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
+		<nb_conversions>4</nb_conversions>
+		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11257</idsubdatatable>
+		<idsubdatatable>13</idsubdatatable>
 		<segment>referrerName==anothersite.com</segment>
 		<subtable>
 			<row>
@@ -455,7 +480,7 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11258</idsubdatatable>
+		<idsubdatatable>3</idsubdatatable>
 		<segment>referrerName==whatever1.com</segment>
 		<subtable>
 			<row>
@@ -482,6 +507,51 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>www.external.com.vn</label>
+		<nb_visits>2</nb_visits>
+		<nb_actions>7</nb_actions>
+		<max_actions>4</max_actions>
+		<sum_visit_length>1804</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>2</nb_visits_converted>
+				<revenue>35</revenue>
+			</row>
+		</goals>
+		<nb_conversions>7</nb_conversions>
+		<revenue>35</revenue>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<idsubdatatable>12</idsubdatatable>
+		<segment>referrerName==www.external.com.vn</segment>
+		<subtable>
+			<row>
+				<label>http://www.external.com.vn/referrerPage-counted.html</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>3</nb_actions>
+				<max_actions>3</max_actions>
+				<sum_visit_length>722</sum_visit_length>
+				<bounce_count>0</bounce_count>
+				<nb_visits_converted>1</nb_visits_converted>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
+			<row>
+				<label>http://www.external.com.vn/referrerPage-notCounted.html</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>4</nb_actions>
+				<max_actions>4</max_actions>
+				<sum_visit_length>1082</sum_visit_length>
+				<bounce_count>0</bounce_count>
+				<nb_visits_converted>1</nb_visits_converted>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>mutantregistration.com</label>
 		<nb_visits>1</nb_visits>
@@ -500,7 +570,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11259</idsubdatatable>
+		<idsubdatatable>9</idsubdatatable>
 		<segment>referrerName==mutantregistration.com</segment>
 		<subtable>
 			<row>
@@ -525,16 +595,16 @@
 		<bounce_count>0</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
+				<nb_conversions>2</nb_conversions>
 				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>5</revenue>
+				<revenue>10</revenue>
 			</row>
 		</goals>
-		<nb_conversions>1</nb_conversions>
-		<revenue>5</revenue>
+		<nb_conversions>2</nb_conversions>
+		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11260</idsubdatatable>
+		<idsubdatatable>10</idsubdatatable>
 		<segment>referrerName==myotherreferrerwebsite.com</segment>
 		<subtable>
 			<row>
@@ -568,7 +638,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11261</idsubdatatable>
+		<idsubdatatable>11</idsubdatatable>
 		<segment>referrerName==myreferrerwebsite.com</segment>
 		<subtable>
 			<row>
@@ -602,7 +672,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11279</idsubdatatable>
+		<idsubdatatable>16</idsubdatatable>
 		<segment>referrerName==piwik.org</segment>
 		<subtable>
 			<row>
@@ -636,7 +706,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11280</idsubdatatable>
+		<idsubdatatable>17</idsubdatatable>
 		<segment>referrerName==sn110w.snt110.mail.live.com</segment>
 		<subtable>
 			<row>
@@ -670,7 +740,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11262</idsubdatatable>
+		<idsubdatatable>1</idsubdatatable>
 		<segment>referrerName==whatever.com1</segment>
 		<subtable>
 			<row>
@@ -704,7 +774,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11263</idsubdatatable>
+		<idsubdatatable>4</idsubdatatable>
 		<segment>referrerName==whatever3.com</segment>
 		<subtable>
 			<row>
@@ -720,38 +790,4 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>www.external.com.vn</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>8</max_actions>
-		<sum_visit_length>2</sum_visit_length>
-		<bounce_count>0</bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>5</revenue>
-			</row>
-		</goals>
-		<nb_conversions>1</nb_conversions>
-		<revenue>5</revenue>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<idsubdatatable>11264</idsubdatatable>
-		<segment>referrerName==www.external.com.vn</segment>
-		<subtable>
-			<row>
-				<label>http://www.external.com.vn/referrerPage-notCounted.html</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>8</nb_actions>
-				<max_actions>8</max_actions>
-				<sum_visit_length>2</sum_visit_length>
-				<bounce_count>0</bounce_count>
-				<nb_visits_converted>1</nb_visits_converted>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>0</sum_daily_nb_users>
-			</row>
-		</subtable>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.csv.txt b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.csv.txt
index d6058615a36f57c81b0f65cefbd1e9ba68394e24..91e1a69848fab1fd8a36fa08bcbaaf9c30237445 100644
--- a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.csv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.csv.txt
@@ -1,2 +1,2 @@
 Date,Label,Visits,Actions,Maximum actions in one visit,Total time spent by visitors (in seconds),Bounces,Conversions (Goal idgoal=1),Visits with Conversions (Goal idgoal=1),Revenue (Goal idgoal=1),Conversions,Revenue,Unique visitors (daily sum),Users (daily sum),Metadata: segment
-2012,referrer.com,9,43,7,7398,0,9,9,45,9,45,9,0,referrerName==referrer.com
\ No newline at end of file
+2012,referrer.com,9,43,7,7398,0,21,9,105,21,105,9,0,referrerName==referrer.com
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.json.txt b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.json.txt
index 541ea5db88446c7a6989a3e5b97bd02b1e3e5856..872e71e0426d0aa3979bf31cb7102ef78fb5cfd6 100644
--- a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.json.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.json.txt
@@ -1 +1 @@
-{"2008":[],"2009":[],"2010":[],"2011":[],"2012":[{"label":"referrer.com","nb_visits":9,"nb_actions":43,"max_actions":7,"sum_visit_length":7398,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":9,"nb_visits_converted":9,"revenue":45}},"nb_conversions":9,"revenue":45,"sum_daily_nb_uniq_visitors":9,"sum_daily_nb_users":0,"segment":"referrerName==referrer.com","idsubdatatable":11252}]}
\ No newline at end of file
+{"2008":[],"2009":[],"2010":[],"2011":[],"2012":[{"label":"referrer.com","nb_visits":9,"nb_actions":43,"max_actions":7,"sum_visit_length":7398,"bounce_count":0,"goals":{"idgoal=1":{"nb_conversions":21,"nb_visits_converted":9,"revenue":105}},"nb_conversions":21,"revenue":105,"sum_daily_nb_uniq_visitors":9,"sum_daily_nb_users":0,"segment":"referrerName==referrer.com","idsubdatatable":8}]}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.php.txt b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.php.txt
index 234fb77fce6fa5ee870e6eda0fd078febbe8bdfa..2d7c35eb84c6617276d0af788808d898c8819066 100644
--- a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.php.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.php.txt
@@ -1 +1 @@
-a:5:{i:2008;a:0:{}i:2009;a:0:{}i:2010;a:0:{}i:2011;a:0:{}i:2012;a:1:{i:0;a:13:{s:5:"label";s:12:"referrer.com";s:9:"nb_visits";i:9;s:10:"nb_actions";i:43;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:7398;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:9;s:19:"nb_visits_converted";i:9;s:7:"revenue";d:45;}}s:14:"nb_conversions";i:9;s:7:"revenue";d:45;s:26:"sum_daily_nb_uniq_visitors";i:9;s:18:"sum_daily_nb_users";i:0;s:7:"segment";s:26:"referrerName==referrer.com";s:14:"idsubdatatable";i:11252;}}}
\ No newline at end of file
+a:5:{i:2008;a:0:{}i:2009;a:0:{}i:2010;a:0:{}i:2011;a:0:{}i:2012;a:1:{i:0;a:13:{s:5:"label";s:12:"referrer.com";s:9:"nb_visits";i:9;s:10:"nb_actions";i:43;s:11:"max_actions";d:7;s:16:"sum_visit_length";i:7398;s:12:"bounce_count";i:0;s:5:"goals";a:1:{s:8:"idgoal=1";a:3:{s:14:"nb_conversions";i:21;s:19:"nb_visits_converted";i:9;s:7:"revenue";d:105;}}s:14:"nb_conversions";i:21;s:7:"revenue";d:105;s:26:"sum_daily_nb_uniq_visitors";i:9;s:18:"sum_daily_nb_users";i:0;s:7:"segment";s:26:"referrerName==referrer.com";s:14:"idsubdatatable";i:8;}}}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.tsv.txt b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.tsv.txt
index 761c83eb70e7a9ee6b29f93994f761690f98a32e..92ae74d98d27c2ed4d88dde44f6527ac8ddb3104 100644
--- a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.tsv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.tsv.txt
@@ -1,2 +1,2 @@
 Date	Label	Visits	Actions	Maximum actions in one visit	Total time spent by visitors (in seconds)	Bounces	Conversions (Goal idgoal=1)	Visits with Conversions (Goal idgoal=1)	Revenue (Goal idgoal=1)	Conversions	Revenue	Unique visitors (daily sum)	Users (daily sum)	Metadata: segment
-2012	referrer.com	9	43	7	7398	0	9	9	45	9	45	9	0	referrerName==referrer.com
\ No newline at end of file
+2012	referrer.com	9	43	7	7398	0	21	9	105	21	105	9	0	referrerName==referrer.com
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.xml.txt b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.xml.txt
index 1a0f9639ce0b632cffb96d5803cbb6160dfa48cb..79e33fa2d6a1f97f6fabd39a1cb133cce526802a 100644
--- a/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.xml.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_RowEvolution_exported.xml.txt
@@ -14,17 +14,17 @@
 			<bounce_count>0</bounce_count>
 			<goals>
 				<row idgoal='1'>
-					<nb_conversions>9</nb_conversions>
+					<nb_conversions>21</nb_conversions>
 					<nb_visits_converted>9</nb_visits_converted>
-					<revenue>45</revenue>
+					<revenue>105</revenue>
 				</row>
 			</goals>
-			<nb_conversions>9</nb_conversions>
-			<revenue>45</revenue>
+			<nb_conversions>21</nb_conversions>
+			<revenue>105</revenue>
 			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<segment>referrerName==referrer.com</segment>
-			<idsubdatatable>11252</idsubdatatable>
+			<idsubdatatable>8</idsubdatatable>
 		</row>
 	</result>
 </results>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.csv.txt b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.csv.txt
index 2e373c253b718c7391345493eddee82ed3066aa8..3f09b79abac877293c307fd72f936396fcad33bb 100644
--- a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.csv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.csv.txt
@@ -1,2 +1,2 @@
 Date,Visits,Actions,Visits with Conversions,Bounces,Total time spent by visitors (in seconds),Maximum actions in one visit,Bounce Rate,Actions per Visit,Avg. Visit Duration (in seconds)
-2012,312,569,249,240,69809,16,77%,1.8,00:03:44
\ No newline at end of file
+2012,298,603,236,210,89687,20,70%,2,00:05:01
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.json.txt b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.json.txt
index e38ae0786ac7777d82a984ae5e456ec5cdd68571..921f20d828c5a6cf9d9e304ce6e3d70207dcdfbc 100644
--- a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.json.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.json.txt
@@ -1 +1 @@
-{"2008":[],"2009":[],"2010":[],"2011":[],"2012":{"nb_visits":312,"nb_actions":569,"nb_visits_converted":249,"bounce_count":240,"sum_visit_length":69809,"max_actions":16,"bounce_rate":"77%","nb_actions_per_visit":1.8,"avg_time_on_site":"00:03:44"}}
\ No newline at end of file
+{"2008":[],"2009":[],"2010":[],"2011":[],"2012":{"nb_visits":298,"nb_actions":603,"nb_visits_converted":236,"bounce_count":210,"sum_visit_length":89687,"max_actions":20,"bounce_rate":"70%","nb_actions_per_visit":2,"avg_time_on_site":"00:05:01"}}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.php.txt b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.php.txt
index 4a1c34404a269f046c08ecef5dc66910f97a441a..7d33065fc872afa6baa0e2c6853657884744c418 100644
--- a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.php.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.php.txt
@@ -1 +1 @@
-a:5:{i:2008;a:0:{}i:2009;a:0:{}i:2010;a:0:{}i:2011;a:0:{}i:2012;a:9:{s:9:"nb_visits";d:312;s:10:"nb_actions";d:569;s:19:"nb_visits_converted";d:249;s:12:"bounce_count";d:240;s:16:"sum_visit_length";d:69809;s:11:"max_actions";d:16;s:11:"bounce_rate";s:3:"77%";s:20:"nb_actions_per_visit";d:1.8;s:16:"avg_time_on_site";s:8:"00:03:44";}}
\ No newline at end of file
+a:5:{i:2008;a:0:{}i:2009;a:0:{}i:2010;a:0:{}i:2011;a:0:{}i:2012;a:9:{s:9:"nb_visits";d:298;s:10:"nb_actions";d:603;s:19:"nb_visits_converted";d:236;s:12:"bounce_count";d:210;s:16:"sum_visit_length";d:89687;s:11:"max_actions";d:20;s:11:"bounce_rate";s:3:"70%";s:20:"nb_actions_per_visit";d:2;s:16:"avg_time_on_site";s:8:"00:05:01";}}
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.tsv.txt b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.tsv.txt
index 03214be932a0e997e9034a748c0e8e877e989e4a..50339ecfeccb11d465e930078c2bc770ab4d2831 100644
--- a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.tsv.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.tsv.txt
@@ -1,2 +1,2 @@
 Date	Visits	Actions	Visits with Conversions	Bounces	Total time spent by visitors (in seconds)	Maximum actions in one visit	Bounce Rate	Actions per Visit	Avg. Visit Duration (in seconds)
-2012	312	569	249	240	69809	16	77%	1.8	00:03:44
\ No newline at end of file
+2012	298	603	236	210	89687	20	70%	2	00:05:01
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.xml.txt b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.xml.txt
index 81ff668c0d564a81b4458f070b10dbcdcf8b4cb6..9a3e4ab2a6c53e02cd44ef12c25411729db5c0fb 100644
--- a/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.xml.txt
+++ b/tests/UI/expected-screenshots/ReportExporting_VisitsSummary.get_exported.xml.txt
@@ -5,14 +5,14 @@
 	<result date="2010" />
 	<result date="2011" />
 	<result date="2012">
-		<nb_visits>312</nb_visits>
-		<nb_actions>569</nb_actions>
-		<nb_visits_converted>249</nb_visits_converted>
-		<bounce_count>240</bounce_count>
-		<sum_visit_length>69809</sum_visit_length>
-		<max_actions>16</max_actions>
-		<bounce_rate>77%</bounce_rate>
-		<nb_actions_per_visit>1.8</nb_actions_per_visit>
-		<avg_time_on_site>00:03:44</avg_time_on_site>
+		<nb_visits>298</nb_visits>
+		<nb_actions>603</nb_actions>
+		<nb_visits_converted>236</nb_visits_converted>
+		<bounce_count>210</bounce_count>
+		<sum_visit_length>89687</sum_visit_length>
+		<max_actions>20</max_actions>
+		<bounce_rate>70%</bounce_rate>
+		<nb_actions_per_visit>2</nb_actions_per_visit>
+		<avg_time_on_site>00:05:01</avg_time_on_site>
 	</result>
 </results>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png
index 607201aaf411a43eed6c7f868388d01c7a36471e..dd356d6cc162fffc693b505d7a805b442b5a392c 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png and b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution.png differ
diff --git a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png
index e6bd37ecbb3e4145f2ea029ffaaff2f4216aa1c9..dd356d6cc162fffc693b505d7a805b442b5a392c 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png and b/tests/UI/expected-screenshots/RowEvolution_multirow_evolution_other_metric.png differ
diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution.png
index bded8d6366e298b053e9286856df1689dcec90ed..0071dd463b09ea981af1c2b07aec9528d6a3b19f 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_row_evolution.png and b/tests/UI/expected-screenshots/RowEvolution_row_evolution.png differ
diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png
index 5d9de3e0f3a7f11308ef9868b166695f44cfeb5f..2a0c8907ba238da6e8992e264792c8d5df49df23 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png and b/tests/UI/expected-screenshots/RowEvolution_row_evolution_ecommerce_item.png differ
diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png
index b71800ee58128c2cde2e67ed865f60d71af6a13d..44ad87fd3aed227f66fdde4641d39e53eeb491c6 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png and b/tests/UI/expected-screenshots/RowEvolution_row_evolution_multiple_series.png differ
diff --git a/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png b/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png
index 5cc130d4f43e009e011f5661f278a2f41f06fe60..5cd14a0c4cbd58bb45e8b1e8b7f7d515a3731f9f 100644
Binary files a/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png and b/tests/UI/expected-screenshots/RowEvolution_row_evolution_other_metric.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png
index bab7e16f252010fea94c311899bd4d6a1bd91716..e311ad0ad1067f8e165dcef02dcf4515e6f21731 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_0_initial.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
index 50f351696585199e1f2207d5cfd913e4adf4bec1..2d40e6a5f1942c0f0240844c5c42a4b5cc793001 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
index b7aeb4d7394c6f2c3595deba89c485dc7ea9f371..8f05d5597eb9dae780d466594bd10db1e72915ee 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
index aa827908064ce7d45c26270c59f89383c3b9409b..a5d95d737b00a5b68fa4e5eac07120486f7b59bb 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png
index edf90d281a5c259be78c870a59f375d1c1767e07..76310dc6ad2851d955b3226646bceca9ec6533b7 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_4_segment_editor_expanded_dimensions.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png
index c14301eab4e911b5c4c646dfcac99f2a32cf8565..d5a8c3908c22f05414985cea84b1edff5f61e828 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_5_segment_editor_search_dimensions.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png
index feedfd8a4f6026726e77ed62c302ce12aa46c936..30ce08e9ba853e08fb81eb53fad0d5799d9f900d 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png
index bab7e16f252010fea94c311899bd4d6a1bd91716..e311ad0ad1067f8e165dcef02dcf4515e6f21731 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_7_segment_editor_closed.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
index 7c90be09cdb7df2405c5a0c643ce4e6fd32f6dd1..30ce08e9ba853e08fb81eb53fad0d5799d9f900d 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
index 50f351696585199e1f2207d5cfd913e4adf4bec1..2d40e6a5f1942c0f0240844c5c42a4b5cc793001 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png
index 5d76fdf5d6abfb657851f04e3332b9abaead68f9..cfb80f99db068d46804d850415f7b315ca09bca9 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_reload.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_reload.png
index 50f351696585199e1f2207d5cfd913e4adf4bec1..2d40e6a5f1942c0f0240844c5c42a4b5cc793001 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_reload.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_reload.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
index 75d2016b1210b13a24017654f25df98321623c01..6eff454afab3a86b7ee7195f4bc33951aa7a4d1e 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
index 9f7becb246aa034c377770c17a8439b811d5efbc..938d869507f938787cbfe8fd0deef02b3b5c4daf 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
index 5ef05cd1c6948501f07d7f539dd0d12a8c49cdcb..f9adb3904419dbd5c830c15ecdf35954b3b82e13 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
index 0028027efe5b268e2ae2768e40b45df5a1c2ebca..a7c93a65734fb2906aa85a3ee7abbf311de5ebb8 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
index 92237607e76f81605a85f85d081e0e8a23cce647..9f14d06884a9ee6776b596885142a7852c2bf9e0 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png
index 0028027efe5b268e2ae2768e40b45df5a1c2ebca..a7c93a65734fb2906aa85a3ee7abbf311de5ebb8 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_reload.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f367f22075d5330342e0e87dc12ee8a463abb05
Binary files /dev/null and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
index 31fae3afa2af6f52387268e77f4877454349c198..bcb04426474d344c4a225b2339fdcb886a5032fe 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
index 5a85fed1ef898694318082becdd62913a96aff4c..0fb51cf4931c59a25e762c4a18b02de6eb491ce5 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png differ
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png
index 31fae3afa2af6f52387268e77f4877454349c198..bcb04426474d344c4a225b2339fdcb886a5032fe 100644
Binary files a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png and b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_reload.png differ
diff --git a/tests/UI/expected-screenshots/SimpleUITest_simplePage.png b/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
index 88e759fdf42086fdcff9af9fa6ef07814344da2b..7d008f2447f1fdc30a926d74b026f49d69c6dc6e 100644
Binary files a/tests/UI/expected-screenshots/SimpleUITest_simplePage.png and b/tests/UI/expected-screenshots/SimpleUITest_simplePage.png differ
diff --git a/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png b/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
index 80ceeecb4bfaf64f85fc2c2d629d3a6eef00e83f..546af84765cb83ac688a9b5cf019a037d62a8c28 100644
Binary files a/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png and b/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png differ
diff --git a/tests/UI/expected-screenshots/SiteSelector_expanded.png b/tests/UI/expected-screenshots/SiteSelector_expanded.png
index 96411d5bc68f2410e476f53b5d0d871c2ec1a647..e29757aa8a4b21eccd27f373860817f2396b32c3 100644
Binary files a/tests/UI/expected-screenshots/SiteSelector_expanded.png and b/tests/UI/expected-screenshots/SiteSelector_expanded.png differ
diff --git a/tests/UI/expected-screenshots/SiteSelector_loaded.png b/tests/UI/expected-screenshots/SiteSelector_loaded.png
index 2999fca5192a7f4e416b58787945705df2b7377d..bfcfa029c76672735f53b4bd9856a96fb59f437e 100644
Binary files a/tests/UI/expected-screenshots/SiteSelector_loaded.png and b/tests/UI/expected-screenshots/SiteSelector_loaded.png differ
diff --git a/tests/UI/expected-screenshots/SiteSelector_search_no_results.png b/tests/UI/expected-screenshots/SiteSelector_search_no_results.png
index 4217d8a32fec979a39523e78faec8410d743009e..6670224be6a5d5147a53b9d3f4526f710e126b9a 100644
Binary files a/tests/UI/expected-screenshots/SiteSelector_search_no_results.png and b/tests/UI/expected-screenshots/SiteSelector_search_no_results.png differ
diff --git a/tests/UI/expected-screenshots/SiteSelector_search_one_char.png b/tests/UI/expected-screenshots/SiteSelector_search_one_char.png
index 3167aaff7bd80a4fecb82030041b80be62922c2c..ffecdd7186fbd9ccd3e62f0b4ca8bccfab448220 100644
Binary files a/tests/UI/expected-screenshots/SiteSelector_search_one_char.png and b/tests/UI/expected-screenshots/SiteSelector_search_one_char.png differ
diff --git a/tests/UI/expected-screenshots/SiteSelector_site_selected.png b/tests/UI/expected-screenshots/SiteSelector_site_selected.png
index e1f1025706b1aeaff941ff7c21c42fdb4d59fdff..bfcfa029c76672735f53b4bd9856a96fb59f437e 100644
Binary files a/tests/UI/expected-screenshots/SiteSelector_site_selected.png and b/tests/UI/expected-screenshots/SiteSelector_site_selected.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_loaded.png b/tests/UI/expected-screenshots/SitesManager_loaded.png
index 6121498f5b19317e742258013a0a2e6bf66f49d3..81968c870479f16fe0144f108ca0ee62aafdb38d 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_loaded.png and b/tests/UI/expected-screenshots/SitesManager_loaded.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_page_1.png b/tests/UI/expected-screenshots/SitesManager_page_1.png
index 6d4fb4910a63a507d137b969545fa131e87629ee..f58f4cc1d87ad42e0d551ae8e88384432e7d9802 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_page_1.png and b/tests/UI/expected-screenshots/SitesManager_page_1.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/tests/UI/expected-screenshots/SitesManager_page_1_again.png
index a09705696a3a1a435cdc921b2a516f6c3a260dea..eb1a7fd218bb78ecb49570a7753e3f9d2ffbf223 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_page_1_again.png and b/tests/UI/expected-screenshots/SitesManager_page_1_again.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_page_2.png b/tests/UI/expected-screenshots/SitesManager_page_2.png
index 4883155e723bd2c39ddeeb43f0050e25c673c22b..cc844844bf5cc2e14555883d96b069cfdf0cdfa7 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_page_2.png and b/tests/UI/expected-screenshots/SitesManager_page_2.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_search.png b/tests/UI/expected-screenshots/SitesManager_search.png
index 93bfd2829c86430926b85c40a11138c3698ef741..2115b68c39766a2ece1319d2a963e6725f050fcb 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_search.png and b/tests/UI/expected-screenshots/SitesManager_search.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_search_no_result.png b/tests/UI/expected-screenshots/SitesManager_search_no_result.png
index bb4d59a20d0a6931b9331b74571824ae01445ba3..e787545ae66526d8eb3b96944519ce4cf2c4bb8a 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_search_no_result.png and b/tests/UI/expected-screenshots/SitesManager_search_no_result.png differ
diff --git a/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/tests/UI/expected-screenshots/SitesManager_search_page_1.png
index c1a3c7673688b6022be2bb4974d63a18ca5c108d..75ef111a922da6c70972605f985b958518f3c49e 100644
Binary files a/tests/UI/expected-screenshots/SitesManager_search_page_1.png and b/tests/UI/expected-screenshots/SitesManager_search_page_1.png differ
diff --git a/tests/UI/expected-screenshots/Theme_demo.png b/tests/UI/expected-screenshots/Theme_demo.png
index d8fb712c65ac619a5054e115233811019010ef1e..9d607208addf3d004eee1883fcaed1577149242b 100644
Binary files a/tests/UI/expected-screenshots/Theme_demo.png and b/tests/UI/expected-screenshots/Theme_demo.png differ
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index a034878bbd27a7e86a9a84fa86cac9a572339dea..16b4b5f11252d9709ae5ace595e662579c1b3b07 100644
Binary files a/tests/UI/expected-screenshots/Theme_home.png and b/tests/UI/expected-screenshots/Theme_home.png differ
diff --git a/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png b/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png
index 88e2ee082c3977276c3494d14c7e8b77d70db2d7..4fb8e616847236a0550a78cee5274262cab89553 100644
Binary files a/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png and b/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png differ
diff --git a/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
index f06798c97da61d832ac8ebb794c60edac001fcd7..c2fc015d871b5a595bd3071767f567e4b1ae49d1 100644
Binary files a/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png and b/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png
index 45f1cb4dbc80d0a69a0bb9311e2a64d35bf5dd30..c16c821e92b040a9e752750075f95f4f7cb3d3ea 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png
index a9546924c3f4d94af04c4830632de73c91a928ec..a6f6ecc8d7ab183507417e8bdbad8d2201b36bc0 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png
index 07bb1479ee7a9f33759d521d46a25d8598d58925..3f839971abfdbdc03efd4b52a1192a30d503fed4 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png
index 70c1ca270b961318ca4d6e8f541246b2f5c4bc2f..cb10f51bc65ce680433bb96f031aee340ec9d377 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png
index 2622b98d69db35b86750a170c2ad21a59d699c77..899450d427cc7bd063623e32c71c166969682cf9 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png
index de6931fbdcf5b819835c4eea186b7aa1f568495d..f2a08a8187ffb6814b8e601a7c7c133981713c7a 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png
index abc1ceaf5fe23b49df5111f8386ceeb3313300e5..50e3b2c7eff2484b9543de4cec70a20b5289669f 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png
index f89db652f171d155e57c72b99976cca6137772bd..21ead98717a637bd2695710147eb28e4cff963fa 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png
index 8e64219d864dc5ae70ac1006daf6f7d52210b204..603772aaf9aa510624523e83cf698c6c40518d16 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png
index 6e55ebb4e40114a7648ad858801a31e925d57feb..d5df145fc50b70543f48ab963f969d7dc4fbacc5 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd9ab804b32eebacf1029f4e280e94291c686e8
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png
index cf4da612d2cb3d2eae3e2620cf465e115cc21c19..a68c6823482c83828d4289e453b0b84cf4fe291b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png and b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6f20ad193d687771ad69663c84aa1310a64a51
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index 1f01a37a91cee5472a167d7d78a2dadaee1bfa0a..6b3e9726cdc441648e24bb44c393ab333b181834 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png
index 7061be6addada184c365e9d69a1f7d9dc6492b7c..0efdda4b3784930cad244b8e87c19a41038e7648 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
index 1ccf4f6f08ceef7592e5c7d58aca36c3a7939435..0c6ef2495a3c06a539a87bec2822fc527990184e 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugin_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugin_settings.png
index 2781f0696e8a26c9daab968de381ca831b13bb11..f356e609b89abc5c6928e70b2d887bfdac101f49 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugin_settings.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugin_settings.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
index 97fc490cd0c53fe906f2de60a32bc820cfac3fb2..7cb2ca4afff57061684ee2d59112c7d2a725c091 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png
index f2744072a4a5bbea606f09353aa58a8f6af4d947..1f89ac43f7e5a717f5fddbea018de54791dedef7 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index 5d59c660f5dc20a22181564af640e70d57764033..c4a32b5e3b3f217448fe7ca7b43b01d6b83e98b2 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
index 8eca10116e040ef1caae64ada98099b43d1020a1..c7c6e19e95dd6aa433bf3ad4d7731607bcb25619 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png
index 7e6b2fc472fcf2c30dda4ad6c1a770c87f34468b..0e7bade290807e5a43b935681d550e6b791555dd 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png
index a11dc074411a1baf6cfe60afd220c2ecbe9f1ad5..5d5b7cfde68da628e1529ab75e2207067c16c5cf 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png
index 448cfa7573acef6fa13c0ca2ea413467595388e5..7e67d391ea0f813448d28033b74290a2e2507dfa 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 9834bd88c6a7784e1d45fc915c70f2c78ebc8bb7..25d961246e34546119e60a75f93d7afe1e631395 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png and b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png
index 747a69fefeb7aff904c7ef4f9799245588f5a02f..f298fd892859aa4c8aae95ca037fdb6fbc13ab31 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png and b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png
index 072348b77d4f57ebdadaf0fe0bb76d26993566be..e11b9d94530072dfc8f35d0fc84099e20b958098 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png and b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index 6c8de3a240030c5a6383cc66a16ca2d540c29dfb..700c71ed52915cf3303dfb4b35a850ade4a65af1 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
index 76229f9bd89fb053d3b0df57ec5568f214c4a680..f505ad79db1ddeebe2a5c708030678645f0bcc53 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
index c6b2786c0bc227ab9700c09a75cb9b2f7cb31b52..2bc710e9569d9d69c086dc75a2142ca5e6652636 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png
index 94dd787be5565405e506e20605082b9e24bf4aa2..d6e4e59a349d1995a0b5325dbd9491b1b9bba6eb 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png
index 028bd0ceb2b0012ae28aa114f0ee66ac3e13ff3f..b38b8799a21c749d64ac1667589a553bf36ab0a2 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png
index b942f21763348903faadd02e16e60bc533285223..71fbf4910850263a8f4b378d816ce5d7aac3d446 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png and b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
index a7cb8ec1ffce0ac9e8d6275e9977e978239e4c41..fa19d943824ce863fa05f3ae185bf2495a2283e5 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png and b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png
index 34443c26fff012e4fd3c36bfdc6799679d4042ee..a64f972f418d41e27a6c6ebda3555d155c9931ef 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png and b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png
index 81221d1201e586aad1d5c1ce8ba5d8877f01e4c7..7dbf6eabbee4c0de9b47bfa203cdde76adf003c6 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png and b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png
index d757c0d23f4c825d25c225e02905d68b0baa66e2..c1374f9c90b77aab8c5cad397bf69dae841397b8 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png and b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
index 98af2c2259c96d4caf609911e563faa49c0716ec..6dfc2e26d14d5d663b57e63620b732f23ddca8ea 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png and b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..c78b4c69d504989ab63f2668cf823dcbaa41f44d
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_barGraph.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_barGraph.png
index 884b01625305290834fcd2353fc8e82ba2bda66f..8adf5c85a8de7db6dd99cb3c43ab3a18c79114f2 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_barGraph.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_barGraph.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png
index 2c1f5f0fc73a93d9870f9d54ddd5661b077e4b78..6dc6aea4dd50f39169520c96cb973acd36166b7b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_evolutionGraph.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_evolutionGraph.png
index 0cc44fb4a317ba57600c6e42272e65d823c29a70..2d8fcf8af3467001691c8b831c1cd47d600bf23b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_evolutionGraph.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_evolutionGraph.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png
index 8670533c72dadf02f82d1f8735e3326d50b4ef92..5eb71ae8ecaa21d3e54cbf009cdd96ee5475eb8f 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_pieGraph.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png
index 5c6e8c57e136b363a276d6d48363679eb49cabce..4ffee5b30165fb0be4d4102df88a9e3ad3e0a7ea 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_sparklines.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png
index 259746cd9977762d345df2e9e35d485fa2eb5eaa..44427f127a5759b567d26ad9bc532cc0dfdd31c3 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_tagClouds.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_treemap.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_treemap.png
index 0d0f34ef86b0065c4625799711ec44bc83d4221c..e9e084013efe9cd1a369e6daee7c09aab0d55ed7 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_treemap.png and b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_treemap.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png
index 270f6943f1d7a66814fa085693f3e21eca72ff5d..1908a52f2318c473b7db25e04b3959b7fac97477 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png and b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png
index 6d7c428fb8adf17713e7aa99547f5417c2b5db49..8ca1213ca86bc28d4c219dec450a3c7cee2fedf5 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png and b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png
index 34443c26fff012e4fd3c36bfdc6799679d4042ee..a64f972f418d41e27a6c6ebda3555d155c9931ef 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png and b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
index d5f1405b19280fab4b31f6a63a6a369a7544d388..956323345a8b40df0a550d097921e290e7164750 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png and b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png
index 275531028cd461d9d6effc71f01099c24005be64..c4929d3a0f83418a455ea7ebe175ceb07259386a 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png and b/tests/UI/expected-screenshots/UIIntegrationTest_goals_manage.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png
index da72726a341d1d7c828b179febed7cf08b1f6059..b6303d7ccba5977bc56a956567dc7af51d8b4cc5 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png and b/tests/UI/expected-screenshots/UIIntegrationTest_goals_overview.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png
index 7df30b05594a5f3496ad02841be4e10ffdfa04bf..bd901bc5cdc43906378c837b29a6c5d4a5919cab 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png and b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf3381c621734a4d4a0bc0bbe2557f40a27bc4ad
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png
index 1f6b7cd3faa8f0134f004ba46b1e703ec8661efd..509c02a6d4757ff5a17fba4452727813582ec9a2 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png and b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
index 3883c83b7c519861a876da6b38675997f6060189..8ab42ab70d3a588d42d0ec700ce30a3b3340f41b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png and b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png
index 870e0eb9859fa2c83aa813b521f9277c821f33da..8b0957af37cf06903579e3cd2088f0a5d09e80a7 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png and b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png
index 90e855e00746a0bc5c5306e2e03a387cc2244d0b..c556ebb546e081e25040c51ffa18784c9230c7af 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png and b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png
index 701b0524e2655783053da618ccb3a8f77d0b07cb..7f0a404ca0fece0725e99e82f8c13abd578bb20e 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png and b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_overview.png differ
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 32669160f4a0e6a1b0a7e0d08620e3b18a5630db..6913a0a47fdd7f1dbfcd1b5277dd084d68c27781 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png and b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites_social.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites_social.png
index 1a4631d99ffeab43e596f6236f63edefa733318d..98502d6a37d2a8ce864faffaee6e5b3fb8aca832 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites_social.png and b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites_social.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_user_plugin_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_user_plugin_settings.png
index df9003f7991f092136938e0f0a3551f0fb553129..de2397a0d532669ff0693b9c657e2740eb4014f9 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_user_plugin_settings.png and b/tests/UI/expected-screenshots/UIIntegrationTest_user_plugin_settings.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_user_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_user_settings_mobilemessaging.png
index bc15b8cdcd8f34b29e9a307937607cfbec6a6c00..801977a6b1f2a1f1e74b6a6ba87443ee12e3dd67 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_user_settings_mobilemessaging.png and b/tests/UI/expected-screenshots/UIIntegrationTest_user_settings_mobilemessaging.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_usersettings_index.png b/tests/UI/expected-screenshots/UIIntegrationTest_usersettings_index.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe49a42c16a7f8a372d21213c288606a0eab0ae8
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_usersettings_index.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
index ac337dc22ea705bd334b44688f9be81d837025ca..52aa22320307c70d3baedc52ca02455a0110950f 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png
index 9734adc4487f3303f0d032154239a283501328bb..d926da059b4460de916a3f0a16b61fbc9df5d9b0 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png
index 9acf4d085255ce300ac94d9d6a5c7c3a17b61515..cfbdd34368574e984808936d0b33fbef40315e69 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png
index a3f912d9369fe2b0a458bbd53234394abe04fb0c..8fc67ca89bf31ffbfdfe31c78a89241523216fb4 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png
index d60eac4c71d66c897b3cea7c750c02302d5e3413..735400ab1ab33db85df829c8a994586fcc967be7 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png
index 61ec1b2df8a4adb229258caa929a3e501eea0cbb..68ffb353e91434484d230ba7fe91caf3c1fd1e4d 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_reloaded.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_reloaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ffb353e91434484d230ba7fe91caf3c1fd1e4d
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_reloaded.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png
index 9676e156aec2d0bd93a6246f7331bb56cdce118e..3a58459613e129c1c66e2946b6fc1b8027eaf7b8 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
index f9bc62e03a123c38048738d66818c4a8839546ab..55cb594d3e979da02e411c233b3a9906694f59ae 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png
index d656036c98e54a7ee026e9d82b6df35dd3e6b18f..fe49a42c16a7f8a372d21213c288606a0eab0ae8 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png
index ef478202d418c42f870e587984a7dbd982513825..93d0c414782a57bf5b9e1439fc6edbbce3e41657 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png
index 98b3054509ff2536e520c035436f7fff389a40a4..18319aab7f034d0b8e4842f5547ed5975e51db0b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png differ
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
new file mode 100644
index 0000000000000000000000000000000000000000..e0f948f00c9179aff16341e0f756a489ac85df8a
Binary files /dev/null and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png
index 6c131995402e8774fdc845b374ef1341922386ef..0a34de76529e08cd977b04ad27a9087d64f2bbaa 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png
index 4c9532248d80459ad3a903ad5827fc64d25768bf..6cecbf06062be6b45cca768cde6fb4b7a3e39e8c 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png
index 5fb8543b2a93ffddb55a1ebdf0109d286eacec8f..8ccddf4db8fb3bdf64121dd8e74c7868aad0734d 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png
index d0cd1f4140490c4d32742de440efa14e4b540256..0870fdae3836153e6696c2aa6b6de4864531fcdf 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
index 5c142f5689be6e4829febbe8102b42919b6c0079..b5711a72eb4beb73b1556d3eb064751989419fe3 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4152161979a013889440d2c11403fe33f91356b9
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..746961337fe94526e47fc70cb7f19682d30f721a
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c0291ecaeae6889030dfc1acc422e6adc205063
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ae54acb4c0e7e5f8ef01d7037103052c432f474
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png
new file mode 100644
index 0000000000000000000000000000000000000000..82cac6f370771cb6e473f0eb9b11aaf0a7d277ca
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png
new file mode 100644
index 0000000000000000000000000000000000000000..c09cc0e31a24c2ffa3d62c8eb09be73969c1e97f
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2266609aa79366b2b5c5d6d94c6d5cbc280bfeb
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1c0a5c0e39d58e5836810d4726bd1836380fa64
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png differ
diff --git a/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png b/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc739d9ecf566e116f18cfd9ccfc036b93202f25
Binary files /dev/null and b/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png
index dc2f20d4db30ce3f95dffb7b9f96a2cdf082aa14..a254105e36c30a146afe77109fba832794aca4d5 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png and b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png
index ada693e3c6bb58c39de260bc6eeaccc6172cdcba..88c51ab11b0f93cd6dd251984bb5351c43a15597 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png and b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png
index 7d8848f222078ec9ef52284698629833905f1fb0..cc6893405b350a57bdc8a818d0e0fec630e562f5 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png and b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
index 3c37eb6953ac6fc3c30fa803bfcecf663626bc46..27c4ea10f8ada3e94dce1c4dd9fe725bf704668f 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png and b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png
index ada693e3c6bb58c39de260bc6eeaccc6172cdcba..88c51ab11b0f93cd6dd251984bb5351c43a15597 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png and b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png
index 8e7209afc9537cbf5a86124eef63957f0d633bdc..2fea4616e218e3449c394f1d637c804a35415145 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png and b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png
index 8f89fdfcedeb99f740c7296d271b9c4f824b9350..ea2a50ba83fedd385c3de53d68655cb62126eb2d 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png and b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png
index 8e7c74e3a465d6f53bdae335165cf0be8f81c381..50fc4c396777c325361c3838c51a7f3be5c70a79 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png and b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png
index 6ea3b0448c66be200eb10f45bb0955e2fdb82a5c..323e408159df666fe7b2651ec838dbb8b796dacc 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png and b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png
index 3a434eac5d45f578f4a39a53b1442541d309149f..bc31b33f10fe0d1b319ee125997ed73bc5811df4 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png and b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_4_exclude_low_population.png b/tests/UI/expected-screenshots/ViewDataTableTest_4_exclude_low_population.png
index 542e47af1a97f862a9d3db26d68556d5c4437a68..dc21fe144e8baaef31401a7c439ff28fe07154bf 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_4_exclude_low_population.png and b/tests/UI/expected-screenshots/ViewDataTableTest_4_exclude_low_population.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png
index a785bfdc9b61ab63de5ff11478f15a4a8ff72e10..8680acb34eb3525324a8c2ea9869a2c327f97926 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png and b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png
index 6e95a4dec79613fbb44b150cdc95f02410cea7b1..50cbfdc5a3dc4b96646913d203f9a71e2a6b776e 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png and b/tests/UI/expected-screenshots/ViewDataTableTest_6_bar_graph.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png
index 6e95a4dec79613fbb44b150cdc95f02410cea7b1..50cbfdc5a3dc4b96646913d203f9a71e2a6b776e 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png and b/tests/UI/expected-screenshots/ViewDataTableTest_7_pie_graph.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png
index 6e95a4dec79613fbb44b150cdc95f02410cea7b1..6f1ee34c9e9b9d1c984c8915c7ed3d054c0f59c7 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png and b/tests/UI/expected-screenshots/ViewDataTableTest_8_tag_cloud.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png
index 8f283ad8613250ee84b269125cdc3990d7931c8a..4cc2749a260583bae51816b46dfa0f6349cf1ae2 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png and b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png
index 7d05fd9df730afcf9269d748e30d262c5a469c12..9e6ecb32a4d39e224b6a351c3ee7d5ec8110b8e0 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png and b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png
index 70e429900cb0341b5df7e3c80ac75742797a8a7a..356e0358b6a7c8e52fd67bac123f5aa478cd64ed 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png and b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png
index 1e08885b017502ead839944f3392b856dfeed098..9c753c90cbbdd884138dc0044c41ff59d59fece9 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png and b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png differ
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png
index 56298cb82834d136decee46a67a5db20b60cfbd5..2e8e2d0d9f222a13f6f3704b4dee53e1b7e9fb40 100644
Binary files a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png and b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png differ