Show ecommerce sales by reports under Ecommerce - Sales in dashboard manager. (#11995)

Reports did not show currently, because widget configs in containers with ByDimension layout have modified categories/subcategories.

They thus did not show up under the right category (the category of the widget container). Fixed by using the right category
in getWidgetMetadata (but not getPagesMetadata).

1 files changed, 954 insertions, 490 deletions

diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index aeb906def4..c064ffd441 100644..100755
--- 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,16 +31,14 @@
 		</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 Overview</name>
@@ -173,7 +173,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device model</name>
+		<name>Screen Resolution</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -185,20 +185,20 @@
 			<name>Devices</name>
 			<order>15</order>
 		</subcategory>
-		<module>DevicesDetection</module>
-		<action>getModel</action>
-		<order>102</order>
+		<module>Resolution</module>
+		<action>getResolution</action>
+		<order>108</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getModel</action>
+			<module>Resolution</module>
+			<action>getResolution</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetModel</uniqueId>
+		<uniqueId>widgetResolutiongetResolution</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device type</name>
+		<name>Device brand</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -211,19 +211,19 @@
 			<order>15</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getType</action>
-		<order>100</order>
+		<action>getBrand</action>
+		<order>104</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getType</action>
+			<action>getBrand</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetType</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Device brand</name>
+		<name>Device model</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -236,19 +236,19 @@
 			<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>
 	</row>
 	<row>
-		<name>Screen Resolution</name>
+		<name>Device type</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -260,20 +260,20 @@
 			<name>Devices</name>
 			<order>15</order>
 		</subcategory>
-		<module>Resolution</module>
-		<action>getResolution</action>
-		<order>108</order>
+		<module>DevicesDetection</module>
+		<action>getType</action>
+		<order>100</order>
 		<parameters>
-			<module>Resolution</module>
-			<action>getResolution</action>
+			<module>DevicesDetection</module>
+			<action>getType</action>
 		</parameters>
-		<uniqueId>widgetResolutiongetResolution</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetType</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Configurations</name>
+		<name>Operating System versions</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -285,20 +285,20 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>Resolution</module>
-		<action>getConfiguration</action>
-		<order>107</order>
+		<module>DevicesDetection</module>
+		<action>getOsVersions</action>
+		<order>102</order>
 		<parameters>
-			<module>Resolution</module>
-			<action>getConfiguration</action>
+			<module>DevicesDetection</module>
+			<action>getOsVersions</action>
 		</parameters>
-		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser Plugins</name>
+		<name>Browsers</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -310,97 +310,19 @@
 			<name>Software</name>
 			<order>20</order>
 		</subcategory>
-		<module>DevicePlugins</module>
-		<action>getPlugin</action>
-		<order>113</order>
+		<module>DevicesDetection</module>
+		<action>getBrowsers</action>
+		<order>105</order>
 		<parameters>
-			<module>DevicePlugins</module>
-			<action>getPlugin</action>
+			<module>DevicesDetection</module>
+			<action>getBrowsers</action>
 		</parameters>
-		<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowsers</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>Browser engines</name>
 		<category>
 			<id>General_Visitors</id>
@@ -426,7 +348,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browsers</name>
+		<name>Operating System families</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -439,19 +361,19 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getBrowsers</action>
-		<order>105</order>
+		<action>getOsFamilies</action>
+		<order>108</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getBrowsers</action>
+			<action>getOsFamilies</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Operating System versions</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>getOsVersions</action>
-		<order>102</order>
+		<module>DevicePlugins</module>
+		<action>getPlugin</action>
+		<order>113</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getOsVersions</action>
+			<module>DevicePlugins</module>
+			<action>getPlugin</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
+		<uniqueId>widgetDevicePluginsgetPlugin</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Browser version</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>getBrowserVersions</action>
-		<order>106</order>
+		<module>Resolution</module>
+		<action>getConfiguration</action>
+		<order>107</order>
 		<parameters>
-			<module>DevicesDetection</module>
-			<action>getBrowserVersions</action>
+			<module>Resolution</module>
+			<action>getConfiguration</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+		<uniqueId>widgetResolutiongetConfiguration</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Operating System families</name>
+		<name>Browser version</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -514,13 +436,13 @@
 			<order>20</order>
 		</subcategory>
 		<module>DevicesDetection</module>
-		<action>getOsFamilies</action>
-		<order>108</order>
+		<action>getBrowserVersions</action>
+		<order>106</order>
 		<parameters>
 			<module>DevicesDetection</module>
-			<action>getOsFamilies</action>
+			<action>getBrowserVersions</action>
 		</parameters>
-		<uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+		<uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -576,7 +498,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visitor Map</name>
+		<name>Region</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -588,18 +510,20 @@
 			<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>Region</name>
+		<name>Country</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -612,19 +536,19 @@
 			<order>25</order>
 		</subcategory>
 		<module>UserCountry</module>
-		<action>getRegion</action>
-		<order>107</order>
+		<action>getCountry</action>
+		<order>105</order>
 		<parameters>
 			<module>UserCountry</module>
-			<action>getRegion</action>
+			<action>getCountry</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetRegion</uniqueId>
+		<uniqueId>widgetUserCountrygetCountry</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Continent</name>
+		<name>Visitor Map</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -636,20 +560,18 @@
 			<name>Locations</name>
 			<order>25</order>
 		</subcategory>
-		<module>UserCountry</module>
-		<action>getContinent</action>
-		<order>106</order>
+		<module>UserCountryMap</module>
+		<action>visitorMap</action>
+		<order>1</order>
 		<parameters>
-			<module>UserCountry</module>
-			<action>getContinent</action>
+			<module>UserCountryMap</module>
+			<action>visitorMap</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetContinent</uniqueId>
+		<uniqueId>widgetUserCountryMapvisitorMap</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
-		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Country</name>
+		<name>Continent</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -662,44 +584,97 @@
 			<order>25</order>
 		</subcategory>
 		<module>UserCountry</module>
-		<action>getCountry</action>
-		<order>105</order>
+		<action>getContinent</action>
+		<order>106</order>
 		<parameters>
 			<module>UserCountry</module>
-			<action>getCountry</action>
+			<action>getContinent</action>
 		</parameters>
-		<uniqueId>widgetUserCountrygetCountry</uniqueId>
+		<uniqueId>widgetUserCountrygetContinent</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Language code</name>
+		<name>Visits Overview (with graph)</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>getLanguageCode</action>
-		<order>111</order>
+		<subcategory />
+		<module>CoreHome</module>
+		<action>renderWidgetContainer</action>
+		<order>99</order>
 		<parameters>
-			<module>UserLanguage</module>
-			<action>getLanguageCode</action>
+			<module>CoreHome</module>
+			<action>renderWidgetContainer</action>
+			<containerId>VisitOverviewWithGraph</containerId>
 		</parameters>
-		<uniqueId>widgetUserLanguagegetLanguageCode</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>Frequency Overview</name>
+		<name>Language code</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -707,22 +682,20 @@
 			<icon>icon-reporting-visitors</icon>
 		</category>
 		<subcategory>
-			<id>VisitorInterest_Engagement</id>
-			<name>Engagement</name>
-			<order>30</order>
+			<id>UserCountry_SubmenuLocations</id>
+			<name>Locations</name>
+			<order>25</order>
 		</subcategory>
-		<module>VisitFrequency</module>
-		<action>get</action>
-		<order>2</order>
+		<module>UserLanguage</module>
+		<action>getLanguageCode</action>
+		<order>111</order>
 		<parameters>
-			<forceView>1</forceView>
-			<viewDataTable>sparklines</viewDataTable>
-			<module>VisitFrequency</module>
-			<action>get</action>
+			<module>UserLanguage</module>
+			<action>getLanguageCode</action>
 		</parameters>
-		<uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId>
+		<uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>sparklines</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -803,25 +776,6 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<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 number of pages</name>
 		<category>
 			<id>General_Visitors</id>
@@ -847,7 +801,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per visit duration</name>
+		<name>Frequency Overview</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -859,20 +813,22 @@
 			<name>Engagement</name>
 			<order>30</order>
 		</subcategory>
-		<module>VisitorInterest</module>
-		<action>getNumberOfVisitsPerVisitDuration</action>
-		<order>115</order>
+		<module>VisitFrequency</module>
+		<action>get</action>
+		<order>2</order>
 		<parameters>
-			<module>VisitorInterest</module>
-			<action>getNumberOfVisitsPerVisitDuration</action>
+			<forceView>1</forceView>
+			<viewDataTable>sparklines</viewDataTable>
+			<module>VisitFrequency</module>
+			<action>get</action>
 		</parameters>
-		<uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+		<uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>cloud</viewDataTable>
+		<viewDataTable>sparklines</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits by Day of Week</name>
+		<name>Visits per local time</name>
 		<category>
 			<id>General_Visitors</id>
 			<name>Visitors</name>
@@ -885,19 +841,63 @@
 			<order>35</order>
 		</subcategory>
 		<module>VisitTime</module>
-		<action>getByDayOfWeek</action>
-		<order>125</order>
+		<action>getVisitInformationPerLocalTime</action>
+		<order>115</order>
 		<parameters>
 			<module>VisitTime</module>
-			<action>getByDayOfWeek</action>
+			<action>getVisitInformationPerLocalTime</action>
 		</parameters>
-		<uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
+		<uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>graphVerticalBar</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Visits per local 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,13 +910,13 @@
 			<order>35</order>
 		</subcategory>
 		<module>VisitTime</module>
-		<action>getVisitInformationPerLocalTime</action>
-		<order>115</order>
+		<action>getByDayOfWeek</action>
+		<order>125</order>
 		<parameters>
 			<module>VisitTime</module>
-			<action>getVisitInformationPerLocalTime</action>
+			<action>getByDayOfWeek</action>
 		</parameters>
-		<uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId>
+		<uniqueId>widgetVisitTimegetByDayOfWeek</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>Page Titles 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>getPageTitlesFollowingSiteSearch</action>
-		<order>119</order>
+		<action>getSiteSearchKeywords</action>
+		<order>115</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getPageTitlesFollowingSiteSearch</action>
+			<action>getSiteSearchKeywords</action>
 		</parameters>
-		<uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
+		<uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Search Keywords with No Results</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>getSiteSearchNoResultKeywords</action>
-		<order>118</order>
+		<action>getPageUrlsFollowingSiteSearch</action>
+		<order>116</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getSiteSearchNoResultKeywords</action>
+			<action>getPageUrlsFollowingSiteSearch</action>
 		</parameters>
-		<uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
+		<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Pages Following a Site Search</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>getPageUrlsFollowingSiteSearch</action>
-		<order>116</order>
+		<action>getPageTitlesFollowingSiteSearch</action>
+		<order>119</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getPageUrlsFollowingSiteSearch</action>
+			<action>getPageTitlesFollowingSiteSearch</action>
 		</parameters>
-		<uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</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,19 +1208,19 @@
 			<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>
 	</row>
 	<row>
-		<name>Search Categories</name>
+		<name>Search Keywords with No Results</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1233,13 +1233,13 @@
 			<order>25</order>
 		</subcategory>
 		<module>Actions</module>
-		<action>getSiteSearchCategories</action>
-		<order>120</order>
+		<action>getSiteSearchNoResultKeywords</action>
+		<order>118</order>
 		<parameters>
 			<module>Actions</module>
-			<action>getSiteSearchCategories</action>
+			<action>getSiteSearchNoResultKeywords</action>
 		</parameters>
-		<uniqueId>widgetActionsgetSiteSearchCategories</uniqueId>
+		<uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
@@ -1295,7 +1295,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Event Actions</name>
+		<name>Actions: Event Names</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1308,20 +1308,20 @@
 			<order>40</order>
 		</subcategory>
 		<module>Events</module>
-		<action>getAction</action>
-		<order>101</order>
+		<action>getName</action>
+		<order>102</order>
 		<parameters>
 			<module>Events</module>
-			<action>getAction</action>
-			<secondaryDimension>eventName</secondaryDimension>
+			<action>getName</action>
+			<secondaryDimension>eventAction</secondaryDimension>
 		</parameters>
-		<uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
+		<uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Event Names</name>
+		<name>Actions: Event Categories</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1334,20 +1334,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>Event Categories</name>
+		<name>Actions: Event Actions</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1360,20 +1360,20 @@
 			<order>40</order>
 		</subcategory>
 		<module>Events</module>
-		<action>getCategory</action>
-		<order>100</order>
+		<action>getAction</action>
+		<order>101</order>
 		<parameters>
 			<module>Events</module>
-			<action>getCategory</action>
-			<secondaryDimension>eventAction</secondaryDimension>
+			<action>getAction</action>
+			<secondaryDimension>eventName</secondaryDimension>
 		</parameters>
-		<uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId>
+		<uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>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>Event Categories</name>
+		<name>Actions: Event Names</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1412,20 +1412,20 @@
 			<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>
 	</row>
 	<row>
-		<name>Event Actions</name>
+		<name>Actions: Event Actions</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1451,7 +1451,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Content Name</name>
+		<name>Actions: Content Name</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1476,7 +1476,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>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>Content Piece</name>
+		<name>Actions: Content Piece</name>
 		<category>
 			<id>General_Actions</id>
 			<name>Actions</name>
@@ -1526,7 +1526,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>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,19 +1639,19 @@
 			<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>
 	</row>
 	<row>
-		<name>Social Networks</name>
+		<name>Websites</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1664,19 +1664,19 @@
 			<order>15</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getSocials</action>
-		<order>111</order>
+		<action>getWebsites</action>
+		<order>105</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getSocials</action>
+			<action>getWebsites</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetSocials</uniqueId>
+		<uniqueId>widgetReferrersgetWebsites</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>graphPie</viewDataTable>
+		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Websites</name>
+		<name>Social Networks</name>
 		<category>
 			<id>Referrers_Referrers</id>
 			<name>Referrers</name>
@@ -1689,15 +1689,15 @@
 			<order>15</order>
 		</subcategory>
 		<module>Referrers</module>
-		<action>getWebsites</action>
-		<order>105</order>
+		<action>getSocials</action>
+		<order>111</order>
 		<parameters>
 			<module>Referrers</module>
-			<action>getWebsites</action>
+			<action>getSocials</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetWebsites</uniqueId>
+		<uniqueId>widgetReferrersgetSocials</uniqueId>
 		<isWide>0</isWide>
-		<viewDataTable>table</viewDataTable>
+		<viewDataTable>graphPie</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
@@ -1864,7 +1864,7 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Product Category</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>getItemsCategory</action>
-		<order>132</order>
+		<action>getItemsName</action>
+		<order>131</order>
 		<parameters>
 			<module>Goals</module>
-			<action>getItemsCategory</action>
+			<action>getItemsName</action>
 		</parameters>
-		<uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+		<uniqueId>widgetGoalsgetItemsName</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Product SKU</name>
+		<name>Ecommerce: Product SKU</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1914,7 +1914,32 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Product SKU</name>
+		<name>Ecommerce: Product Category</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Goals_Products</id>
+			<name>Products</name>
+			<order>10</order>
+		</subcategory>
+		<module>Goals</module>
+		<action>getItemsCategory</action>
+		<order>132</order>
+		<parameters>
+			<module>Goals</module>
+			<action>getItemsCategory</action>
+		</parameters>
+		<uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Ecommerce: Product SKU</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1939,7 +1964,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Product Name</name>
+		<name>Ecommerce: Product Name</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1964,7 +1989,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Product Category</name>
+		<name>Ecommerce: Product Category</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1989,7 +2014,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>Product Name</name>
+		<name>Sales by User location: Country</name>
 		<category>
 			<id>Goals_Ecommerce</id>
 			<name>Ecommerce</name>
@@ -1997,23 +2022,462 @@
 			<icon>icon-reporting-ecommerce</icon>
 		</category>
 		<subcategory>
-			<id>Goals_Products</id>
-			<name>Products</name>
-			<order>10</order>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>UserCountry</module>
+		<action>getCountry</action>
+		<order>204</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>UserCountry</module>
+			<action>getCountry</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: Continent</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>UserCountry</module>
+		<action>getContinent</action>
+		<order>205</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>UserCountry</module>
+			<action>getContinent</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: Device brand</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>DevicesDetection</module>
+		<action>getBrand</action>
+		<order>203</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>DevicesDetection</module>
+			<action>getBrand</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales engagement: Days to Conversion</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
 		</subcategory>
 		<module>Goals</module>
-		<action>getItemsName</action>
-		<order>131</order>
+		<action>getDaysToConversion</action>
+		<order>102</order>
 		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>table</viewDataTable>
 			<module>Goals</module>
-			<action>getItemsName</action>
+			<action>getDaysToConversion</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
 		</parameters>
-		<uniqueId>widgetGoalsgetItemsName</uniqueId>
+		<uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
 		<isWide>0</isWide>
 		<viewDataTable>table</viewDataTable>
 		<isReport>1</isReport>
 	</row>
 	<row>
+		<name>Sales by User attribute: Visits per server time</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>VisitTime</module>
+		<action>getVisitInformationPerServerTime</action>
+		<order>302</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>VisitTime</module>
+			<action>getVisitInformationPerServerTime</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: Device model</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>DevicesDetection</module>
+		<action>getModel</action>
+		<order>202</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>DevicesDetection</module>
+			<action>getModel</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: Region</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>UserCountry</module>
+		<action>getRegion</action>
+		<order>206</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>UserCountry</module>
+			<action>getRegion</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales engagement: Visits to Conversion</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Goals</module>
+		<action>getVisitsUntilConversion</action>
+		<order>101</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>table</viewDataTable>
+			<module>Goals</module>
+			<action>getVisitsUntilConversion</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>table</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by Referrers: Search Engines</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Referrers</module>
+		<action>getSearchEngines</action>
+		<order>3</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getSearchEngines</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by Referrers: Keywords</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Referrers</module>
+		<action>getKeywords</action>
+		<order>2</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getKeywords</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User attribute: Custom Variables</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>CustomVariables</module>
+		<action>getCustomVariables</action>
+		<order>301</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>CustomVariables</module>
+			<action>getCustomVariables</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: City</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>UserCountry</module>
+		<action>getCity</action>
+		<order>207</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>UserCountry</module>
+			<action>getCity</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by Referrers: Campaigns</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Referrers</module>
+		<action>getCampaigns</action>
+		<order>5</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getCampaigns</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by Referrers: Websites</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Referrers</module>
+		<action>getWebsites</action>
+		<order>4</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getWebsites</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by Referrers: Referrer Type</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>Referrers</module>
+		<action>getReferrerType</action>
+		<order>1</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>Referrers</module>
+			<action>getReferrerType</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
+		<name>Sales by User location: Device type</name>
+		<category>
+			<id>Goals_Ecommerce</id>
+			<name>Ecommerce</name>
+			<order>20</order>
+			<icon>icon-reporting-ecommerce</icon>
+		</category>
+		<subcategory>
+			<id>Ecommerce_Sales</id>
+			<name>Sales</name>
+			<order>15</order>
+		</subcategory>
+		<module>DevicesDetection</module>
+		<action>getType</action>
+		<order>201</order>
+		<parameters>
+			<forceView>1</forceView>
+			<viewDataTable>tableGoals</viewDataTable>
+			<module>DevicesDetection</module>
+			<action>getType</action>
+			<documentationForGoalsPage>1</documentationForGoalsPage>
+			<idGoal>ecommerceOrder</idGoal>
+		</parameters>
+		<uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId>
+		<isWide>0</isWide>
+		<viewDataTable>tableGoals</viewDataTable>
+		<isReport>1</isReport>
+	</row>
+	<row>
 		<name>Overview</name>
 		<category>
 			<id>Goals_Goals</id>
@@ -2584,6 +3048,33 @@
 		<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>
 		<name>Evolution of server temperatures over the last few days</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
@@ -2669,33 +3160,6 @@
 		<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>
 		<name>Pie graph</name>
 		<category>
 			<id>ExampleUI_UiFramework</id>
@@ -2748,7 +3212,7 @@
 		<isReport>1</isReport>
 	</row>
 	<row>
-		<name>System Summary</name>
+		<name>Premium Features</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2756,18 +3220,18 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>CoreHome</module>
-		<action>getSystemSummary</action>
-		<order>15</order>
+		<module>Marketplace</module>
+		<action>getPremiumFeatures</action>
+		<order>20</order>
 		<parameters>
-			<module>CoreHome</module>
-			<action>getSystemSummary</action>
+			<module>Marketplace</module>
+			<action>getPremiumFeatures</action>
 		</parameters>
-		<uniqueId>widgetCoreHomegetSystemSummary</uniqueId>
+		<uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Premium Products &amp; Services for Piwik</name>
+		<name>Piwik Changelog</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2775,14 +3239,14 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>ProfessionalServices</module>
-		<action>promoServices</action>
+		<module>RssWidget</module>
+		<action>rssChangelog</action>
 		<order>99</order>
 		<parameters>
-			<module>ProfessionalServices</module>
-			<action>promoServices</action>
+			<module>RssWidget</module>
+			<action>rssChangelog</action>
 		</parameters>
-		<uniqueId>widgetProfessionalServicespromoServices</uniqueId>
+		<uniqueId>widgetRssWidgetrssChangelog</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
@@ -2805,45 +3269,45 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Piwik Changelog</name>
+		<name>Insights Overview</name>
 		<category>
-			<id>About Piwik</id>
-			<name>About Piwik</name>
+			<id>Insights_WidgetCategory</id>
+			<name>Insights</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>RssWidget</module>
-		<action>rssChangelog</action>
+		<module>Insights</module>
+		<action>getInsightsOverview</action>
 		<order>99</order>
 		<parameters>
-			<module>RssWidget</module>
-			<action>rssChangelog</action>
+			<module>Insights</module>
+			<action>getInsightsOverview</action>
 		</parameters>
-		<uniqueId>widgetRssWidgetrssChangelog</uniqueId>
+		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Welcome!</name>
+		<name>SEO Rankings</name>
 		<category>
-			<id>About Piwik</id>
-			<name>About Piwik</name>
+			<id>SEO</id>
+			<name>SEO</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>CoreHome</module>
-		<action>getPromoVideo</action>
-		<order>10</order>
+		<module>SEO</module>
+		<action>getRank</action>
+		<order>99</order>
 		<parameters>
-			<module>CoreHome</module>
-			<action>getPromoVideo</action>
+			<module>SEO</module>
+			<action>getRank</action>
 		</parameters>
-		<uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
+		<uniqueId>widgetSEOgetRank</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Latest Marketplace Updates</name>
+		<name>System Summary</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2851,18 +3315,18 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>Marketplace</module>
-		<action>getNewPlugins</action>
-		<order>19</order>
+		<module>CoreHome</module>
+		<action>getSystemSummary</action>
+		<order>15</order>
 		<parameters>
-			<module>Marketplace</module>
-			<action>getNewPlugins</action>
+			<module>CoreHome</module>
+			<action>getSystemSummary</action>
 		</parameters>
-		<uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
+		<uniqueId>widgetCoreHomegetSystemSummary</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Piwik.org Blog</name>
+		<name>Latest Marketplace Updates</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2870,18 +3334,18 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>RssWidget</module>
-		<action>rssPiwik</action>
-		<order>99</order>
+		<module>Marketplace</module>
+		<action>getNewPlugins</action>
+		<order>19</order>
 		<parameters>
-			<module>RssWidget</module>
-			<action>rssPiwik</action>
+			<module>Marketplace</module>
+			<action>getNewPlugins</action>
 		</parameters>
-		<uniqueId>widgetRssWidgetrssPiwik</uniqueId>
+		<uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Premium Features</name>
+		<name>Welcome!</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2889,18 +3353,18 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>Marketplace</module>
-		<action>getPremiumFeatures</action>
-		<order>20</order>
+		<module>CoreHome</module>
+		<action>getPromoVideo</action>
+		<order>10</order>
 		<parameters>
-			<module>Marketplace</module>
-			<action>getPremiumFeatures</action>
+			<module>CoreHome</module>
+			<action>getPromoVideo</action>
 		</parameters>
-		<uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId>
+		<uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>System Check</name>
+		<name>Premium Products &amp; Services for Piwik</name>
 		<category>
 			<id>About Piwik</id>
 			<name>About Piwik</name>
@@ -2908,14 +3372,14 @@
 			<icon />
 		</category>
 		<subcategory />
-		<module>Installation</module>
-		<action>getSystemCheck</action>
-		<order>16</order>
+		<module>ProfessionalServices</module>
+		<action>promoServices</action>
+		<order>99</order>
 		<parameters>
-			<module>Installation</module>
-			<action>getSystemCheck</action>
+			<module>ProfessionalServices</module>
+			<action>promoServices</action>
 		</parameters>
-		<uniqueId>widgetInstallationgetSystemCheck</uniqueId>
+		<uniqueId>widgetProfessionalServicespromoServices</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
@@ -2938,7 +3402,7 @@
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Insights Overview</name>
+		<name>Movers and Shakers</name>
 		<category>
 			<id>Insights_WidgetCategory</id>
 			<name>Insights</name>
@@ -2947,70 +3411,70 @@
 		</category>
 		<subcategory />
 		<module>Insights</module>
-		<action>getInsightsOverview</action>
+		<action>getOverallMoversAndShakers</action>
 		<order>99</order>
 		<parameters>
 			<module>Insights</module>
-			<action>getInsightsOverview</action>
+			<action>getOverallMoversAndShakers</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Top Keywords for Page URL</name>
+		<name>Piwik.org Blog</name>
 		<category>
-			<id>SEO</id>
-			<name>SEO</name>
+			<id>About Piwik</id>
+			<name>About Piwik</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>Referrers</module>
-		<action>getKeywordsForPage</action>
+		<module>RssWidget</module>
+		<action>rssPiwik</action>
 		<order>99</order>
 		<parameters>
-			<module>Referrers</module>
-			<action>getKeywordsForPage</action>
+			<module>RssWidget</module>
+			<action>rssPiwik</action>
 		</parameters>
-		<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
+		<uniqueId>widgetRssWidgetrssPiwik</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>Movers and Shakers</name>
+		<name>Top Keywords for Page URL</name>
 		<category>
-			<id>Insights_WidgetCategory</id>
-			<name>Insights</name>
+			<id>SEO</id>
+			<name>SEO</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>Insights</module>
-		<action>getOverallMoversAndShakers</action>
+		<module>Referrers</module>
+		<action>getKeywordsForPage</action>
 		<order>99</order>
 		<parameters>
-			<module>Insights</module>
-			<action>getOverallMoversAndShakers</action>
+			<module>Referrers</module>
+			<action>getKeywordsForPage</action>
 		</parameters>
-		<uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+		<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
 		<isWide>0</isWide>
 	</row>
 	<row>
-		<name>SEO Rankings</name>
+		<name>System Check</name>
 		<category>
-			<id>SEO</id>
-			<name>SEO</name>
+			<id>About Piwik</id>
+			<name>About Piwik</name>
 			<order>99</order>
 			<icon />
 		</category>
 		<subcategory />
-		<module>SEO</module>
-		<action>getRank</action>
-		<order>99</order>
+		<module>Installation</module>
+		<action>getSystemCheck</action>
+		<order>16</order>
 		<parameters>
-			<module>SEO</module>
-			<action>getRank</action>
+			<module>Installation</module>
+			<action>getSystemCheck</action>
 		</parameters>
-		<uniqueId>widgetSEOgetRank</uniqueId>
+		<uniqueId>widgetInstallationgetSystemCheck</uniqueId>
 		<isWide>0</isWide>
 	</row>
 </result>
\ No newline at end of file