Improve Escape model execution widgets.
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
index ab93937..1d2af3a 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/plugin.xml
@@ -12,14 +12,25 @@
 	</extension>

 	<extension point="org.eclipse.ui.menus">

 		<menuContribution locationURI="popup:org.eclipse.ui.popup.any">

-			<command commandId="org.eclipse.amp.escape.runtime.execute"

-				icon="icons/etool16/execute.gif" style="push" tooltip="Execute the model.">

-				<visibleWhen checkEnabled="true">

+			<command
+         commandId="org.eclipse.amp.escape.runtime.execute"
+         icon="icons/etool16/execute.gif"
+         id="Execute Headless"
+         label="Execute"
+         style="push"
+         tooltip="Execute Escape Java model.">

+				<visibleWhen checkEnabled="false">
+       <reference
+             definitionId="org.eclipse.amp.escape.allowexecute">
+       </reference>

 				</visibleWhen>

 			</command>
 			<command commandId="org.eclipse.amp.escape.runtime.executeHeadless"
-				icon="icons/etool16/execute_headless.gif" style="push" tooltip="Execute the model.">
-				<visibleWhen checkEnabled="true">
+				icon="icons/etool16/execute_headless.gif" style="push" tooltip="Execute Escape Java model.">
+				<visibleWhen checkEnabled="false">
+       <reference
+             definitionId="org.eclipse.amp.escape.allowexecute">
+       </reference>
 				</visibleWhen>
 			</command>

 		</menuContribution>

@@ -27,7 +38,7 @@
 			locationURI="toolbar:org.eclipse.amp.escape.ide.launch?after=additions">
 			<command commandId="org.eclipse.amp.escape.runtime.execute"
 				icon="icons/etool16/execute.gif" label="Execute" style="push"
-				tooltip="Load and start an Escape model.">
+				tooltip="Execute Escape Java model.">
 				<visibleWhen checkEnabled="false">
 					<reference definitionId="org.eclipse.amp.escape.allowexecute">
 					</reference>
@@ -35,7 +46,7 @@
 			</command>
 			<command commandId="org.eclipse.amp.escape.runtime.executeHeadless"
 				icon="icons/etool16/execute_headless.gif" label="Execute Headless" style="push"
-				tooltip="Load and start an Escape model in non-graphical mode.">
+				tooltip="Execute Escape Java model without views.">
 				<visibleWhen checkEnabled="false">
 					<reference definitionId="org.eclipse.amp.escape.allowexecute">
 					</reference>
@@ -45,7 +56,7 @@
 		<menuContribution locationURI="menu:org.eclipse.amp.axf.ui.menu?after=additions">
 			<command commandId="org.eclipse.amp.escape.runtime.execute"
 				icon="icons/etool16/execute.gif" label="Execute" style="push"
-				tooltip="Load and start an Escape model.">
+				tooltip="Execute Escape Java model.">
 				<visibleWhen checkEnabled="false">
 					<reference definitionId="org.eclipse.amp.escape.allowexecute">
 					</reference>
@@ -53,7 +64,7 @@
 			</command>
 			<command commandId="org.eclipse.amp.escape.runtime.executeHeadless"
 				icon="icons/etool16/execute_headless.gif" label="Execute Headless" style="push"
-				tooltip="Load and start an Escape model in non-graphical mode.">
+				tooltip="Execute Escape Java model without views.">
 				<visibleWhen checkEnabled="false">
 					<reference definitionId="org.eclipse.amp.escape.allowexecute">
 					</reference>