Fix tests (#12488)

* update expected system test file

* update UI files

* update test files

* add wait time

* update ui files

3 files changed, 645 insertions, 645 deletions

diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
index 95a3eebfc1..9ef44c8710 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
@@ -246,4 +246,4 @@
 			</row>
 		</settings>
 	</row>
-</result>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 1dad246e2b..7976dd0f7a 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -99,7 +99,7 @@
 		<category>Visitors</category>
 		<name>Device brand</name>
 		<segment>deviceBrand</segment>
-		<acceptedValues>3Q, 4Good, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, BangOlufsen, Barnes &amp; Noble, BBK, Becker, Beetel, BenQ, BenQ-Siemens, Bird, Blackview, Blaupunkt, Blu, Bmobile, Boway, bq, Bravis, Brondi, Bush, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Compal, Compaq, ConCorde, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Dbtel, Dell, Denver, Desay, DEXP, Dicam, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Dune HD, E-Boda, Easypix, EBEST, ECS, Elephone, Energy Sistem, Ericsson, Ericy, Eton, eTouch, Evertek, Evolveo, Explay, Ezio, Ezze, Fairphone, Fly, Foxconn, Freetel, Fujitsu, Garmin-Asus, Gateway, Gemini, Gigabyte, Gigaset, Gionee, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, Ikea, iKoMo, iNew, Infinix, Inkti, Innostream, INQ, Intek, Intex, Inverto, iOcean, iTel, JAY-Tech, Jiayu, Jolla, K-Touch, Karbonn, Kazam, KDDI, Kiano, Kingsun, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KT-Tech, Kumai, Kyocera, Landvo, Lanix, Lava, LCT, LeEco, Lenco, Lenovo, Le Pan, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., Majestic, Manta Multimedia, Mecer, Mediacom, MediaTek, Medion, MEEG, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Mitsubishi, MIXC, MLLED, Mobistel, Modecom, Mofut, Motorola, Mpman, MSI, MyPhone, NEC, Neffos, Netgear, Newgen, Nexian, NextBook, NGM, Nikon, Nintendo, Noain, Nokia, Nomi, Nous, Nvidia, O2, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panasonic, Pantech, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Point of View, Polaroid, PolyPad, Pomp, Positivo, PPTV, Prestigio, ProScan, PULID, Qilive, QMobile, Qtek, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Sagem, Samsung, Sanyo, Sega, Selevision, Sencor, Sendo, Senseit, SFR, Sharp, Siemens, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sony, Sony Ericsson, Spice, Star, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, TrekStor, Trevi, Tunisie Telecom, Turbo-X, TVC, UMIDIGI, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Voto, Voxtel, Walton, Web TV, WellcoM, Wexler, Wiko, Wileyfox, Wolder, Wolfgang, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Ytone, Yuandao, Yusun, Zeemi, Zen, Zonda, Zopo, ZTE</acceptedValues>
+		<acceptedValues>3Q, 4Good, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, BangOlufsen, Barnes &amp; Noble, BBK, Becker, Beetel, BenQ, BenQ-Siemens, Bird, Blackview, Blaupunkt, Blu, Bmobile, Boway, bq, Bravis, Brondi, Bush, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Compal, Compaq, ConCorde, Condor, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Dbtel, Dell, Denver, Desay, DEXP, Dicam, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Dune HD, E-Boda, Easypix, EBEST, ECS, Elephone, Energy Sistem, Ericsson, Ericy, Eton, eTouch, Evertek, Evolveo, Explay, Ezio, Ezze, Fairphone, Fly, Foxconn, Freetel, Fujitsu, Garmin-Asus, Gateway, Gemini, Gigabyte, Gigaset, Gionee, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, Ikea, iKoMo, iNew, Infinix, Inkti, Innostream, INQ, Intek, Intex, Inverto, iOcean, iTel, JAY-Tech, Jiayu, Jolla, K-Touch, Karbonn, Kazam, KDDI, Kiano, Kingsun, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KT-Tech, Kumai, Kyocera, Landvo, Lanix, Lava, LCT, LeEco, Lenco, Lenovo, Le Pan, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., Majestic, Manta Multimedia, Mecer, Mediacom, MediaTek, Medion, MEEG, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Mitsubishi, MIXC, MLLED, Mobistel, Modecom, Mofut, Motorola, Mpman, MSI, MyPhone, NEC, Neffos, Netgear, Newgen, Nexian, NextBook, NGM, Nikon, Nintendo, Noain, Nokia, Nomi, Nous, Nvidia, O2, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panasonic, Pantech, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Point of View, Polaroid, PolyPad, Pomp, Positivo, PPTV, Prestigio, ProScan, PULID, Qilive, QMobile, Qtek, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Sagem, Samsung, Sanyo, Sega, Selevision, Sencor, Sendo, Senseit, SFR, Sharp, Siemens, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sony, Sony Ericsson, Spice, Star, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, TrekStor, Trevi, Tunisie Telecom, Turbo-X, TVC, UMIDIGI, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Voto, Voxtel, Walton, Web TV, WellcoM, Wexler, Wiko, Wileyfox, Wolder, Wolfgang, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Ytone, Yuandao, Yusun, Zeemi, Zen, Zonda, Zopo, ZTE</acceptedValues>
 	</row>
 	<row>
 		<type>dimension</type>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 7ca17a4c0c..7364b089c9 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>Visitors in Real-time</name>
+		<name>Real Time Visitor Count</name>
 		<category>
 			<id>Live!</id>
 			<name>Live!</name>
@@ -10,17 +10,19 @@
 		</category>
 		<subcategory />
 		<module>Live</module>
-		<action>widget</action>
-		<order>20</order>
+		<action>getSimpleLastVisitCount</action>
+		<order>15</order>
 		<parameters>
 			<module>Live</module>
-			<action>widget</action>
+			<action>getSimpleLastVisitCount</action>
 		</parameters>
-		<uniqueId>widgetLivewidget</uniqueId>
+		<uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
 		<isWide>0</isWide>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Real Time Visitor Count</name>
+		<name>Visitors in Real-time</name>
 		<category>
 			<id>Live!</id>
 			<name>Live!</name>
@@ -29,19 +31,17 @@
 		</category>
 		<subcategory />
 		<module>Live</module>
-		<action>getSimpleLastVisitCount</action>
-		<order>15</order>
+		<action>widget</action>
+		<order>20</order>
 		<parameters>
 			<module>Live</module>
-			<action>getSimpleLastVisitCount</action>
+			<action>widget</action>
 		</parameters>
-		<uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
+		<uniqueId>widgetLivewidget</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Over Time</name>
+		<name>Visits Overview</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -54,21 +54,21 @@
 			<order>2</order>
 		</subcategory>
 		<module>VisitsSummary</module>
-		<action>getEvolutionGraph</action>
-		<order>5</order>
+		<action>get</action>
+		<order>10</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>graphEvolution</viewDataTable>
+			<viewDataTable>sparklines</viewDataTable>
 			<module>VisitsSummary</module>
-			<action>getEvolutionGraph</action>
+			<action>get</action>
 		</parameters>
-		<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+		<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphEvolution</viewDataTable>
+		<viewDataTable>sparklines</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Overview</name>
+		<name>Visits Over Time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -81,17 +81,17 @@
 			<order>2</order>
 		</subcategory>
 		<module>VisitsSummary</module>
-		<action>get</action>
-		<order>10</order>
+		<action>getEvolutionGraph</action>
+		<order>5</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>sparklines</viewDataTable>
+			<viewDataTable>graphEvolution</viewDataTable>
 			<module>VisitsSummary</module>
-			<action>get</action>
+			<action>getEvolutionGraph</action>
 		</parameters>
-		<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+		<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>sparklines</viewDataTable>
+		<viewDataTable>graphEvolution</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -198,7 +198,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device model</name>
+		<name>Device brand</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -211,97 +211,19 @@
 			<order>15</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getModel</action>
-		<order>102</order>
+		<action>getBrand</action>
+		<order>104</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getModel</action>
+			<action>getBrand</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetModel</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits Overview (with graph)</name>
-		<category>
-			<id>General_Visitors</id>
-			<name>Visitors</name>
-			<order>5</order>
-			<icon>icon-reporting-visitors</icon>
-		</category>
-		<subcategory />
-		<module>CoreHome</module>
-		<action>renderWidgetContainer</action>
-		<order>99</order>
-		<parameters>
-			<module>CoreHome</module>
-			<action>renderWidgetContainer</action>
-			<containerId>VisitOverviewWithGraph</containerId>
-		</parameters>
-		<uniqueId>widgetVisitOverviewWithGraph</uniqueId>
-		<isWide>0</isWide>
-		<layout />
-		<isContainer>1</isContainer>
-		<widgets>
-			<row>
-				<name>Visits Over Time</name>
-				<category>
-					<id>General_Visitors</id>
-					<name>Visitors</name>
-					<order>99</order>
-					<icon />
-				</category>
-				<subcategory>
-					<id>General_Overview</id>
-					<name>Overview</name>
-					<order>99</order>
-				</subcategory>
-				<module>VisitsSummary</module>
-				<action>getEvolutionGraph</action>
-				<order>5</order>
-				<parameters>
-					<forceView>1</forceView>
-					<viewDataTable>graphEvolution</viewDataTable>
-					<module>VisitsSummary</module>
-					<action>getEvolutionGraph</action>
-				</parameters>
-				<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
-				<isWide>0</isWide>
-				<viewDataTable>graphEvolution</viewDataTable>
-				<isReport>1</isReport>
-			</row>
-			<row>
-				<name>Visits Overview</name>
-				<category>
-					<id>General_Visitors</id>
-					<name>Visitors</name>
-					<order>99</order>
-					<icon />
-				</category>
-				<subcategory>
-					<id>General_Overview</id>
-					<name>Overview</name>
-					<order>99</order>
-				</subcategory>
-				<module>VisitsSummary</module>
-				<action>get</action>
-				<order>10</order>
-				<parameters>
-					<forceView>1</forceView>
-					<viewDataTable>sparklines</viewDataTable>
-					<module>VisitsSummary</module>
-					<action>get</action>
-				</parameters>
-				<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
-				<isWide>0</isWide>
-				<viewDataTable>sparklines</viewDataTable>
-				<isReport>1</isReport>
-			</row>
-		</widgets>
-	</row>
-	<row>
-		<name>Device brand</name>
+		<name>Device model</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -314,13 +236,13 @@
 			<order>15</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrand</action>
-		<order>104</order>
+		<action>getModel</action>
+		<order>102</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrand</action>
+			<action>getModel</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetModel</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -401,7 +323,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser version</name>
+		<name>Browser engines</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -414,19 +336,19 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrowserVersions</action>
-		<order>106</order>
+		<action>getBrowserEngines</action>
+		<order>110</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrowserVersions</action>
+			<action>getBrowserEngines</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
+		<viewDataTable>graphPie</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Configurations</name>
+		<name>Operating System families</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -438,20 +360,20 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>Resolution</module>
-		<action>getConfiguration</action>
-		<order>107</order>
+		<module>DevicesDetection</module>
+		<action>getOsFamilies</action>
+		<order>108</order>
 		<parameters>
-			<module>Resolution</module>
-			<action>getConfiguration</action>
+			<module>DevicesDetection</module>
+			<action>getOsFamilies</action>
 		</parameters>
-		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Operating System families</name>
+		<name>Browser Plugins</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -463,20 +385,20 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getOsFamilies</action>
-		<order>108</order>
+		<module>DevicePlugins</module>
+		<action>getPlugin</action>
+		<order>113</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getOsFamilies</action>
+			<module>DevicePlugins</module>
+			<action>getPlugin</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+		<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser engines</name>
+		<name>Configurations</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -488,20 +410,20 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getBrowserEngines</action>
-		<order>110</order>
+		<module>Resolution</module>
+		<action>getConfiguration</action>
+		<order>107</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getBrowserEngines</action>
+			<module>Resolution</module>
+			<action>getConfiguration</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId>
+		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphPie</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser Plugins</name>
+		<name>Browser version</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -513,14 +435,39 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>DevicePlugins</module>
-		<action>getPlugin</action>
-		<order>113</order>
+		<module>DevicesDetection</module>
+		<action>getBrowserVersions</action>
+		<order>106</order>
 		<parameters>
-			<module>DevicePlugins</module>
-			<action>getPlugin</action>
+			<module>DevicesDetection</module>
+			<action>getBrowserVersions</action>
 		</parameters>
-		<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Browser language</name>
+		<category>
+			<id>General_Visitors</id>
+			<name>Visitors</name>
+			<order>5</order>
+			<icon>icon-reporting-visitors</icon>
+		</category>
+		<subcategory>
+			<id>UserCountry_SubmenuLocations</id>
+			<name>Locations</name>
+			<order>25</order>
+		</subcategory>
+		<module>UserLanguage</module>
+		<action>getLanguage</action>
+		<order>108</order>
+		<parameters>
+			<module>UserLanguage</module>
+			<action>getLanguage</action>
+		</parameters>
+		<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -551,7 +498,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visitor Map</name>
+		<name>Region</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -563,15 +510,17 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserCountryMap</module>
-		<action>visitorMap</action>
-		<order>1</order>
+		<module>UserCountry</module>
+		<action>getRegion</action>
+		<order>107</order>
 		<parameters>
-			<module>UserCountryMap</module>
-			<action>visitorMap</action>
+			<module>UserCountry</module>
+			<action>getRegion</action>
 		</parameters>
-		<uniqueId>widgetUserCountryMapvisitorMap</uniqueId>
+		<uniqueId>widgetUserCountrygetRegion</uniqueId>
 		<isWide>0</isWide>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
 	</row>
 	<row>
 		<name>Country</name>
@@ -599,7 +548,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Language code</name>
+		<name>Visitor Map</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -611,20 +560,18 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserLanguage</module>
-		<action>getLanguageCode</action>
-		<order>111</order>
+		<module>UserCountryMap</module>
+		<action>visitorMap</action>
+		<order>1</order>
 		<parameters>
-			<module>UserLanguage</module>
-			<action>getLanguageCode</action>
+			<module>UserCountryMap</module>
+			<action>visitorMap</action>
 		</parameters>
-		<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
+		<uniqueId>widgetUserCountryMapvisitorMap</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser language</name>
+		<name>Continent</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -636,20 +583,20 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserLanguage</module>
-		<action>getLanguage</action>
-		<order>108</order>
+		<module>UserCountry</module>
+		<action>getContinent</action>
+		<order>106</order>
 		<parameters>
-			<module>UserLanguage</module>
-			<action>getLanguage</action>
+			<module>UserCountry</module>
+			<action>getContinent</action>
 		</parameters>
-		<uniqueId>widgetUserLanguagegetLanguage</uniqueId>
+		<uniqueId>widgetUserCountrygetContinent</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visitor profile</name>
+		<name>Visits Overview (with graph)</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -657,43 +604,77 @@
 			<icon>icon-reporting-visitors</icon>
 		</category>
 		<subcategory />
-		<module>Live</module>
-		<action>getVisitorProfilePopup</action>
-		<order>25</order>
-		<parameters>
-			<module>Live</module>
-			<action>getVisitorProfilePopup</action>
-		</parameters>
-		<uniqueId>widgetLivegetVisitorProfilePopup</uniqueId>
-		<isWide>0</isWide>
-	</row>
-	<row>
-		<name>Region</name>
-		<category>
-			<id>General_Visitors</id>
-			<name>Visitors</name>
-			<order>5</order>
-			<icon>icon-reporting-visitors</icon>
-		</category>
-		<subcategory>
-			<id>UserCountry_SubmenuLocations</id>
-			<name>Locations</name>
-			<order>25</order>
-		</subcategory>
-		<module>UserCountry</module>
-		<action>getRegion</action>
-		<order>107</order>
+		<module>CoreHome</module>
+		<action>renderWidgetContainer</action>
+		<order>99</order>
 		<parameters>
-			<module>UserCountry</module>
-			<action>getRegion</action>
+			<module>CoreHome</module>
+			<action>renderWidgetContainer</action>
+			<containerId>VisitOverviewWithGraph</containerId>
 		</parameters>
-		<uniqueId>widgetUserCountrygetRegion</uniqueId>
+		<uniqueId>widgetVisitOverviewWithGraph</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
+		<layout />
+		<isContainer>1</isContainer>
+		<widgets>
+			<row>
+				<name>Visits Over Time</name>
+				<category>
+					<id>General_Visitors</id>
+					<name>Visitors</name>
+					<order>99</order>
+					<icon />
+				</category>
+				<subcategory>
+					<id>General_Overview</id>
+					<name>Overview</name>
+					<order>99</order>
+				</subcategory>
+				<module>VisitsSummary</module>
+				<action>getEvolutionGraph</action>
+				<order>5</order>
+				<parameters>
+					<forceView>1</forceView>
+					<viewDataTable>graphEvolution</viewDataTable>
+					<module>VisitsSummary</module>
+					<action>getEvolutionGraph</action>
+				</parameters>
+				<uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+				<isWide>0</isWide>
+				<viewDataTable>graphEvolution</viewDataTable>
+				<isReport>1</isReport>
+			</row>
+			<row>
+				<name>Visits Overview</name>
+				<category>
+					<id>General_Visitors</id>
+					<name>Visitors</name>
+					<order>99</order>
+					<icon />
+				</category>
+				<subcategory>
+					<id>General_Overview</id>
+					<name>Overview</name>
+					<order>99</order>
+				</subcategory>
+				<module>VisitsSummary</module>
+				<action>get</action>
+				<order>10</order>
+				<parameters>
+					<forceView>1</forceView>
+					<viewDataTable>sparklines</viewDataTable>
+					<module>VisitsSummary</module>
+					<action>get</action>
+				</parameters>
+				<uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+				<isWide>0</isWide>
+				<viewDataTable>sparklines</viewDataTable>
+				<isReport>1</isReport>
+			</row>
+		</widgets>
 	</row>
 	<row>
-		<name>Continent</name>
+		<name>Language code</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -705,20 +686,20 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getContinent</action>
-		<order>106</order>
+		<module>UserLanguage</module>
+		<action>getLanguageCode</action>
+		<order>111</order>
 		<parameters>
-			<module>UserCountry</module>
-			<action>getContinent</action>
+			<module>UserLanguage</module>
+			<action>getLanguageCode</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetContinent</uniqueId>
+		<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per visit duration</name>
+		<name>Returning Visits Over Time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -730,20 +711,22 @@
 			<name>Engagement</name>
 			<order>30</order>
 		</subcategory>
-		<module>VisitorInterest</module>
-		<action>getNumberOfVisitsPerVisitDuration</action>
-		<order>115</order>
+		<module>VisitFrequency</module>
+		<action>getEvolutionGraph</action>
+		<order>1</order>
 		<parameters>
-			<module>VisitorInterest</module>
-			<action>getNumberOfVisitsPerVisitDuration</action>
+			<forceView>1</forceView>
+			<viewDataTable>graphEvolution</viewDataTable>
+			<module>VisitFrequency</module>
+			<action>getEvolutionGraph</action>
 		</parameters>
-		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+		<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>cloud</viewDataTable>
+		<viewDataTable>graphEvolution</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per number of pages</name>
+		<name>Visits by Days Since Last Visit</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -756,15 +739,15 @@
 			<order>30</order>
 		</subcategory>
 		<module>VisitorInterest</module>
-		<action>getNumberOfVisitsPerPage</action>
-		<order>120</order>
+		<action>getNumberOfVisitsByDaysSinceLast</action>
+		<order>130</order>
 		<parameters>
 			<module>VisitorInterest</module>
-			<action>getNumberOfVisitsPerPage</action>
+			<action>getNumberOfVisitsByDaysSinceLast</action>
 		</parameters>
-		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
+		<uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>cloud</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -793,7 +776,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits by Days Since Last Visit</name>
+		<name>Visits per number of pages</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -806,42 +789,15 @@
 			<order>30</order>
 		</subcategory>
 		<module>VisitorInterest</module>
-		<action>getNumberOfVisitsByDaysSinceLast</action>
-		<order>130</order>
+		<action>getNumberOfVisitsPerPage</action>
+		<order>120</order>
 		<parameters>
 			<module>VisitorInterest</module>
-			<action>getNumberOfVisitsByDaysSinceLast</action>
-		</parameters>
-		<uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId>
-		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
-	</row>
-	<row>
-		<name>Returning Visits Over Time</name>
-		<category>
-			<id>General_Visitors</id>
-			<name>Visitors</name>
-			<order>5</order>
-			<icon>icon-reporting-visitors</icon>
-		</category>
-		<subcategory>
-			<id>VisitorInterest_Engagement</id>
-			<name>Engagement</name>
-			<order>30</order>
-		</subcategory>
-		<module>VisitFrequency</module>
-		<action>getEvolutionGraph</action>
-		<order>1</order>
-		<parameters>
-			<forceView>1</forceView>
-			<viewDataTable>graphEvolution</viewDataTable>
-			<module>VisitFrequency</module>
-			<action>getEvolutionGraph</action>
+			<action>getNumberOfVisitsPerPage</action>
 		</parameters>
-		<uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphEvolution</viewDataTable>
+		<viewDataTable>cloud</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -897,7 +853,51 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per server time</name>
+		<name>Visitor profile</name>
+		<category>
+			<id>General_Visitors</id>
+			<name>Visitors</name>
+			<order>5</order>
+			<icon>icon-reporting-visitors</icon>
+		</category>
+		<subcategory />
+		<module>Live</module>
+		<action>getVisitorProfilePopup</action>
+		<order>25</order>
+		<parameters>
+			<module>Live</module>
+			<action>getVisitorProfilePopup</action>
+		</parameters>
+		<uniqueId>widgetLivegetVisitorProfilePopup</uniqueId>
+		<isWide>0</isWide>
+	</row>
+	<row>
+		<name>Visits per visit duration</name>
+		<category>
+			<id>General_Visitors</id>
+			<name>Visitors</name>
+			<order>5</order>
+			<icon>icon-reporting-visitors</icon>
+		</category>
+		<subcategory>
+			<id>VisitorInterest_Engagement</id>
+			<name>Engagement</name>
+			<order>30</order>
+		</subcategory>
+		<module>VisitorInterest</module>
+		<action>getNumberOfVisitsPerVisitDuration</action>
+		<order>115</order>
+		<parameters>
+			<module>VisitorInterest</module>
+			<action>getNumberOfVisitsPerVisitDuration</action>
+		</parameters>
+		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>cloud</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Visits by Day of Week</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -910,19 +910,19 @@
 			<order>35</order>
 		</subcategory>
 		<module>VisitTime</module>
-		<action>getVisitInformationPerServerTime</action>
-		<order>120</order>
+		<action>getByDayOfWeek</action>
+		<order>125</order>
 		<parameters>
 			<module>VisitTime</module>
-			<action>getVisitInformationPerServerTime</action>
+			<action>getByDayOfWeek</action>
 		</parameters>
-		<uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
+		<uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>graphVerticalBar</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits by Day of Week</name>
+		<name>Visits per server time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -935,13 +935,13 @@
 			<order>35</order>
 		</subcategory>
 		<module>VisitTime</module>
-		<action>getByDayOfWeek</action>
-		<order>125</order>
+		<action>getVisitInformationPerServerTime</action>
+		<order>120</order>
 		<parameters>
 			<module>VisitTime</module>
-			<action>getByDayOfWeek</action>
+			<action>getVisitInformationPerServerTime</action>
 		</parameters>
-		<uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
+		<uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>graphVerticalBar</viewDataTable>
 		<isReport>1</isReport>
@@ -995,7 +995,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Entry Page Titles</name>
+		<name>Entry pages</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1008,19 +1008,19 @@
 			<order>10</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getEntryPageTitles</action>
-		<order>106</order>
+		<action>getEntryPageUrls</action>
+		<order>103</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getEntryPageTitles</action>
+			<action>getEntryPageUrls</action>
 		</parameters>
-		<uniqueId>widgetActionsgetEntryPageTitles</uniqueId>
+		<uniqueId>widgetActionsgetEntryPageUrls</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Entry pages</name>
+		<name>Entry Page Titles</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1033,19 +1033,19 @@
 			<order>10</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getEntryPageUrls</action>
-		<order>103</order>
+		<action>getEntryPageTitles</action>
+		<order>106</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getEntryPageUrls</action>
+			<action>getEntryPageTitles</action>
 		</parameters>
-		<uniqueId>widgetActionsgetEntryPageUrls</uniqueId>
+		<uniqueId>widgetActionsgetEntryPageTitles</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Exit pages</name>
+		<name>Exit page titles</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1058,19 +1058,19 @@
 			<order>15</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getExitPageUrls</action>
-		<order>104</order>
+		<action>getExitPageTitles</action>
+		<order>107</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getExitPageUrls</action>
+			<action>getExitPageTitles</action>
 		</parameters>
-		<uniqueId>widgetActionsgetExitPageUrls</uniqueId>
+		<uniqueId>widgetActionsgetExitPageTitles</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Exit page titles</name>
+		<name>Exit pages</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1083,13 +1083,13 @@
 			<order>15</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getExitPageTitles</action>
-		<order>107</order>
+		<action>getExitPageUrls</action>
+		<order>104</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getExitPageTitles</action>
+			<action>getExitPageUrls</action>
 		</parameters>
-		<uniqueId>widgetActionsgetExitPageTitles</uniqueId>
+		<uniqueId>widgetActionsgetExitPageUrls</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -1120,7 +1120,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Pages Following a Site Search</name>
+		<name>Site Search Keywords</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1133,19 +1133,19 @@
 			<order>25</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getPageUrlsFollowingSiteSearch</action>
-		<order>116</order>
+		<action>getSiteSearchKeywords</action>
+		<order>115</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getPageUrlsFollowingSiteSearch</action>
+			<action>getSiteSearchKeywords</action>
 		</parameters>
-		<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
+		<uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Page Titles Following a Site Search</name>
+		<name>Pages Following a Site Search</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1158,19 +1158,19 @@
 			<order>25</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getPageTitlesFollowingSiteSearch</action>
-		<order>119</order>
+		<action>getPageUrlsFollowingSiteSearch</action>
+		<order>116</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getPageTitlesFollowingSiteSearch</action>
+			<action>getPageUrlsFollowingSiteSearch</action>
 		</parameters>
-		<uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
+		<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Search Categories</name>
+		<name>Page Titles Following a Site Search</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1183,19 +1183,19 @@
 			<order>25</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getSiteSearchCategories</action>
-		<order>120</order>
+		<action>getPageTitlesFollowingSiteSearch</action>
+		<order>119</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getSiteSearchCategories</action>
+			<action>getPageTitlesFollowingSiteSearch</action>
 		</parameters>
-		<uniqueId>widgetActionsgetSiteSearchCategories</uniqueId>
+		<uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Site Search Keywords</name>
+		<name>Search Categories</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1208,13 +1208,13 @@
 			<order>25</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getSiteSearchKeywords</action>
-		<order>115</order>
+		<action>getSiteSearchCategories</action>
+		<order>120</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getSiteSearchKeywords</action>
+			<action>getSiteSearchCategories</action>
 		</parameters>
-		<uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
+		<uniqueId>widgetActionsgetSiteSearchCategories</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -1373,7 +1373,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Event Names</name>
+		<name>Actions: Event Categories</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1386,20 +1386,20 @@
 			<order>40</order>
 		</subcategory>
 		<module>Events</module>
-		<action>getName</action>
-		<order>102</order>
+		<action>getCategory</action>
+		<order>100</order>
 		<parameters>
 			<module>Events</module>
-			<action>getName</action>
+			<action>getCategory</action>
 			<secondaryDimension>eventAction</secondaryDimension>
 		</parameters>
-		<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
+		<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Event Categories</name>
+		<name>Actions: Event Names</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1412,14 +1412,14 @@
 			<order>40</order>
 		</subcategory>
 		<module>Events</module>
-		<action>getCategory</action>
-		<order>100</order>
+		<action>getName</action>
+		<order>102</order>
 		<parameters>
 			<module>Events</module>
-			<action>getCategory</action>
+			<action>getName</action>
 			<secondaryDimension>eventAction</secondaryDimension>
 		</parameters>
-		<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
+		<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -1451,7 +1451,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Content Piece</name>
+		<name>Actions: Content Name</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1464,19 +1464,19 @@
 			<order>45</order>
 		</subcategory>
 		<module>Contents</module>
-		<action>getContentPieces</action>
-		<order>136</order>
+		<action>getContentNames</action>
+		<order>135</order>
 		<parameters>
 			<module>Contents</module>
-			<action>getContentPieces</action>
+			<action>getContentNames</action>
 		</parameters>
-		<uniqueId>widgetContentsgetContentPieces</uniqueId>
+		<uniqueId>widgetContentsgetContentNames</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Content Name</name>
+		<name>Actions: Content Piece</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1489,19 +1489,19 @@
 			<order>45</order>
 		</subcategory>
 		<module>Contents</module>
-		<action>getContentNames</action>
-		<order>135</order>
+		<action>getContentPieces</action>
+		<order>136</order>
 		<parameters>
 			<module>Contents</module>
-			<action>getContentNames</action>
+			<action>getContentPieces</action>
 		</parameters>
-		<uniqueId>widgetContentsgetContentNames</uniqueId>
+		<uniqueId>widgetContentsgetContentPieces</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Content Name</name>
+		<name>Actions: Content Piece</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1514,19 +1514,19 @@
 			<order>45</order>
 		</subcategory>
 		<module>Contents</module>
-		<action>getContentNames</action>
-		<order>135</order>
+		<action>getContentPieces</action>
+		<order>136</order>
 		<parameters>
 			<module>Contents</module>
-			<action>getContentNames</action>
+			<action>getContentPieces</action>
 		</parameters>
-		<uniqueId>widgetContentsgetContentNames</uniqueId>
+		<uniqueId>widgetContentsgetContentPieces</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Actions: Content Piece</name>
+		<name>Actions: Content Name</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1539,19 +1539,19 @@
 			<order>45</order>
 		</subcategory>
 		<module>Contents</module>
-		<action>getContentPieces</action>
-		<order>136</order>
+		<action>getContentNames</action>
+		<order>135</order>
 		<parameters>
 			<module>Contents</module>
-			<action>getContentPieces</action>
+			<action>getContentNames</action>
 		</parameters>
-		<uniqueId>widgetContentsgetContentPieces</uniqueId>
+		<uniqueId>widgetContentsgetContentNames</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Referrers</name>
+		<name>Referrer Types</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1564,19 +1564,19 @@
 			<order>5</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getAll</action>
-		<order>102</order>
+		<action>getReferrerType</action>
+		<order>101</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getAll</action>
+			<action>getReferrerType</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetAll</uniqueId>
+		<uniqueId>widgetReferrersgetReferrerType</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableAllColumns</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Referrer Types</name>
+		<name>Referrers</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1589,19 +1589,19 @@
 			<order>5</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getReferrerType</action>
-		<order>101</order>
+		<action>getAll</action>
+		<order>102</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getReferrerType</action>
+			<action>getAll</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetReferrerType</uniqueId>
+		<uniqueId>widgetReferrersgetAll</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableAllColumns</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Search Engines</name>
+		<name>Keywords</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1614,19 +1614,19 @@
 			<order>10</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getSearchEngines</action>
-		<order>107</order>
+		<action>getKeywords</action>
+		<order>103</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getSearchEngines</action>
+			<action>getKeywords</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetSearchEngines</uniqueId>
+		<uniqueId>widgetReferrersgetKeywords</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Keywords</name>
+		<name>Search Engines</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1639,13 +1639,13 @@
 			<order>10</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getKeywords</action>
-		<order>103</order>
+		<action>getSearchEngines</action>
+		<order>107</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getKeywords</action>
+			<action>getSearchEngines</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetKeywords</uniqueId>
+		<uniqueId>widgetReferrersgetSearchEngines</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -1864,7 +1864,7 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Ecommerce: Product SKU</name>
+		<name>Ecommerce: Product Name</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1877,19 +1877,19 @@
 			<order>10</order>
 		</subcategory>
 		<module>Goals</module>
-		<action>getItemsSku</action>
-		<order>130</order>
+		<action>getItemsName</action>
+		<order>131</order>
 		<parameters>
 			<module>Goals</module>
-			<action>getItemsSku</action>
+			<action>getItemsName</action>
 		</parameters>
-		<uniqueId>widgetGoalsgetItemsSku</uniqueId>
+		<uniqueId>widgetGoalsgetItemsName</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Ecommerce: Product Name</name>
+		<name>Ecommerce: Product SKU</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1902,13 +1902,13 @@
 			<order>10</order>
 		</subcategory>
 		<module>Goals</module>
-		<action>getItemsName</action>
-		<order>131</order>
+		<action>getItemsSku</action>
+		<order>130</order>
 		<parameters>
 			<module>Goals</module>
-			<action>getItemsName</action>
+			<action>getItemsSku</action>
 		</parameters>
-		<uniqueId>widgetGoalsgetItemsName</uniqueId>
+		<uniqueId>widgetGoalsgetItemsSku</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -2014,7 +2014,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Device type</name>
+		<name>Sales by User location: Country</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2026,24 +2026,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getType</action>
-		<order>201</order>
+		<module>UserCountry</module>
+		<action>getCountry</action>
+		<order>204</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>DevicesDetection</module>
-			<action>getType</action>
+			<module>UserCountry</module>
+			<action>getCountry</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Device brand</name>
+		<name>Sales by User location: Continent</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2055,24 +2055,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getBrand</action>
-		<order>203</order>
+		<module>UserCountry</module>
+		<action>getContinent</action>
+		<order>205</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>DevicesDetection</module>
-			<action>getBrand</action>
+			<module>UserCountry</module>
+			<action>getContinent</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Country</name>
+		<name>Sales by User location: Device brand</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2084,24 +2084,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getCountry</action>
-		<order>204</order>
+		<module>DevicesDetection</module>
+		<action>getBrand</action>
+		<order>203</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>UserCountry</module>
-			<action>getCountry</action>
+			<module>DevicesDetection</module>
+			<action>getBrand</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Continent</name>
+		<name>Sales engagement: Days to Conversion</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2113,24 +2113,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getContinent</action>
-		<order>205</order>
+		<module>Goals</module>
+		<action>getDaysToConversion</action>
+		<order>102</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>tableGoals</viewDataTable>
-			<module>UserCountry</module>
-			<action>getContinent</action>
+			<viewDataTable>table</viewDataTable>
+			<module>Goals</module>
+			<action>getDaysToConversion</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>tableGoals</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: City</name>
+		<name>Sales by User attribute: Visits per server time</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2142,24 +2142,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getCity</action>
-		<order>207</order>
+		<module>VisitTime</module>
+		<action>getVisitInformationPerServerTime</action>
+		<order>302</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>UserCountry</module>
-			<action>getCity</action>
+			<module>VisitTime</module>
+			<action>getVisitInformationPerServerTime</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Region</name>
+		<name>Sales by User location: Device model</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2171,24 +2171,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getRegion</action>
-		<order>206</order>
+		<module>DevicesDetection</module>
+		<action>getModel</action>
+		<order>202</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>UserCountry</module>
-			<action>getRegion</action>
+			<module>DevicesDetection</module>
+			<action>getModel</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by Referrers: Referrer Type</name>
+		<name>Sales by User location: Region</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2200,24 +2200,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>Referrers</module>
-		<action>getReferrerType</action>
-		<order>1</order>
+		<module>UserCountry</module>
+		<action>getRegion</action>
+		<order>206</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>Referrers</module>
-			<action>getReferrerType</action>
+			<module>UserCountry</module>
+			<action>getRegion</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by Referrers: Keywords</name>
+		<name>Sales engagement: Visits to Conversion</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2229,20 +2229,20 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>Referrers</module>
-		<action>getKeywords</action>
-		<order>2</order>
+		<module>Goals</module>
+		<action>getVisitsUntilConversion</action>
+		<order>101</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>tableGoals</viewDataTable>
-			<module>Referrers</module>
-			<action>getKeywords</action>
+			<viewDataTable>table</viewDataTable>
+			<module>Goals</module>
+			<action>getVisitsUntilConversion</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>tableGoals</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -2275,7 +2275,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by Referrers: Websites</name>
+		<name>Sales by Referrers: Keywords</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2288,23 +2288,23 @@
 			<order>15</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getWebsites</action>
-		<order>4</order>
+		<action>getKeywords</action>
+		<order>2</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
 			<module>Referrers</module>
-			<action>getWebsites</action>
+			<action>getKeywords</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by Referrers: Campaigns</name>
+		<name>Sales by User attribute: Custom Variables</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2316,24 +2316,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>Referrers</module>
-		<action>getCampaigns</action>
-		<order>5</order>
+		<module>CustomVariables</module>
+		<action>getCustomVariables</action>
+		<order>301</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>Referrers</module>
-			<action>getCampaigns</action>
+			<module>CustomVariables</module>
+			<action>getCustomVariables</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales engagement: Visits to Conversion</name>
+		<name>Sales by User location: City</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2345,24 +2345,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>Goals</module>
-		<action>getVisitsUntilConversion</action>
-		<order>101</order>
+		<module>UserCountry</module>
+		<action>getCity</action>
+		<order>207</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>table</viewDataTable>
-			<module>Goals</module>
-			<action>getVisitsUntilConversion</action>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>UserCountry</module>
+			<action>getCity</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
+		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales engagement: Days to Conversion</name>
+		<name>Sales by Referrers: Campaigns</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2374,24 +2374,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>Goals</module>
-		<action>getDaysToConversion</action>
-		<order>102</order>
+		<module>Referrers</module>
+		<action>getCampaigns</action>
+		<order>5</order>
 		<parameters>
 			<forceView>1</forceView>
-			<viewDataTable>table</viewDataTable>
-			<module>Goals</module>
-			<action>getDaysToConversion</action>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getCampaigns</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
+		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User attribute: Visits per server time</name>
+		<name>Sales by Referrers: Websites</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2403,24 +2403,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>VisitTime</module>
-		<action>getVisitInformationPerServerTime</action>
-		<order>302</order>
+		<module>Referrers</module>
+		<action>getWebsites</action>
+		<order>4</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>VisitTime</module>
-			<action>getVisitInformationPerServerTime</action>
+			<module>Referrers</module>
+			<action>getWebsites</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User location: Device model</name>
+		<name>Sales by Referrers: Referrer Type</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2432,24 +2432,24 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getModel</action>
-		<order>202</order>
+		<module>Referrers</module>
+		<action>getReferrerType</action>
+		<order>1</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>DevicesDetection</module>
-			<action>getModel</action>
+			<module>Referrers</module>
+			<action>getReferrerType</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Sales by User attribute: Custom Variables</name>
+		<name>Sales by User location: Device type</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -2461,18 +2461,18 @@
 			<name>Sales</name>
 			<order>15</order>
 		</subcategory>
-		<module>CustomVariables</module>
-		<action>getCustomVariables</action>
-		<order>301</order>
+		<module>DevicesDetection</module>
+		<action>getType</action>
+		<order>201</order>
 		<parameters>
 			<forceView>1</forceView>
 			<viewDataTable>tableGoals</viewDataTable>
-			<module>CustomVariables</module>
-			<action>getCustomVariables</action>
+			<module>DevicesDetection</module>
+			<action>getType</action>
 			<documentationForGoalsPage>1</documentationForGoalsPage>
 			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>tableGoals</viewDataTable>
 		<isReport>1</isReport>
@@ -2998,7 +2998,7 @@
 		</widgets>
 	</row>
 	<row>
-		<name>Simple tag cloud</name>
+		<name>Advanced tag cloud: with logos and links</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
 			<name>UI Framework</name>
@@ -3011,21 +3011,19 @@
 			<order>99</order>
 		</subcategory>
 		<module>ExampleUI</module>
-		<action>getPlanetRatios</action>
-		<order>5</order>
+		<action>getPlanetRatiosWithLogos</action>
+		<order>213</order>
 		<parameters>
-			<forceView>1</forceView>
-			<viewDataTable>cloud</viewDataTable>
 			<module>ExampleUI</module>
-			<action>getPlanetRatios</action>
+			<action>getPlanetRatiosWithLogos</action>
 		</parameters>
-		<uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId>
+		<uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>cloud</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Pie graph</name>
+		<name>Data tables</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
 			<name>UI Framework</name>
@@ -3033,20 +3031,47 @@
 			<icon />
 		</category>
 		<subcategory>
-			<id>Pie graph</id>
-			<name>Pie graph</name>
+			<id>ExampleUI_GetTemperaturesDataTable</id>
+			<name>Data tables</name>
 			<order>99</order>
 		</subcategory>
 		<module>ExampleUI</module>
-		<action>getPlanetRatios</action>
-		<order>212</order>
+		<action>getTemperatures</action>
+		<order>210</order>
 		<parameters>
 			<module>ExampleUI</module>
-			<action>getPlanetRatios</action>
+			<action>getTemperatures</action>
 		</parameters>
-		<uniqueId>widgetExampleUIgetPlanetRatios</uniqueId>
+		<uniqueId>widgetExampleUIgetTemperatures</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphPie</viewDataTable>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Data tables</name>
+		<category>
+			<id>ExampleUI_UiFramework</id>
+			<name>UI Framework</name>
+			<order>90</order>
+			<icon />
+		</category>
+		<subcategory>
+			<id>Bar graph</id>
+			<name>Bar graph</name>
+			<order>99</order>
+		</subcategory>
+		<module>ExampleUI</module>
+		<action>getTemperatures</action>
+		<order>210</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>graphVerticalBar</viewDataTable>
+			<module>ExampleUI</module>
+			<action>getTemperatures</action>
+		</parameters>
+		<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>graphVerticalBar</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -3135,7 +3160,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Data tables</name>
+		<name>Pie graph</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
 			<name>UI Framework</name>
@@ -3143,26 +3168,24 @@
 			<icon />
 		</category>
 		<subcategory>
-			<id>Bar graph</id>
-			<name>Bar graph</name>
+			<id>Pie graph</id>
+			<name>Pie graph</name>
 			<order>99</order>
 		</subcategory>
 		<module>ExampleUI</module>
-		<action>getTemperatures</action>
-		<order>210</order>
+		<action>getPlanetRatios</action>
+		<order>212</order>
 		<parameters>
-			<forceView>1</forceView>
-			<viewDataTable>graphVerticalBar</viewDataTable>
 			<module>ExampleUI</module>
-			<action>getTemperatures</action>
+			<action>getPlanetRatios</action>
 		</parameters>
-		<uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+		<uniqueId>widgetExampleUIgetPlanetRatios</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphVerticalBar</viewDataTable>
+		<viewDataTable>graphPie</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Data tables</name>
+		<name>Simple tag cloud</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
 			<name>UI Framework</name>
@@ -3170,68 +3193,64 @@
 			<icon />
 		</category>
 		<subcategory>
-			<id>ExampleUI_GetTemperaturesDataTable</id>
-			<name>Data tables</name>
+			<id>Tag clouds</id>
+			<name>Tag clouds</name>
 			<order>99</order>
 		</subcategory>
 		<module>ExampleUI</module>
-		<action>getTemperatures</action>
-		<order>210</order>
+		<action>getPlanetRatios</action>
+		<order>5</order>
 		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>cloud</viewDataTable>
 			<module>ExampleUI</module>
-			<action>getTemperatures</action>
+			<action>getPlanetRatios</action>
 		</parameters>
-		<uniqueId>widgetExampleUIgetTemperatures</uniqueId>
+		<uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
+		<viewDataTable>cloud</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Advanced tag cloud: with logos and links</name>
+		<name>Premium Features</name>
 		<category>
-			<id>ExampleUI_UiFramework</id>
-			<name>UI Framework</name>
-			<order>90</order>
+			<id>About Matomo</id>
+			<name>About Matomo</name>
+			<order>99</order>
 			<icon />
 		</category>
-		<subcategory>
-			<id>Tag clouds</id>
-			<name>Tag clouds</name>
-			<order>99</order>
-		</subcategory>
-		<module>ExampleUI</module>
-		<action>getPlanetRatiosWithLogos</action>
-		<order>213</order>
+		<subcategory />
+		<module>Marketplace</module>
+		<action>getPremiumFeatures</action>
+		<order>20</order>
 		<parameters>
-			<module>ExampleUI</module>
-			<action>getPlanetRatiosWithLogos</action>
+			<module>Marketplace</module>
+			<action>getPremiumFeatures</action>
 		</parameters>
-		<uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId>
+		<uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>cloud</viewDataTable>
-		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Movers and Shakers</name>
+		<name>Matomo Changelog</name>
 		<category>
-			<id>Insights_WidgetCategory</id>
-			<name>Insights</name>
+			<id>About Matomo</id>
+			<name>About Matomo</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>Insights</module>
-		<action>getOverallMoversAndShakers</action>
+		<module>RssWidget</module>
+		<action>rssChangelog</action>
 		<order>99</order>
 		<parameters>
-			<module>Insights</module>
-			<action>getOverallMoversAndShakers</action>
+			<module>RssWidget</module>
+			<action>rssChangelog</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+		<uniqueId>widgetRssWidgetrssChangelog</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Premium Features &amp; Services for Matomo</name>
+		<name>Example Widget Name</name>
 		<category>
 			<id>About Matomo</id>
 			<name>About Matomo</name>
@@ -3239,33 +3258,52 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>ProfessionalServices</module>
-		<action>promoServices</action>
+		<module>ExamplePlugin</module>
+		<action>myExampleWidget</action>
 		<order>99</order>
 		<parameters>
-			<module>ProfessionalServices</module>
-			<action>promoServices</action>
+			<module>ExamplePlugin</module>
+			<action>myExampleWidget</action>
 		</parameters>
-		<uniqueId>widgetProfessionalServicespromoServices</uniqueId>
+		<uniqueId>widgetExamplePluginmyExampleWidget</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Support Matomo!</name>
+		<name>Insights Overview</name>
 		<category>
-			<id>About Matomo</id>
-			<name>About Matomo</name>
+			<id>Insights_WidgetCategory</id>
+			<name>Insights</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>CoreHome</module>
-		<action>getDonateForm</action>
-		<order>5</order>
+		<module>Insights</module>
+		<action>getInsightsOverview</action>
+		<order>99</order>
 		<parameters>
-			<module>CoreHome</module>
-			<action>getDonateForm</action>
+			<module>Insights</module>
+			<action>getInsightsOverview</action>
 		</parameters>
-		<uniqueId>widgetCoreHomegetDonateForm</uniqueId>
+		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+		<isWide>0</isWide>
+	</row>
+	<row>
+		<name>SEO Rankings</name>
+		<category>
+			<id>SEO</id>
+			<name>SEO</name>
+			<order>99</order>
+			<icon />
+		</category>
+		<subcategory />
+		<module>SEO</module>
+		<action>getRank</action>
+		<order>99</order>
+		<parameters>
+			<module>SEO</module>
+			<action>getRank</action>
+		</parameters>
+		<uniqueId>widgetSEOgetRank</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
@@ -3288,7 +3326,7 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Welcome!</name>
+		<name>Latest Marketplace Updates</name>
 		<category>
 			<id>About Matomo</id>
 			<name>About Matomo</name>
@@ -3296,37 +3334,37 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>CoreHome</module>
-		<action>getPromoVideo</action>
-		<order>10</order>
+		<module>Marketplace</module>
+		<action>getNewPlugins</action>
+		<order>19</order>
 		<parameters>
-			<module>CoreHome</module>
-			<action>getPromoVideo</action>
+			<module>Marketplace</module>
+			<action>getNewPlugins</action>
 		</parameters>
-		<uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
+		<uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Top Keywords for Page URL</name>
+		<name>Welcome!</name>
 		<category>
-			<id>SEO</id>
-			<name>SEO</name>
+			<id>About Matomo</id>
+			<name>About Matomo</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>Referrers</module>
-		<action>getKeywordsForPage</action>
-		<order>99</order>
+		<module>CoreHome</module>
+		<action>getPromoVideo</action>
+		<order>10</order>
 		<parameters>
-			<module>Referrers</module>
-			<action>getKeywordsForPage</action>
+			<module>CoreHome</module>
+			<action>getPromoVideo</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
+		<uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Example Widget Name</name>
+		<name>Premium Features &amp; Services for Matomo</name>
 		<category>
 			<id>About Matomo</id>
 			<name>About Matomo</name>
@@ -3334,18 +3372,18 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>ExamplePlugin</module>
-		<action>myExampleWidget</action>
+		<module>ProfessionalServices</module>
+		<action>promoServices</action>
 		<order>99</order>
 		<parameters>
-			<module>ExamplePlugin</module>
-			<action>myExampleWidget</action>
+			<module>ProfessionalServices</module>
+			<action>promoServices</action>
 		</parameters>
-		<uniqueId>widgetExamplePluginmyExampleWidget</uniqueId>
+		<uniqueId>widgetProfessionalServicespromoServices</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Matomo Changelog</name>
+		<name>Support Matomo!</name>
 		<category>
 			<id>About Matomo</id>
 			<name>About Matomo</name>
@@ -3353,33 +3391,33 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>RssWidget</module>
-		<action>rssChangelog</action>
-		<order>99</order>
+		<module>CoreHome</module>
+		<action>getDonateForm</action>
+		<order>5</order>
 		<parameters>
-			<module>RssWidget</module>
-			<action>rssChangelog</action>
+			<module>CoreHome</module>
+			<action>getDonateForm</action>
 		</parameters>
-		<uniqueId>widgetRssWidgetrssChangelog</uniqueId>
+		<uniqueId>widgetCoreHomegetDonateForm</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>SEO Rankings</name>
+		<name>Movers and Shakers</name>
 		<category>
-			<id>SEO</id>
-			<name>SEO</name>
+			<id>Insights_WidgetCategory</id>
+			<name>Insights</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>SEO</module>
-		<action>getRank</action>
+		<module>Insights</module>
+		<action>getOverallMoversAndShakers</action>
 		<order>99</order>
 		<parameters>
-			<module>SEO</module>
-			<action>getRank</action>
+			<module>Insights</module>
+			<action>getOverallMoversAndShakers</action>
 		</parameters>
-		<uniqueId>widgetSEOgetRank</uniqueId>
+		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
@@ -3402,45 +3440,26 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>System Check</name>
-		<category>
-			<id>About Matomo</id>
-			<name>About Matomo</name>
-			<order>99</order>
-			<icon />
-		</category>
-		<subcategory />
-		<module>Installation</module>
-		<action>getSystemCheck</action>
-		<order>16</order>
-		<parameters>
-			<module>Installation</module>
-			<action>getSystemCheck</action>
-		</parameters>
-		<uniqueId>widgetInstallationgetSystemCheck</uniqueId>
-		<isWide>0</isWide>
-	</row>
-	<row>
-		<name>Premium Features</name>
+		<name>Top Keywords for Page URL</name>
 		<category>
-			<id>About Matomo</id>
-			<name>About Matomo</name>
+			<id>SEO</id>
+			<name>SEO</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>Marketplace</module>
-		<action>getPremiumFeatures</action>
-		<order>20</order>
+		<module>Referrers</module>
+		<action>getKeywordsForPage</action>
+		<order>99</order>
 		<parameters>
-			<module>Marketplace</module>
-			<action>getPremiumFeatures</action>
+			<module>Referrers</module>
+			<action>getKeywordsForPage</action>
 		</parameters>
-		<uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId>
+		<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Latest Marketplace Updates</name>
+		<name>System Check</name>
 		<category>
 			<id>About Matomo</id>
 			<name>About Matomo</name>
@@ -3448,33 +3467,14 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>Marketplace</module>
-		<action>getNewPlugins</action>
-		<order>19</order>
-		<parameters>
-			<module>Marketplace</module>
-			<action>getNewPlugins</action>
-		</parameters>
-		<uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
-		<isWide>0</isWide>
-	</row>
-	<row>
-		<name>Insights Overview</name>
-		<category>
-			<id>Insights_WidgetCategory</id>
-			<name>Insights</name>
-			<order>99</order>
-			<icon />
-		</category>
-		<subcategory />
-		<module>Insights</module>
-		<action>getInsightsOverview</action>
-		<order>99</order>
+		<module>Installation</module>
+		<action>getSystemCheck</action>
+		<order>16</order>
 		<parameters>
-			<module>Insights</module>
-			<action>getInsightsOverview</action>
+			<module>Installation</module>
+			<action>getSystemCheck</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+		<uniqueId>widgetInstallationgetSystemCheck</uniqueId>
 		<isWide>0</isWide>
 	</row>
 </result>
\ No newline at end of file