diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.properties b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.properties
index 20d921a68b9..98a34748e9b 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.properties
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.properties
@@ -25,4 +25,19 @@ command.gotoSymbol.description=Navigate to symbolic address
 commandContext.name= In DSF Disassembly
 commandContext.description= When debugging in assembly mode
 
+# actions
 action.breakpointProperties.label = Breakpoint Properties...
+
+action.refresh.label = Refresh
+
+menu.updatePolicy = Update Policy
+action.breakpointHitUpdatePolicy.label = Breakpoint Hit
+action.manualUpdatePolicy.label = Manual
+action.automaticUpdatePolicy.label = Automatic
+
+menu.numberFormat = Number Format
+action.setDefaultNumberFormatHex.label = Hex
+action.setDefaultNumberFormatDecimal.label = Decimal
+action.setDefaultNumberFormatOctal.label = Octal
+action.setDefaultNumberFormatBinary.label = Binary
+action.setDefaultNumberFormatNatural.label = Natural
\ No newline at end of file
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
index 21b6f155b7c..655ec12ec88 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml
@@ -50,19 +50,10 @@
             verticalRulerPreferenceValue="true">
       </specification>
    </extension>
+
    <extension
          point="org.eclipse.ui.viewActions">
-      <viewContribution
-            id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.Refresh"
-            targetID="org.eclipse.debug.ui.RegisterView">
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.RefreshActionDelegate"
-               icon="icons/refresh.gif"
-               id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.Refresh"
-               label="Refresh"
-               toolbarPath="additions">
-         </action>
-      </viewContribution>
+      <!-- Variables View menu contributions -->
       <viewContribution
             id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.Refresh"
             targetID="org.eclipse.debug.ui.VariableView">
@@ -70,10 +61,174 @@
                class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.RefreshActionDelegate"
                icon="icons/refresh.gif"
                id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.Refresh"
-               label="Refresh"
+               label="%action.refresh.label"
                toolbarPath="additions">
          </action>
+         
+         <menu id="numberFormat"
+               label="%menu.numberFormat"
+               path="additions"/>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex"
+               label="%action.setDefaultNumberFormatHex.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal"
+               label="%action.setDefaultNumberFormatDecimal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal"
+               label="%action.setDefaultNumberFormatOctal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary"
+               label="%action.setDefaultNumberFormatBinary.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural"
+               label="%action.setDefaultNumberFormatNatural.label"
+               menubarPath="numberFormat/additions"
+               state="true"
+               style="radio">
+         </action>
+         
+         <menu id="updatePolicy"
+               label="%menu.updatePolicy"
+               path="additions"/>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.BreakpointHitUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit"
+               label="%action.breakpointHitUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.ManualUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual"
+               label="%action.manualUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.AutomaticUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic"
+               label="%action.automaticUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               state="true"
+               style="radio">
+         </action>         
       </viewContribution>
+
+      <!-- Registers View menu contributions -->
+      <viewContribution
+            id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.Refresh"
+            targetID="org.eclipse.debug.ui.RegisterView">
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.RefreshActionDelegate"
+               icon="icons/refresh.gif"
+               id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.Refresh"
+               label="%action.refresh.label"
+               toolbarPath="additions">
+         </action>
+         
+         <menu id="numberFormat"
+               label="%menu.numberFormat"
+               path="additions"/>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex"
+               label="%action.setDefaultNumberFormatHex.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal"
+               label="%action.setDefaultNumberFormatDecimal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal"
+               label="%action.setDefaultNumberFormatOctal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary"
+               label="%action.setDefaultNumberFormatBinary.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural"
+               label="%action.setDefaultNumberFormatNatural.label"
+               menubarPath="numberFormat/additions"
+               state="true"
+               style="radio">
+         </action>
+         
+         <menu id="updatePolicy"
+               label="%menu.updatePolicy"
+               path="additions"/>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.BreakpointHitUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit"
+               label="%action.breakpointHitUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.ManualUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual"
+               label="%action.manualUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.AutomaticUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic"
+               label="%action.automaticUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               state="true"
+               style="radio">
+         </action>         
+         
+      </viewContribution>
+      
+      <!-- Expressions View menu contributions -->
       <viewContribution
             id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.Refresh"
             targetID="org.eclipse.debug.ui.ExpressionView">
@@ -81,185 +236,87 @@
                class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.RefreshActionDelegate"
                icon="icons/refresh.gif"
                id="org.eclipse.dd.dsf.debug.ui.viewmodel.update.actions.Refresh"
-               label="Refresh"
+               label="%action.refresh.label"
                toolbarPath="additions">
          </action>
