diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js
index e098779..7de2793 100644
--- a/circle/dashboard/static/dashboard/vm-details.js
+++ b/circle/dashboard/static/dashboard/vm-details.js
@@ -392,6 +392,7 @@ function checkNewActivity(runs) {
       } else {
         icon.prop("class", "fa " + data['icon']);
       }
+      $("#vm-details-state").data("status", data['status']);
       $("#vm-details-state span").html(data['human_readable_status'].toUpperCase());
       if(data['status'] == "RUNNING") {
         if(data['connect_uri']) {
diff --git a/circle/dashboard/static/dashboard/vm-tour.js b/circle/dashboard/static/dashboard/vm-tour.js
index 0c55aa0..fc7ddb4 100644
--- a/circle/dashboard/static/dashboard/vm-tour.js
+++ b/circle/dashboard/static/dashboard/vm-tour.js
@@ -37,8 +37,11 @@ function get_steps() {
   deploy_selector = "#ops";
   save_as_selector = "#ops";
   if(!$('.timeline .activity i').hasClass('fa-spin')) {
-    deploy_selector += ' a[class*="operation-deploy"]';
-    save_as_selector += ' a[class*="operation-save_as"]';
+    vm_status = $("#vm-details-state").data("status");
+    if(vm_status === "PENDING")
+      deploy_selector += ' a[class*="operation-deploy"]';
+    if(vm_status === "RUNNING" || vm_status === "STOPPED")
+      save_as_selector += ' a[class*="operation-save_as_template"]';
   }
 
   steps = [
@@ -55,7 +58,7 @@ function get_steps() {
     },
     {
       element: document.querySelector('a[href="#resources"]'),
-      intro: gettext("On the resources tab you can edit the CPU/RAM options and add/remove disks!"),
+      intro: gettext("On the resources tab you can edit the CPU/RAM options and add/remove disks."),
     },
     {
       element: document.querySelector('#vm-details-resources-form'),
@@ -82,7 +85,7 @@ function get_steps() {
     },
     {
       element: document.querySelector("#vm-info-pane"),
-      intro: gettext("Use the connection string or connect with your choice of client!"),
+      intro: gettext("Use the CIRCLE client or the connection string to connect to the virtual machine."),
     },
     {
       element: document.querySelector("#vm-info-pane"),
@@ -94,7 +97,7 @@ function get_steps() {
     },
     {
       element: document.querySelector(".alert-new-template"),
-      intro: gettext("This is the last message, if something is not clear you can do the the tour again!"),
+      intro: gettext("This is the last message, if something is not clear you can do the the tour again."),
     },
   ];
   return steps;
diff --git a/circle/dashboard/templates/dashboard/vm-detail.html b/circle/dashboard/templates/dashboard/vm-detail.html
index ea2d8ad..fbf7a92 100644
--- a/circle/dashboard/templates/dashboard/vm-detail.html
+++ b/circle/dashboard/templates/dashboard/vm-detail.html
@@ -76,7 +76,7 @@
   <div class="row">
     <div class="col-md-4" id="vm-info-pane">
       <div class="big">
-        <span id="vm-details-state" class="label label-success">
+        <span id="vm-details-state" class="label label-success" data-status="{{ instance.status }}">
           <i class="fa
             {% if is_new_state %}
             fa-spinner fa-spin