diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index c6c81c96..f1e972e9 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -34,32 +34,32 @@
           </button>
         </form>
         <div class="btn-group" role="group">
-            <form method="post">
-                <input type="hidden" name="form-name" value="create-random-email">
-                <button data-toggle="tooltip"
-                        title="Create a totally random alias"
-                        class="btn btn-success">Random Alias
-                </button>
-            </form>
-            <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle"
-                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <form method="post">
+            <input type="hidden" name="form-name" value="create-random-email">
+            <button data-toggle="tooltip"
+                    title="Create a totally random alias"
+                    class="btn btn-success">Random Alias
             </button>
-            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="btnGroupDrop1">
-                <div class="">
-                    <form method="post">
-                        <input type="hidden" name="form-name" value="create-random-email">
-                        <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
-                        <button class="dropdown-item">By random words</button>
-                    </form>
-                </div>
-                <div class="">
-                    <form method="post">
-                        <input type="hidden" name="form-name" value="create-random-email">
-                        <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
-                        <button class="dropdown-item">By UUID</button>
-                    </form>
-                </div>
+          </form>
+          <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle"
+                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          </button>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="btnGroupDrop1">
+            <div class="">
+              <form method="post">
+                <input type="hidden" name="form-name" value="create-random-email">
+                <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
+                <button class="dropdown-item">By random words</button>
+              </form>
             </div>
+            <div class="">
+              <form method="post">
+                <input type="hidden" name="form-name" value="create-random-email">
+                <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
+                <button class="dropdown-item">By UUID</button>
+              </form>
+            </div>
+          </div>
         </div>
       </div>
     </div>
diff --git a/templates/footer.html b/templates/footer.html
index 0235e407..253cd0ab 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -22,6 +22,14 @@
               </a></li>
               <li class="list-inline-item"><a href="mailto:hi@simplelogin.io">Contact Us
                 <i class="fe fe-external-link"></i></a></li>
+              <li class="list-inline-item intro-step-0">
+                <a onclick="startIntro()"
+                   data-intro="Welcome to SimpleLogin! <br><br>
+  It seems that this is the first time you are here,
+  let's walk through some SimpleLogin features together! <br><br>
+             You can always show this tutorial again any time by clicking on this <i class='fe fe-help-circle'></i> icon below 👇"
+                   data-step="1"
+                ><i class="fe fe-help-circle"></i></a></li>
             </ul>
           </div>
         </div>
diff --git a/templates/header.html b/templates/header.html
index 48731ff8..175afa97 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -12,16 +12,6 @@
           </div>
         {% endif %}
 
-        <div class="dropdown d-none d-md-flex">
-          <a class="nav-link icon"
-             data-intro="Welcome to SimpleLogin! <br><br>
-  It seems that this is the first time you are here,
-  let's walk through some SimpleLogin features together! <br><br>
-             You can always show this tutorial again any time by clicking on this <i class='fe fe-help-circle'></i> icon above 👆"
-             onclick="startIntro()">
-            <i class="fe fe-help-circle"></i>
-          </a>
-        </div>
         <div class="dropdown">
           <a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown">
             {% if current_user.profile_picture_id %}