diff --git a/src/UI/Walkthrough/Walkthrough.svelte b/src/UI/Walkthrough/Walkthrough.svelte
index 03858d84b..bbb5d0661 100644
--- a/src/UI/Walkthrough/Walkthrough.svelte
+++ b/src/UI/Walkthrough/Walkthrough.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 
-  import * as nmd from "nano-markdown";
+  import nmd from "nano-markdown";
   import { createEventDispatcher } from "svelte";
   import WalkthroughStep from "./WalkthroughStep.svelte";
   import FromHtml from "../Base/FromHtml.svelte";
@@ -9,6 +9,7 @@
    * Markdown
    */
   export let pages: string[];
+  console.log("Walkthrough pages are", pages)
 
   let currentPage: number = 0;
 
@@ -26,7 +27,7 @@
 </script>
 
 
-<WalkthroughStep on:back={() => step(-1)} on:next={() => step(1)}>
+<WalkthroughStep on:back={() => step(-1)} on:next={() => step(1)} isFirst={currentPage === 0} islast={currentPage + 1 === pages.length}>
   <FromHtml src={nmd(pages[currentPage])} />
 </WalkthroughStep>
 
diff --git a/src/UI/Walkthrough/WalkthroughStep.svelte b/src/UI/Walkthrough/WalkthroughStep.svelte
index 77bbd833f..34c298e67 100644
--- a/src/UI/Walkthrough/WalkthroughStep.svelte
+++ b/src/UI/Walkthrough/WalkthroughStep.svelte
@@ -21,6 +21,8 @@
     <BackButton clss="w-full" on:click={() => dispatch("back")}>
       Back
     </BackButton>
+      {:else}
+      <div class="w-full"/>
       {/if}
     <NextButton clss="primary w-full" on:click={() => dispatch("next")}>
       {#if islast}