diff --git a/lib/towerops_web/components/layouts.ex b/lib/towerops_web/components/layouts.ex
index 64317910..f677d671 100644
--- a/lib/towerops_web/components/layouts.ex
+++ b/lib/towerops_web/components/layouts.ex
@@ -195,15 +195,18 @@ defmodule ToweropsWeb.Layouts do
                   active={@active_page == "network-map"}
                 >
                   <span class="flex items-center gap-1.5">
-                    Network Map
                     <.icon name="hero-beaker" class="h-3.5 w-3.5 text-blue-500 dark:text-blue-400" />
+                    Network Map
                   </span>
                 </.nav_link>
                 <.nav_link
                   navigate={~p"/alerts"}
                   active={@active_page == "alerts"}
                 >
-                  Alerts
+                  <span class="flex items-center gap-1.5">
+                    <.icon name="hero-beaker" class="h-3.5 w-3.5 text-blue-500 dark:text-blue-400" />
+                    Alerts
+                  </span>
                 </.nav_link>
                 <.nav_link
                   navigate={~p"/agents"}
diff --git a/lib/towerops_web/controllers/page_html/home.html.heex b/lib/towerops_web/controllers/page_html/home.html.heex
index a411a4e7..1aa454bd 100644
--- a/lib/towerops_web/controllers/page_html/home.html.heex
+++ b/lib/towerops_web/controllers/page_html/home.html.heex
@@ -20,16 +20,16 @@
       Monitor network devices via SNMP, track performance metrics in real-time, and respond to alerts instantly.
       Built specifically for telecom tower infrastructure.
     </p>
+    <p class="mx-auto mt-4 max-w-2xl text-xl font-semibold tracking-tight text-blue-600">
+      Monitor 10 devices for free. No credit card required.
+    </p>
     <div class="mt-10 flex justify-center gap-x-6">
       <.link
         navigate={~p"/users/register"}
         class="group inline-flex items-center justify-center rounded-full py-2 px-4 text-sm font-semibold focus-visible:outline-2 focus-visible:outline-offset-2 bg-blue-600 text-white hover:text-slate-100 hover:bg-blue-500 active:bg-blue-800 active:text-blue-100 focus-visible:outline-blue-600"
       >
-        Sign up now
+        Get started free
       </.link>
-      <p class="mt-3 text-sm text-slate-600">
-        No credit card required
-      </p>
     </div>
   </div>
   <!-- Primary Features Section -->
@@ -202,13 +202,13 @@
           Start monitoring today
         </h2>
         <p class="mt-4 text-lg tracking-tight text-white">
-          Get started in minutes. No credit card required.
+          Monitor up to 10 devices for free. No credit card required.
         </p>
         <.link
           navigate={~p"/users/register"}
           class="group inline-flex items-center justify-center rounded-full py-2 px-4 text-sm font-semibold focus-visible:outline-2 focus-visible:outline-offset-2 mt-10 bg-white text-slate-900 hover:bg-blue-50 active:bg-blue-200 active:text-slate-600 focus-visible:outline-white"
         >
-          Sign up now
+          Get started free
         </.link>
       </div>
     </div>
diff --git a/lib/towerops_web/controllers/user_registration_html/new.html.heex b/lib/towerops_web/controllers/user_registration_html/new.html.heex
index 9b180c35..1fed3d15 100644
--- a/lib/towerops_web/controllers/user_registration_html/new.html.heex
+++ b/lib/towerops_web/controllers/user_registration_html/new.html.heex
@@ -14,6 +14,18 @@
           to your account now.
         </:subtitle>
       </.header>
+
+      <div class="mt-6 rounded-lg bg-blue-50 dark:bg-blue-900/20 p-4 border border-blue-200 dark:border-blue-800">
+        <p class="text-sm font-medium text-blue-900 dark:text-blue-100">
+          Free tier includes:
+        </p>
+        <ul class="mt-2 text-sm text-blue-800 dark:text-blue-200 space-y-1">
+          <li>✓ Monitor up to 10 devices</li>
+          <li>✓ Real-time alerts and notifications</li>
+          <li>✓ Performance charts and historical data</li>
+          <li>✓ No credit card required</li>
+        </ul>
+      </div>
     </div>
 
     <div class="mt-8">