--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Fri Sep 24 08:40:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Fri Sep 24 09:51:09 2010 -0500
@@ -102,7 +102,7 @@
 	public static String PortalEditor_PageLoadError;
 	public static String PortalEditor_PageOpenError;
 	public static String PortalEditor_PageRankError;
-	public static String SettingsBarCreator_CapabilitiesActionLabel;
+	public static String SettingsBarCreator_AutoUpdateActionLabel;
 	public static String SettingsBarCreator_CodeStyleActionLabel;
 	public static String SettingsBarCreator_KeyBindingsActionLabel;
 	public static String SettingsBarCreator_ProxiesActionLabel;

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Fri Sep 24 08:40:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Fri Sep 24 09:51:09 2010 -0500
@@ -80,7 +80,7 @@
 PortalEditor_PageLoadError=Could not load portal page
 PortalEditor_PageOpenError=Could not open portal
 PortalEditor_PageRankError=Could not get order value for portal page or layer: {0}
-SettingsBarCreator_CapabilitiesActionLabel=Capabilities
+SettingsBarCreator_AutoUpdateActionLabel=Automatic Updates
 SettingsBarCreator_CodeStyleActionLabel=Code Style
 SettingsBarCreator_KeyBindingsActionLabel=Key bindings
 SettingsBarCreator_ProxiesActionLabel=Proxies

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java	Fri Sep 24 08:40:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java	Fri Sep 24 09:51:09 2010 -0500
@@ -57,7 +57,7 @@
 				@Override
 				public void mouseExit(MouseEvent e) {
 					if (!selection)
-						setBackgroundColor();
+						updateUI();
 					
 				}
 				
@@ -89,7 +89,7 @@
 		public void setSelection(boolean selection) {
 			if (this.selection != selection) {
 				this.selection = selection;
-				setBackgroundColor();
+				updateUI();
 				if (selection) {
 					for (Control control : getParent().getChildren()) {
 						if (control instanceof Button) {
@@ -113,8 +113,9 @@
 			
 		}
 
-		private void setBackgroundColor() {
+		private void updateUI() {
 			setBackground(getDisplay().getSystemColor(selection ? SWT.COLOR_WIDGET_NORMAL_SHADOW : SWT.COLOR_WHITE));
+			setFont(selection ? selectedButtonFont : buttonFont);
 		}
 		
 		@Override
@@ -178,7 +179,6 @@
 
 	public void selectNavButton(Button button) {
 		portalEditor.showPage(buttonToPageMap.get(button));
-		button.setFont(selectedButtonFont);
 		layout();
 	}
 }
\ No newline at end of file

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SettingsBarCreator.java	Fri Sep 24 08:40:09 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SettingsBarCreator.java	Fri Sep 24 09:51:09 2010 -0500
@@ -40,8 +40,8 @@
 		public IAction[] getActions() {
 			List<IAction> actions = new ArrayList<IAction>();
 			actions.add(new OpenPreferencePageAction(
-					Messages.SettingsBarCreator_CapabilitiesActionLabel, 
-					"org.eclipse.sdk.capabilities")); //$NON-NLS-1$
+					Messages.SettingsBarCreator_AutoUpdateActionLabel, 
+					"org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatesPreferencePage")); //$NON-NLS-1$
 			actions.add(new OpenPreferencePageAction(
 					Messages.SettingsBarCreator_CodeStyleActionLabel, 
 					"org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage")); //$NON-NLS-1$