diff --git a/client/assets/styles/scss/modals/modals-empty.scss b/client/assets/styles/scss/modals/modals-empty.scss
index 559b39c28..4f6714d47 100644
--- a/client/assets/styles/scss/modals/modals-empty.scss
+++ b/client/assets/styles/scss/modals/modals-empty.scss
@@ -64,7 +64,6 @@
 
   // submit buttons (like for api token)
   .green {
-    display: table;
     margin-left: auto;
     margin-right: auto;
   }
diff --git a/client/directives/modals/ahaModal/ahaModal.jade b/client/directives/modals/ahaModal/ahaModal.jade
index 9ded682ff..0f3f69249 100644
--- a/client/directives/modals/ahaModal/ahaModal.jade
+++ b/client/directives/modals/ahaModal/ahaModal.jade
@@ -39,7 +39,7 @@
     .modal-body
       //- if demo feature is off
       .grid-block.shrink.vertical.align-center.aha-overview.padding-md.padding-bottom-sm(
-        ng-if = "!$root.featureFlags.demoProject"
+        ng-if = "!$root.featureFlags.demoProject && !AMC.isSettingUpRunnabot() && !AMC.hasRunnabot()"
       )
         p.grid-content.shrink.text-center.p.weight-light It takes just 3 steps to get everything set up. 
           br
@@ -51,7 +51,7 @@
 
       //- if demo feature is on
       .grid-block.shrink.vertical.align-center.noscroll.aha-overview(
-        ng-if = "!AMC.isSettingUpRunnabot() && $root.featureFlags.demoProject"
+        ng-if = "$root.featureFlags.demoProject && !AMC.isSettingUpRunnabot() && !AMC.hasRunnabot()"
       )
         //- step 1
         .grid-block.vertical.shrink.align-center.padding-sm.aha-guide.disabled
@@ -135,9 +135,9 @@
               target = "_blank"
             ) Learn how to add branches.
 
-      .grid-block.vertical.align-center.form-github(
+      .grid-block.vertical.align-center.form-github.padding-md(
         github-integration
-        ng-if = "AMC.isSettingUpRunnabot()"
+        ng-if = "AMC.isSettingUpRunnabot() || AMC.hasRunnabot()"
       )
 
   .grid-block.shrink.justify-center.margin-bottom-xl.welcome-footer(
diff --git a/client/directives/modals/ahaModal/ahaModalController.js b/client/directives/modals/ahaModal/ahaModalController.js
index 8d4c0d60d..dec3f7229 100644
--- a/client/directives/modals/ahaModal/ahaModalController.js
+++ b/client/directives/modals/ahaModal/ahaModalController.js
@@ -42,6 +42,8 @@ function AhaModalController(
   AMC.isAddingFirstBranch = ahaGuide.isAddingFirstBranch;
   AMC.getFurthestSubstep = ahaGuide.furthestSubstep;
   AMC.getClassForSubstep = ahaGuide.getClassForSubstep;
+  AMC.isInGuide = ahaGuide.isInGuide;
+  AMC.hasRunnabot = ahaGuide.hasRunnabot;
   AMC.hasInstances = false;
   AMC.accountHasRepos = false;
   AMC.currentOrg = currentOrg;