diff --git a/app/components/host-row/template.hbs b/app/components/host-row/template.hbs
index dcf35ed79..4e7de231b 100644
--- a/app/components/host-row/template.hbs
+++ b/app/components/host-row/template.hbs
@@ -58,11 +58,11 @@
 {{#if expanded}}
   <tr class="sub-row hide">{{! make the alternating color match }}</tr>
   <tr class="sub-row no-top">
-    <td colspan="{{fullColspan}}" class="p-0">
+    <td colspan="{{fullColspan}}" class="pr-40 pl-40">
       {{container-table
         body=model.instances
         stickyHeader=false
-        bulkActions=true
+        bulkActions=false
         search=false
         searchText=searchText
         subRow=true
diff --git a/app/mixins/cattle-transitioning-resource.js b/app/mixins/cattle-transitioning-resource.js
index 9a0680471..f7562c0d3 100644
--- a/app/mixins/cattle-transitioning-resource.js
+++ b/app/mixins/cattle-transitioning-resource.js
@@ -12,33 +12,38 @@ const defaultStateMap = {
   'creating':                 {icon: 'icon icon-tag',           color: 'text-info'   },
   'deactivating':             {icon: 'icon icon-adjust',        color: 'text-info'   },
   'degraded':                 {icon: 'icon icon-alert',         color: 'text-warning'},
-  'disconnected':             {icon: 'icon icon-alert',         color: 'text-warning' },
-  'error':                    {icon: 'icon icon-alert',         color: 'text-error' },
-  'inactive':                 {icon: 'icon icon-circle',        color: 'text-error' },
+  'disconnected':             {icon: 'icon icon-alert',         color: 'text-warning'},
+  'error':                    {icon: 'icon icon-alert',         color: 'text-error'  },
+  'erroring':                 {icon: 'icon icon-alert',         color: 'text-error'  },
+  'inactive':                 {icon: 'icon icon-circle',        color: 'text-error'  },
   'initializing':             {icon: 'icon icon-alert',         color: 'text-warning'},
-  'provisioning':             {icon: 'icon icon-circle',        color: 'text-info'},
-  'purged':                   {icon: 'icon icon-purged',        color: 'text-error' },
+  'migrating':                {icon: 'icon icon-info',          color: 'text-info'   },
+  'provisioning':             {icon: 'icon icon-circle',        color: 'text-info'   },
+  'purged':                   {icon: 'icon icon-purged',        color: 'text-error'  },
   'purging':                  {icon: 'icon icon-purged',        color: 'text-info'   },
-  'reconnecting':             {icon: 'icon icon-alert',         color: 'text-error' },
-  'removed':                  {icon: 'icon icon-trash',         color: 'text-error' },
+  'reconnecting':             {icon: 'icon icon-alert',         color: 'text-error'  },
+  'removed':                  {icon: 'icon icon-trash',         color: 'text-error'  },
   'removing':                 {icon: 'icon icon-trash',         color: 'text-info'   },
   'requested':                {icon: 'icon icon-tag',           color: 'text-info'   },
   'registering':              {icon: 'icon icon-tag',           color: 'text-info'   },
   'reinitializing':           {icon: 'icon icon-alert',         color: 'text-warning'},
   'restoring':                {icon: 'icon icon-medicalcross',  color: 'text-info'   },
+  'restarting':               {icon: 'icon icon-adjust',        color: 'text-info'   },
   'running':                  {icon: 'icon icon-circle-o',      color: 'text-success'},
   'snapshotted':              {icon: 'icon icon-snapshot',      color: 'text-warning'},
   'started-once':             {icon: 'icon icon-dot-circlefill',color: 'text-success'},
   'starting':                 {icon: 'icon icon-adjust',        color: 'text-info'   },
-  'stopped':                  {icon: 'icon icon-circle',        color: 'text-error' },
+  'stopped':                  {icon: 'icon icon-circle',        color: 'text-error'  },
   'stopping':                 {icon: 'icon icon-adjust',        color: 'text-info'   },
-  'unhealthy':                {icon: 'icon icon-alert',         color: 'text-error' },
+  'unhealthy':                {icon: 'icon icon-alert',         color: 'text-error'  },
   'updating':                 {icon: 'icon icon-tag',           color: 'text-info'   },
   'updating-active':          {icon: 'icon icon-tag',           color: 'text-info'   },
   'updating-healthy':         {icon: 'icon icon-tag',           color: 'text-info'   },
-  'updating-unhealthy':       {icon: 'icon icon-tag',           color: 'text-info'   },
-  'updating-reinitializing':  {icon: 'icon icon-alert',         color: 'text-info'   },
   'updating-inactive':        {icon: 'icon icon-tag',           color: 'text-info'   },
+  'updating-unhealthy':       {icon: 'icon icon-tag',           color: 'text-info'   },
+  'updating-reinitializing':  {icon: 'icon icon-alert',         color: 'text-warning'},
+  'updating-running':         {icon: 'icon icon-tag',           color: 'text-info'   },
+  'updating-stopped':         {icon: 'icon icon-tag',           color: 'text-info'   },
   'waiting':                  {icon: 'icon icon-tag',           color: 'text-info'   },
 };
 
diff --git a/server/caas/registration/api.js b/server/caas/registration/api.js
index c39aab164..449172041 100644
--- a/server/caas/registration/api.js
+++ b/server/caas/registration/api.js
@@ -14,7 +14,7 @@ module.exports = function(app/*, options*/) {
   const rancherApiUrl = `${config.apiServer}${config.apiEndpoint}`;
   const tablePrefix = process.env.DB_TABLE_PREFIX || '';
 
-  const baseUrl = process.env.BASE_URL || ('https://' + process.env.RANCHER);
+  const siteUrl = process.env.SITE_URL || ('https://' + process.env.RANCHER);
 
   app.use(bodyParser.json()); // for parsing application/json
 
@@ -313,7 +313,7 @@ module.exports = function(app/*, options*/) {
         var from_email = new helper.Email('no-reply@rancher.com');
         var to_email = new helper.Email(email);
         var subject = 'Password Reset Request';
-        var contentLink = `<html><a href="${baseUrl}/verify-reset-password/${token}">Reset Password</a></html>`;
+        var contentLink = `<html><a href="${siteUrl}/verify-reset-password/${token}">Reset Password</a></html>`;
         var content = new helper.Content(
           'text/html', contentLink);
         var mail = new helper.Mail(from_email, subject, to_email, content);
@@ -344,7 +344,7 @@ module.exports = function(app/*, options*/) {
       var from_email = new helper.Email('no-reply@rancher.com');
       var to_email = new helper.Email(email);
       var subject = 'Verify your Rancher Cloud Account';
-      var contentLink = `<html><a href="${baseUrl}/verify/${token}">Verify Email</a></html>`;
+      var contentLink = `<html><a href="${siteUrl}/verify/${token}">Verify Email</a></html>`;
       var content = new helper.Content(
         'text/html', contentLink);
       var mail = new helper.Mail(from_email, subject, to_email, content);
@@ -370,7 +370,7 @@ module.exports = function(app/*, options*/) {
       var from_email = new helper.Email('no-reply@rancher.com');
       var to_email = new helper.Email(email);
       var subject = 'Password Reset Confirmation';
-      var contentLink = `<html><a href="${baseUrl}/login?resetpw=true">Reset Password</a></html>`;
+      var contentLink = `<html><a href="${siteUrl}/login?resetpw=true">Reset Password</a></html>`;
       var content = new helper.Content(
         'text/html', contentLink);
       var mail = new helper.Mail(from_email, subject, to_email, content);