diff --git a/frontend/templates/base_app.html b/frontend/templates/base_app.html
index 3f83613..c1549a8 100644
--- a/frontend/templates/base_app.html
+++ b/frontend/templates/base_app.html
@@ -77,6 +77,11 @@
                     Dashboard
                   </a>
                 </li>
+                <li>
+                  <a href="{% url 'questions_list' %}" class="rounded-full px-6 py-3 text-base font-semibold leading-[1.7] tracking-[-0.09px] text-gray-900 transition-colors hover:bg-gray-100 dark:text-gray-100 dark:hover:bg-gray-800">
+                    Questions
+                  </a>
+                </li>
                 <li>
                   <a href="{% url 'settings' %}" class="rounded-full px-6 py-3 text-base font-semibold leading-[1.7] tracking-[-0.09px] text-gray-900 transition-colors hover:bg-gray-100 dark:text-gray-100 dark:hover:bg-gray-800">
                     Settings
@@ -136,6 +141,11 @@
                       Dashboard
                     </a>
                   </li>
+                  <li class="py-5 text-center border-b border-gray-200 dark:border-gray-800">
+                    <a href="{% url 'questions_list' %}" class="text-sm font-semibold text-gray-900 hover:text-indigo-600 dark:text-gray-100 dark:hover:text-indigo-400">
+                      Questions
+                    </a>
+                  </li>
                   {% if user.is_authenticated %}
                   <li class="py-5 text-center border-b border-gray-200 dark:border-gray-800">
                     <a href="{% url 'settings' %}" class="text-sm font-semibold text-gray-900 hover:text-indigo-600 dark:text-gray-100 dark:hover:text-indigo-400">
diff --git a/frontend/templates/base_landing.html b/frontend/templates/base_landing.html
index dbe0b6f..72b4175 100644
--- a/frontend/templates/base_landing.html
+++ b/frontend/templates/base_landing.html
@@ -68,9 +68,14 @@
             <img class="h-8 w-auto" src="{% static 'vendors/images/logo.png' %}" alt="Clawrn Logo" />
             <span class="text-base font-semibold text-gray-900 dark:text-gray-100">Clawrn</span>
           </a>
-          <a href="{% url 'account_signup' %}" class="inline-flex items-center rounded-md bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-500">
-            Start for Free
-          </a>
+          <div class="flex items-center gap-2">
+            <a href="{% url 'questions_list' %}" class="inline-flex items-center rounded-md border border-gray-300 px-4 py-2 text-sm font-semibold text-gray-900 transition-colors hover:bg-gray-100 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800">
+              Questions
+            </a>
+            <a href="{% url 'account_signup' %}" class="inline-flex items-center rounded-md bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-500">
+              Start for Free
+            </a>
+          </div>
         </div>
       </header>
     {% else %}
@@ -85,6 +90,7 @@
             </div>
 
             <div class="hidden gap-2 items-center ml-auto lg:flex">
+              <a href="{% url 'questions_list' %}" class="rounded-full border-[1.5px] border-gray-300 px-5 py-3 text-sm font-semibold text-gray-900 transition-colors hover:bg-gray-100 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800">Questions</a>
               {% if user.is_authenticated %}
                 <a href="{% url 'home' %}" class="inline-block rounded-full border-[1.5px] border-gray-300 px-6 py-3 text-sm font-semibold text-gray-900 hover:bg-gray-100 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800">Dashboard</a>
               {% else %}