diff --git a/src/components/core/navbar/index.tsx b/src/components/core/navbar/index.tsx
index 5b66711..2de6bab 100644
--- a/src/components/core/navbar/index.tsx
+++ b/src/components/core/navbar/index.tsx
@@ -124,7 +124,7 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
 
           {/* Hamburger menu button for small screens */}
           <div className="md:hidden flex justify-end items-center">
-            <div className="mr-2">
+            <div className="mr-2" id="nav-theme">
               <ThemeButton iconSize={18} />
             </div>
             <div className="flex">
@@ -140,7 +140,9 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
           </div>
 
           <div className="hidden md:flex gap-2 flex-row items-center">
-            <ThemeButton iconSize={22} />
+            <div id="theme">
+              <ThemeButton iconSize={22} />
+            </div>
             <button
               type="button"
               className="px-10 py-2 text-base rounded-full bg-primary text-white hover:bg-primary-light hover:scale-105"
diff --git a/src/components/pages/home/index.tsx b/src/components/pages/home/index.tsx
index 5efc999..cca6bb0 100644
--- a/src/components/pages/home/index.tsx
+++ b/src/components/pages/home/index.tsx
@@ -51,6 +51,7 @@ function HomePage({ accountId }: { accountId: string | undefined }) {
                 delay: 0.2,
               }}
               className="flex justify-center md:justify-start"
+              id="start-your-journey"
             >
               {accountId ? (
                 <ButtonLong href="/feed" size="big">
diff --git a/src/helper/startTour.ts b/src/helper/startTour.ts
index a30663c..c872457 100644
--- a/src/helper/startTour.ts
+++ b/src/helper/startTour.ts
@@ -35,7 +35,7 @@ export const startTour = () => {
     id: "step2",
     text: "Click to change the theme either dark mode or light mode.",
     attachTo: {
-      element: ".themeButton",
+      element: "#theme",
       on: "bottom",
     },
     buttons: [
@@ -99,8 +99,8 @@ export const startTour = () => {
     id: "step6",
     text: 'Click "Start your journey" to begin exploring all the exciting features we offer. Let\'s get started on creating something amazing together!',
     attachTo: {
-      element: "section:nth-of-type(1)",
-      on: "bottom",
+      element: "#start-your-journey",
+      on: "bottom-start",
     },
     buttons: [
       {