--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java	Fri Jul 23 15:40:47 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java	Mon Jul 26 15:11:10 2010 -0500
@@ -32,8 +32,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
-import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage;
-
 class NavigationBar extends RoundedCornerComposite {
 
 	private PortalEditor portalEditor;
@@ -47,7 +45,7 @@
 		}
 	}
 
-	private Map<Button, IPortalPage> buttonToPageMap;
+	private Map<Button, PortalPage> buttonToPageMap;
 	private SelectionListener listener;
 	private Font buttonFont;
 	private Font selectedButtonFont;
@@ -57,7 +55,7 @@
 				parent.getDisplay().getSystemColor(SWT.COLOR_BLACK),
 				parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.portalEditor = portalEditor;
-		buttonToPageMap = new LinkedHashMap<Button, IPortalPage>();
+		buttonToPageMap = new LinkedHashMap<Button, PortalPage>();
 		RowLayoutFactory.swtDefaults().margins(3, 3).wrap(false).applyTo(this);
 		listener = new ButtonListener();
 		selectedButtonFont = JFaceResources.getHeaderFont();
@@ -75,11 +73,11 @@
 		selectNavButton(buttonToPageMap.keySet().iterator().next());
 	}
 
-	public void addNavButton(NavigationBar bar, IPortalPage page) {
+	public void addNavButton(NavigationBar bar, PortalPage page) {
 		Button b = new Button(bar, SWT.TOGGLE | SWT.FLAT);
 		b.setFont(buttonFont);
-		b.setText(page.getText());
-		b.setImage(portalEditor.createImage(page.getImageDescriptor(), 16, 16));
+		b.setText(page.getPortalExtension().getText());
+		b.setImage(portalEditor.createImage(page.getPortalExtension().getImageDescriptor(), 16, 16));
 		b.addSelectionListener(listener);
 		RowDataFactory.swtDefaults().applyTo(b);
 		buttonToPageMap.put(b, page);