-      </viewContribution>
-      <viewContribution
-            id="org.eclipse.dd.dsf.debug.ui.update.variable.updatePolicies"
-            targetID="org.eclipse.debug.ui.VariableView">
+         
+         <menu id="numberFormat"
+               label="%menu.numberFormat"
+               path="additions"/>
          <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction"
-               id="org.eclipse.dd.dsf.debug.ui.update.selectUpdatePolicy"
-               label="Update Policy"
-               menubarPath="additions">
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Hex"
+               label="%action.setDefaultNumberFormatHex.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
          </action>
-      </viewContribution>
-      <viewContribution
-            id="org.eclipse.dd.dsf.debug.ui.update.register.updatePolicies"
-            targetID="org.eclipse.debug.ui.RegisterView">
          <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.SelectUpdatePolicyAction"
-               id="org.eclipse.dd.dsf.debug.ui.update.selectUpdatePolicy"
-               label="Update Policy"
-               menubarPath="additions">
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Decimal"
+               label="%action.setDefaultNumberFormatDecimal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
          </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Octal"
+               label="%action.setDefaultNumberFormatOctal.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Binary"
+               label="%action.setDefaultNumberFormatBinary.label"
+               menubarPath="numberFormat/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.NumberFormat_Natural"
+               label="%action.setDefaultNumberFormatNatural.label"
+               menubarPath="numberFormat/additions"
+               state="true"
+               style="radio">
+         </action>
+         
+         <menu id="updatePolicy"
+               label="%menu.updatePolicy"
+               path="additions"/>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.BreakpointHitUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_BreakpointHit"
+               label="%action.breakpointHitUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.ManualUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Manual"
+               label="%action.manualUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               style="radio">
+         </action>
+         <action
+               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions.AutomaticUpdatePolicyAction"
+               helpContextId="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic_helpContext"
+               id="org.eclipse.dd.dsf.debug.ui.UpdatePolicy_Automatic"
+               label="%action.automaticUpdatePolicy.label"
+               menubarPath="updatePolicy/additions"
+               state="true"
+               style="radio">
+         </action>         
+         
       </viewContribution>
    </extension>
    
-      <extension point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.debug.ui.RegisterView"
-            id="org.eclipse.debug.ui.PulldownActions">
-         <menu id="numberFormat"
-               label="Number Format"
-               path="additions"/>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Hex_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Hex"
-               label="Hex"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal"
-               label="Decimal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Octal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Octal"
-               label="Octal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Binary_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Binary"
-               label="Binary"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Natural_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Natural"
-               label="Natural"
-               menubarPath="numberFormat/additions"
-               state="true"
-               style="radio">
-         </action>
-      </viewContribution>
-   </extension>
-   
-   <extension point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.debug.ui.VariableView"
-            id="org.eclipse.debug.ui.PulldownActions">
-         <menu id="numberFormat"
-               label="Number Format"
-               path="additions"/>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Hex_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Hex"
-               label="Hex"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal"
-               label="Decimal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Octal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Octal"
-               label="Octal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Binary_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Binary"
-               label="Binary"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Natural_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Natural"
-               label="Natural"
-               menubarPath="numberFormat/additions"
-               state="true"
-               style="radio">
-         </action>
-      </viewContribution>
-   </extension>   
-   
-   <extension point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.PulldownActions">
-         <menu id="numberFormat"
-               label="Number Format"
-               path="additions"/>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatHex"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Hex_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Hex"
-               label="Hex"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatDecimal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Decimal"
-               label="Decimal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatOctal"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Octal_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Octal"
-               label="Octal"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatBinary"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Binary_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Binary"
-               label="Binary"
-               menubarPath="numberFormat/additions"
-               style="radio">
-         </action>
-         <action
-               class="org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.numberformat.actions.SetDefaultFormatNatural"
-               helpContextId="com.windriver.ide.debug.internal.ui.NumberFormat.Natural_helpContext"
-               id="com.windriver.ide.debug.internal.ui.NumberFormat.Natural"
-               label="Natural"
-               menubarPath="numberFormat/additions"
-               state="true"
-               style="radio">
-         </action>
-      </viewContribution>
-   </extension>    
-   
 	<extension 
 	    point="org.eclipse.debug.ui.detailPaneFactories">
         <detailFactories
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/AutomaticUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/AutomaticUpdatePolicyAction.java
new file mode 100644
index 00000000000..f3b58174c69
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/AutomaticUpdatePolicyAction.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems 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:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions;
+
+import org.eclipse.dd.dsf.ui.viewmodel.update.AutomaticUpdatePolicy;
+
+/**
+ * 
+ */
+public class AutomaticUpdatePolicyAction extends SelectUpdatePolicyAction {
+
+    public AutomaticUpdatePolicyAction() {
+        super(AutomaticUpdatePolicy.AUTOMATIC_UPDATE_POLICY_ID);
+    }
+}
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/BreakpointHitUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/BreakpointHitUpdatePolicyAction.java
new file mode 100644
index 00000000000..2fc61e621ed
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/BreakpointHitUpdatePolicyAction.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems 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:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions;
+
+import org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.BreakpointHitUpdatePolicy;
+
+/**
+ * 
+ */
+public class BreakpointHitUpdatePolicyAction extends SelectUpdatePolicyAction {
+
+    public BreakpointHitUpdatePolicyAction() {
+        super(BreakpointHitUpdatePolicy.BREAKPOINT_HIT_UPDATE_POLICY_ID);
+    }
+}
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/ManualUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/ManualUpdatePolicyAction.java
new file mode 100644
index 00000000000..ee6dd54fa6e
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/ManualUpdatePolicyAction.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems 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:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.dsf.debug.internal.provisional.ui.viewmodel.update.actions;
+
+import org.eclipse.dd.dsf.ui.viewmodel.update.ManualUpdatePolicy;
+
+/**
+ * 
+ */
+public class ManualUpdatePolicyAction extends SelectUpdatePolicyAction {
+
+    public ManualUpdatePolicyAction() {
+        super(ManualUpdatePolicy.MANUAL_UPDATE_POLICY_ID);
+    }
+}
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/SelectUpdatePolicyAction.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/SelectUpdatePolicyAction.java
index 3ad5a1936d4..d44d7b9075b 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/SelectUpdatePolicyAction.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/update/actions/SelectUpdatePolicyAction.java
@@ -15,114 +15,71 @@ import org.eclipse.dd.dsf.ui.viewmodel.IVMProvider;
 import org.eclipse.dd.dsf.ui.viewmodel.update.ICachingVMProvider;
 import org.eclipse.dd.dsf.ui.viewmodel.update.IVMUpdatePolicy;
 import org.eclipse.debug.ui.contexts.DebugContextEvent;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.IViewPart;
 
 /**
  * 
  */
