diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index d61e2b97578..4b6335f3fd3 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -50,11 +50,14 @@ BuildSelectedFiles.tooltip=Rebuilds the selected file(s)
 CleanSelectedFiles.tooltip=Cleans the output file(s) for the selected file(s)
 
 ## New CDT project model - property pages names
-CDTPathSymbolsProperty.name=C/C++ Project paths and symbols
-CDTExpPathSymbolsProperty.name=C/C++ Export settings
-CDTBuildProperty.name=C/C++ Build settings
-CDTToolchainProperty.name=C/C++ Tool chain editor
-CDTVariablesProperty.name=C/C++ Build variables
+page.c.build=C/C++ Build
+CDTPathSymbolsProperty.name=Paths and symbols
+CDTExpPathSymbolsProperty.name=Export settings
+CDTBuildProperty.name=Settings
+CDTToolchainProperty.name=Tool chain editor
+CDTVariablesProperty.name=Variables
+Discovery.options=Discovery options
+Environment=Environment
 
 BuildCfgMenu.label=Build configurations
 
@@ -73,7 +76,6 @@ CPPproject=C++ project
 CPPproject.desc=Create a new C++ project
 Cproject=C project
 Cproject.desc=Create a new C project
-Discovery.options=Discovery options
 Tool.settings=Tool settings
 Build.steps=Build steps
 Build.artifact=Build artifact
@@ -85,7 +87,6 @@ Library.paths=Library paths
 References=References
 Source.location=Source location
 Output.location=Output location
-Environment=Environment
 Binary.parsers=Binary parsers
 Error.parsers=Error parsers
 Data.hierarchy=Data hierarchy
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 2ea626d2485..d9dfb2be617 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -142,7 +142,7 @@
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.buildAllAction1"
               label="%BuildCfgMenu.label"
-              menubarPath="buildGroup"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
               style="pulldown"/>
       </objectContribution>
       <objectContribution
@@ -255,9 +255,9 @@
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.DiscoveryTab"
            icon="icons/elcl16/discovery.gif"
-           name="%Discovery.options"
+           name="(Single) Discovery.options"
            weight="005"
-           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_Discovery"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.ToolSettingsTab"
            icon="icons/elcl16/config-tool.gif"
@@ -280,7 +280,7 @@
            class="org.eclipse.cdt.managedbuilder.ui.properties.BuilderSettingsTab"
            icon="icons/obj16/build_settings.gif"
            name="%Builder.settings"
-           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
            weight="004"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
@@ -346,9 +346,9 @@
      <tab
            class="org.eclipse.cdt.ui.newui.EnvironmentTab"
            icon="icons/obj16/environment.gif"
-           name="%Environment"
+           name="(Single) Environment"
            weight="005"
-           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_Environment"/>
      <tab
            class="org.eclipse.cdt.ui.newui.BinaryParsTab"
            icon="icons/obj16/bin_obj.gif"
@@ -503,9 +503,38 @@
 
      <extension
          point="org.eclipse.ui.propertyPages">
+        <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
+            name="%page.c.build"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+         </filter>            
+         <enabledWhen>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+		     <and>
+		         <instanceof value="org.eclipse.core.resources.IFile"/>
+    	         <test property="org.eclipse.cdt.ui.isSource" value="" />
+             </and>
+             <and>
+	         	<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+	         </and>	
+		    </or>          
+         </enabledWhen>
+        </page>    
         <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
             id="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
+            category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
             name="%CDTVariablesProperty.name"
             >
          <filter
@@ -523,6 +552,7 @@
       <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
             id="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             name="%CDTPathSymbolsProperty.name"
             >
          <filter
@@ -553,6 +583,7 @@
       <!--page
             class="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
             id="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             name="%CDTExpPathSymbolsProperty.name"
             >
          <filter
@@ -570,6 +601,7 @@
       <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
             id="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
             name="%CDTBuildProperty.name"
             >
          <filter
@@ -598,6 +630,7 @@
       <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
             id="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
+            category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
             name="%CDTToolchainProperty.name"
             >
          <filter
@@ -626,6 +659,72 @@
 		    </and>          
          </enabledWhen>
       </page>
+
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Discovery"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_Discovery"
+            category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
+            name="%Discovery.options"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+         </filter>
+         <enabledWhen>
+            <and>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+		     <and>
+		        <instanceof value="org.eclipse.core.resources.IFile"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+             </and>
+             <and>
+	         	<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+	         </and>	
+		    </or>
+            <test property="org.eclipse.cdt.ui.toolEditEnabled" value="" />
+		    </and>          
+         </enabledWhen>
+      </page>
+      <page
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Environment"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_Environment"
+            category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
+            name="%Environment"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+         </filter>
+         <enabledWhen>
+            <and>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+		     <and>
+		        <instanceof value="org.eclipse.core.resources.IFile"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+             </and>
+             <and>
+	         	<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+	         </and>	
+		    </or>
+            <test property="org.eclipse.cdt.ui.toolEditEnabled" value="" />
+		    </and>          
+         </enabledWhen>
+      </page>
+
   </extension>
   
      <extension
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Discovery.java
similarity index 93%
rename from build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Discovery.java
index 7316178ceb1..12583a6488a 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Discovery.java
@@ -12,6 +12,6 @@ package org.eclipse.cdt.managedbuilder.ui.properties;
 
 import org.eclipse.cdt.ui.newui.AbstractPage;
 
-public class Page_Languages extends AbstractPage {
+public class Page_Discovery extends AbstractPage {
 	protected boolean isSingle() { return true; }
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Environment.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Environment.java
new file mode 100644
index 00000000000..407b93a4e28
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Environment.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Intel Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class Page_Environment extends AbstractPage {
+	protected boolean isSingle() { return true; }
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_head_build.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_head_build.java
new file mode 100644
index 00000000000..34b05d548ee
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_head_build.java
@@ -0,0 +1,7 @@
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class Page_head_build extends AbstractPage {
+	protected boolean isSingle() { return true; }
+}