diff --git a/server.ts b/server.ts
index d4e9f53..4ce4161 100644
--- a/server.ts
+++ b/server.ts
@@ -615,12 +615,14 @@ app.post('/api/admin/students/:id/status', authenticateToken, requireAdmin, (req
 // Admin System Settings
 app.get('/api/admin/settings', authenticateToken, requireAdmin, (req: AuthenticatedRequest, res: Response) => {
   const db = loadDb();
-  res.json(db.settings || {
-    trialDurationDays: 7,
-    asaasEnvironment: 'sandbox',
-    asaasApiKey: '',
-    asaasWebhookUrl: '',
-    asaasWebhookSecret: ''
+  const settings = db.settings || {};
+  res.json({
+    trialDurationDays: settings.trialDurationDays || 7,
+    asaasEnvironment: settings.asaasEnvironment || 'sandbox',
+    asaasApiKey: settings.asaasApiKey || '',
+    asaasWebhookUrl: settings.asaasWebhookUrl || 'https://admin-estudo.microtecinformaticacurso.com.br/api/webhooks/asaas',
+    asaasWebhookSecret: settings.asaasWebhookSecret || 'devflix_webhook_secret_key',
+    helpText: settings.helpText || ''
   });
 });
 
diff --git a/src/components/AdminDashboard.tsx b/src/components/AdminDashboard.tsx
index f58e3f1..c41e7f3 100644
--- a/src/components/AdminDashboard.tsx
+++ b/src/components/AdminDashboard.tsx
@@ -88,7 +88,11 @@ export default function AdminDashboard({ token }: AdminDashboardProps) {
       });
       if (res.ok) {
         const data = await res.json();
-        setSettings(data);
+        const autoWebhookUrl = data.asaasWebhookUrl || `${window.location.origin}/api/webhooks/asaas`;
+        setSettings({
+          ...data,
+          asaasWebhookUrl: autoWebhookUrl
+        });
       }
     } catch (err) {
       console.error('Error fetching settings:', err);
diff --git a/src/components/CourseView.tsx b/src/components/CourseView.tsx
index c413296..0ed3f00 100644
--- a/src/components/CourseView.tsx
+++ b/src/components/CourseView.tsx
@@ -391,10 +391,10 @@ export default function CourseView({ courseId, token, onBack }: CourseViewProps)
                     <div className="p-3 border-t border-white/5 bg-black/20">
                       <button
                         onClick={() => setActiveActivityModuleId(mod.id)}
-                        className="w-full flex items-center justify-center space-x-2 bg-zinc-800 hover:bg-[#E50914] hover:text-white text-zinc-300 transition-colors py-2.5 rounded-lg text-xs font-bold uppercase tracking-wider group"
+                        className="w-full flex items-center justify-center space-x-2 glass-btn-primary hover:scale-[1.02] text-white transition-all py-2.5 px-3 rounded-lg text-xs font-extrabold uppercase tracking-wider cursor-pointer shadow-md group"
                       >
-                        <Award className="w-4 h-4 text-[#E50914] group-hover:text-white transition-colors" />
-                        <span>Avaliação do Módulo</span>
+                        <Award className="w-4 h-4 text-white flex-shrink-0" />
+                        <span className="truncate">Avaliação do Módulo {modIdx + 1}: {mod.title}</span>
                       </button>
                     </div>
                   )}
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 9b30a11..1dea00f 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -115,25 +115,25 @@ export default function Navbar({ user, activeView, setView, onLogout }: NavbarPr
         </div>
 
         {/* NAVIGATION LINKS */}
-        <div className="hidden md:flex items-center space-x-6 text-sm">
+        <div className="hidden md:flex items-center space-x-3 lg:space-x-6 text-sm flex-shrink-0">
           <button 
             onClick={() => setView('home')}
-            className={`font-medium transition-colors hover:text-[#E50914] ${activeView === 'home' || activeView === 'course-view' ? 'text-white' : 'text-zinc-400'}`}
+            className={`font-semibold transition-colors hover:text-[#E50914] whitespace-nowrap flex-shrink-0 ${activeView === 'home' || activeView === 'course-view' ? 'text-white' : 'text-zinc-400'}`}
           >
             Cursos
           </button>
           <button 
             onClick={() => setView('subscription')}
-            className={`font-medium transition-colors hover:text-[#E50914] flex items-center space-x-1 whitespace-nowrap ${activeView === 'subscription' ? 'text-white' : 'text-zinc-400'}`}
+            className={`font-semibold transition-colors hover:text-[#E50914] flex items-center space-x-1.5 whitespace-nowrap flex-shrink-0 ${activeView === 'subscription' ? 'text-white' : 'text-zinc-400'}`}
           >
-            <DollarSign className="w-4 h-4" />
+            <DollarSign className="w-4 h-4 text-[#E50914]" />
             <span>Minha Assinatura</span>
           </button>
           <button 
             onClick={() => setView('certificates')}
-            className={`font-medium transition-colors hover:text-[#E50914] flex items-center space-x-1 whitespace-nowrap ${activeView === 'certificates' ? 'text-white' : 'text-zinc-400'}`}
+            className={`font-semibold transition-colors hover:text-[#E50914] flex items-center space-x-1.5 whitespace-nowrap flex-shrink-0 ${activeView === 'certificates' ? 'text-white' : 'text-zinc-400'}`}
           >
-            <GraduationCap className="w-4 h-4" />
+            <GraduationCap className="w-4 h-4 text-[#E50914]" />
             <span>Meu Certificado</span>
           </button>
         </div>