Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/siteTree.js b/bundles/org.eclipse.orion.client.core/web/orion/siteTree.js
index ac40647..928c1be 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/siteTree.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/siteTree.js
@@ -113,7 +113,7 @@
 			var actionsWrapper = dojo.create("span", {id: tableRow.id + "actionswrapper"}, actionCol, "only");
 			
 			// contact the command service to render appropriate commands here.
-			this._commandService.renderCommands(actionsWrapper, "object", item, {} /*handler*/, "tool");
+			this._commandService.renderCommands(actionsWrapper, "object", item, {} /*handler*/, "button");
 			
 			dojo.place(siteConfigCol, tableRow, "last");
 			dojo.place(statusCol, tableRow, "last");
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/siteUtils.js b/bundles/org.eclipse.orion.client.core/web/orion/siteUtils.js
index 956f93e..9e03fe8 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/siteUtils.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/siteUtils.js
@@ -100,7 +100,7 @@
 			imageClass: "core-sprite-edit",
 			id: "eclipse.site.edit",
 			visibleWhen: function(item) {
-				return item.HostingStatus && item.HostingStatus.Status === "stopped";
+				return item.HostingStatus;
 			},
 			hrefCallback: function(data) { return generateEditSiteHref(data.items);}});
 		commandService.addCommand(editCommand, "object");