-public class SelectUpdatePolicyAction extends AbstractVMProviderActionDelegate implements IMenuCreator {
+public class SelectUpdatePolicyAction extends AbstractVMProviderActionDelegate  {
 
+    private final String fUpdatePolicyId;
     
-    class SelectPolicy extends Action {
-        private ICachingVMProvider fVMProvider;
-        private IVMUpdatePolicy fUpdatePolicy;
-        
-        @Override
-        public void run() {
-            if (isChecked()) {
-                fVMProvider.setActiveUpdatePolicy(fUpdatePolicy);
-            }
-        }
-
-        public SelectPolicy(ICachingVMProvider provider, IVMUpdatePolicy updatePolicy) {
-            super(updatePolicy.getName(), IAction.AS_RADIO_BUTTON);
-            fVMProvider = provider;
-            fUpdatePolicy = updatePolicy;
-        }        
+    public SelectUpdatePolicyAction(String policyId) {
+        fUpdatePolicyId = policyId;
     }
-
-
-    public Menu getMenu(Control parent) {
-        // Never called
-        return null;
+    
+    protected String getUpdatePolicyId() {
+        return fUpdatePolicyId;
     }
     
     @Override
     public void init(IViewPart view) {
         super.init(view);
-        getAction().setEnabled(getVMProvider() instanceof ICachingVMProvider);
-    }
-
-    @Override
-    public void init(IAction action) {
-        super.init(action);
-        action.setMenuCreator(this);
+        update();
     }
     
     public void run(IAction action) {
-        // Do nothing, this is a pull-down menu
+        IVMProvider provider = getVMProvider();
+        if (provider instanceof ICachingVMProvider) {
+            ICachingVMProvider cachingProvider = (ICachingVMProvider)provider;
+            IVMUpdatePolicy policy = getPolicyFromProvider(cachingProvider, getUpdatePolicyId());
+            if (policy != null) {
+                cachingProvider.setActiveUpdatePolicy(policy);
+            }
+        }
+    }
+    
+    private IVMUpdatePolicy getPolicyFromProvider(ICachingVMProvider provider, String id) {
+        for (IVMUpdatePolicy policy : provider.getAvailableUpdatePolicies()) {
+            if (policy.getID().equals(id)) {
+                return policy;
+            }
+        }
+        return null;
     }
 
     @Override
     public void selectionChanged(IAction action, ISelection selection) {
-        if (action != getAction()) {
-            action.setMenuCreator(this);
-        }
         super.selectionChanged(action, selection);
-        getAction().setEnabled(getVMProvider() instanceof ICachingVMProvider);
+        update();
     }
     
     @Override
     public void debugContextChanged(DebugContextEvent event) {
         super.debugContextChanged(event);
-        getAction().setEnabled(getVMProvider() instanceof ICachingVMProvider);
+        update();
     }
     
-    public Menu getMenu(Menu parent) {
-        Menu menu = new Menu(parent);
-        menu.addMenuListener(new MenuAdapter() {
-            @Override
-            public void menuShown(MenuEvent e) {
-                Menu m = (Menu)e.widget;
-                MenuItem[] items = m.getItems();
-                for (int i=0; i < items.length; i++) {
-                    items[i].dispose();
-                }
-                fillMenu(m);
-            }
-        });     
-        return menu;
-    }
-
-    private void fillMenu(Menu menu) {
-        
-        IVMUpdatePolicy[] updatePolicies = new IVMUpdatePolicy[0];
-        IVMUpdatePolicy activePolicy = null;
+    protected void update() {
         IVMProvider provider = getVMProvider();
         if (provider instanceof ICachingVMProvider) {
-            ICachingVMProvider cachingProvider = (ICachingVMProvider)provider;
-            updatePolicies = cachingProvider.getAvailableUpdatePolicies();
-            activePolicy = cachingProvider.getActiveUpdatePolicy();
-
-            for (IVMUpdatePolicy updatePolicy : updatePolicies) {
-                SelectPolicy action = new SelectPolicy(cachingProvider, updatePolicy);
-                if (updatePolicy.equals(activePolicy)) {
-                    action.setChecked(true);
-                } 
-                ActionContributionItem item = new ActionContributionItem(action);
-                item.fill(menu, -1);
-            }
+            getAction().setEnabled(true);
+            IVMUpdatePolicy activePolicy = ((ICachingVMProvider)provider).getActiveUpdatePolicy();
+            getAction().setChecked( activePolicy != null && getUpdatePolicyId().equals(activePolicy.getID()) );
+        } else {
+            getAction().setEnabled(false);
         }
     }
-
 }
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
index d08230289aa..1d62bcb85e8 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
@@ -208,8 +208,6 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa
         
     protected static String SELECTED_UPDATE_MODE = "org.eclipse.dd.dsf.ui.viewmodel.update.selectedUpdateMode";  //$NON-NLS-1$
 
-    private IVMUpdatePolicy fCurrentUpdatePolicy;
-    
     private IVMUpdatePolicy[] fAvailableUpdatePolicies;
 
     public Map<Object, RootElementMarkerKey> fRootMarkers = new HashMap<Object, RootElementMarkerKey>();
@@ -238,17 +236,7 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa
         fCacheListHead.fNext = fCacheListHead;
         fCacheListHead.fPrevious = fCacheListHead;
         
-        String updateModeId = (String)presentationContext.getProperty(SELECTED_UPDATE_MODE);
-        if (updateModeId != null) {
-            for (IVMUpdatePolicy updateMode : getAvailableUpdatePolicies()) {
-                if (updateMode.getID().equals(updateModeId)) {
-                    fCurrentUpdatePolicy = updateMode;
-                }
-            }
-        }
-        
         fAvailableUpdatePolicies = createUpdateModes();
-        fCurrentUpdatePolicy = fAvailableUpdatePolicies[0];
     }
     
     protected IVMUpdatePolicy[] createUpdateModes() {
@@ -260,11 +248,21 @@ public class AbstractCachingVMProvider extends AbstractVMProvider implements ICa
     }
 
     public IVMUpdatePolicy getActiveUpdatePolicy() {
-        return fCurrentUpdatePolicy;
+        String updateModeId = (String)getPresentationContext().getProperty(SELECTED_UPDATE_MODE);
+        if (updateModeId != null) {
+            for (IVMUpdatePolicy updateMode : getAvailableUpdatePolicies()) {
+                if (updateMode.getID().equals(updateModeId)) {
+                    return updateMode;
+                }
+            }
+        }
+        
+        // Default to the first one.
+        return getAvailableUpdatePolicies()[0];
     }
 
     public void setActiveUpdatePolicy(IVMUpdatePolicy updatePolicy) {
-        fCurrentUpdatePolicy = updatePolicy;
+        getPresentationContext().setProperty(SELECTED_UPDATE_MODE, updatePolicy.getID());
     }
     
     public void refresh() {