--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java	Thu Jul 29 09:51:07 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java	Thu Jul 29 13:28:20 2010 -0500
@@ -76,17 +76,19 @@
 		loadPortalPages();
 	}
 	
-	private Map<String, List<IPortalPageLayer>> loadPortalLayers() {
-		Map<String, List<IPortalPageLayer>> pageIdToExtensionsMap = new HashMap<String, List<IPortalPageLayer>>();
+	private Map<String, List<Pair<IPortalPageLayer, String>>> loadPortalLayers() {
+		Map<String, List<Pair<IPortalPageLayer, String>>> pageIdToExtensionsMap = 
+			new HashMap<String, List<Pair<IPortalPageLayer, String>>>();
 		IConfigurationElement[] elements = 
 			Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".portalPageLayer"); //$NON-NLS-1$
 		for (IConfigurationElement element : elements) {
 			String pageId = element.getAttribute("pageId"); //$NON-NLS-1$
+			String title = element.getAttribute("title"); //$NON-NLS-1$
 			try {
 				IPortalPageLayer extension = (IPortalPageLayer) element.createExecutableExtension("class"); //$NON-NLS-1$
 				if (!pageIdToExtensionsMap.containsKey(pageId))
-					pageIdToExtensionsMap.put(pageId, new ArrayList<IPortalPageLayer>());
-				pageIdToExtensionsMap.get(pageId).add(extension);
+					pageIdToExtensionsMap.put(pageId, new ArrayList<Pair<IPortalPageLayer, String>>());
+				pageIdToExtensionsMap.get(pageId).add(new Pair<IPortalPageLayer, String>(extension, title));
 			} catch (CoreException e) {
 				Activator.logError(MessageFormat.format(Messages.PortalEditor_PageLoadError, pageId), e);
 			}
@@ -95,7 +97,7 @@
 	}
 
 	private void loadPortalPages() {
-		Map<String, List<IPortalPageLayer>> portalLayersMap = loadPortalLayers();
+		Map<String, List<Pair<IPortalPageLayer, String>>> portalLayersMap = loadPortalLayers();
 		List<Pair<PortalPage, Integer>> pageList = new ArrayList<Pair<PortalPage, Integer>>();
 		IConfigurationElement[] elements = 
 			Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".portalPage"); //$NON-NLS-1$
@@ -115,9 +117,9 @@
 			String imageFilePath = element.getAttribute("image"); //$NON-NLS-1$
 			String pluginId = element.getContributor().getName();
 			ImageDescriptor imageDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, imageFilePath);
-			List<IPortalPageLayer> portalLayers = portalLayersMap.get(id);
+			List<Pair<IPortalPageLayer, String>> portalLayers = portalLayersMap.get(id);
 			if (portalLayers == null || portalLayers.isEmpty()) {
-				Activator.logError(MessageFormat.format("Could not load portal page because no layers were found for id: {0}", id), null);
+				Activator.logError(MessageFormat.format(Messages.PortalEditor_NoLayersError, id), null);
 			}
 			PortalPage portalPage = new PortalPage(title, imageDesc, id, portalLayers);
 			pageList.add(new Pair<PortalPage, Integer>(portalPage, order));