diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index be525d9..a872635 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,8 +1,6 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
-import "./globals.css";
-import { ServiceWrapper } from "@/providers/service/ServiceWrapper";
-import { Tag } from "@/components/common/Tag";
+import "@/styles/globals.css";
 
 const geist = Geist({
   variable: "--font-geist-sans",  subsets: ["latin"],
@@ -13,8 +11,7 @@ const geistMono = Geist_Mono({
 });
 
 export const metadata: Metadata = {
-  title: "MindVault - Your Private Sanctuary for Self-Discovery",  description:
-    "A thoughtful platform combining the therapeutic benefits of personal journaling with community connection. Track your psychological growth, explore your thoughts privately, and connect authentically with others on similar journeys."};
+  title: "MindVault - Your Private Sanctuary for Self-Discovery",  description: "Share anonymously, connect authentically, and grow psychologically with a supportive community."};
 
 export default function RootLayout({
   children,
@@ -22,31 +19,9 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en" suppressHydrationWarning>
-      <head>
-        <script>
-          {
-            `
-            try {
-              const theme = localStorage.getItem('theme') || 'light';
-              if (theme === 'dark') {
-                document.documentElement.classList.add('dark');
-              } else {
-                document.documentElement.classList.remove('dark');
-              }
-            } catch (e) {}
-          `
-          }
-        </script>
-      </head>
-      <body
-        className={`${geist.variable} ${geistMono.variable} antialiased`}
-        suppressHydrationWarning
-      >
-        <ServiceWrapper>
-          <Tag />
-          {children}
-        </ServiceWrapper>
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
       
         <script
           dangerouslySetInnerHTML={{
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 91820b2..860128e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,7 +10,7 @@ import TestimonialCardSixteen from "@/components/sections/testimonial/Testimonia
 import FaqBase from "@/components/sections/faq/FaqBase";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Users, BookOpen, TrendingUp, Heart } from "lucide-react";
+import { Users, BookOpen, TrendingUp, Heart, Shield } from "lucide-react";
 import Link from "next/link";
 
 export default function HomePage() {
@@ -22,9 +22,9 @@ export default function HomePage() {
       contentWidth="mediumLarge"
       sizing="largeSmallSizeMediumTitles"
       background="circleGradient"
-      cardStyle="glass-elevated"
+      cardStyle="layered-gradient"
       primaryButtonStyle="double-inset"
-      secondaryButtonStyle="glass"
+      secondaryButtonStyle="solid"
       headingFontWeight="semibold"
     >
       {/* Navigation */}
@@ -169,17 +169,18 @@ export default function HomePage() {
           animationType="smooth"
           faqs={[
             {
-              id: "1",              title: "How private are my diary entries?",              content: "Your diary entries are completely private and encrypted. Only you can access them. They never appear publicly unless you explicitly choose to share them. Your personal data is protected with industry-standard security protocols."},
+              id: "1",              title: "How secure is my data?",              content: "All data is encrypted end-to-end using industry-standard protocols. Your privacy is guaranteed."
+            },
             {
-              id: "2",              title: "Can I really post anonymously?",              content: "Yes! You can choose to post anonymously or with your profile. Anonymous posts are completely disconnected from your identity while still connecting you with the community. Your privacy is always your choice."},
+              id: "2",              title: "How private are my diary entries?",              content: "Your diary entries are completely private and encrypted. Only you can access them. They never appear publicly unless you explicitly choose to share them. Your personal data is protected with industry-standard security protocols."},
             {
-              id: "3",              title: "How does progress tracking work?",              content: "MindVault analyzes patterns in your entries and reflections to show your emotional journey over time. You'll see insights about your growth, recurring themes, and positive developments. It's like having a personal psychologist reviewing your progress."},
+              id: "3",              title: "Can I really post anonymously?",              content: "Yes! You can choose to post anonymously or with your profile. Anonymous posts are completely disconnected from your identity while still connecting you with the community. Your privacy is always your choice."},
             {
-              id: "4",              title: "Is there professional support available?",              content: "While MindVault is not a replacement for professional therapy, we connect users with resources and recommend working with licensed therapists. Our community provides peer support, insights, and psychological frameworks for self-discovery."},
+              id: "4",              title: "How does progress tracking work?",              content: "MindVault analyzes patterns in your entries and reflections to show your emotional journey over time. You'll see insights about your growth, recurring themes, and positive developments. It's like having a personal psychologist reviewing your progress."},
             {
-              id: "5",              title: "How do I connect with other users?",              content: "Browse community posts, comment on others' shared thoughts, ask questions, and receive supportive responses. You can connect based on interests, topics, or similar experiences. Follow users, join discussion threads, and build meaningful connections."},
+              id: "5",              title: "Is there professional support available?",              content: "While MindVault is not a replacement for professional therapy, we connect users with resources and recommend working with licensed therapists. Our community provides peer support, insights, and psychological frameworks for self-discovery."},
             {
-              id: "6",              title: "What topics can I explore on MindVault?",              content: "MindVault covers psychology, personal growth, life challenges, relationships, career, mental health, spirituality, creativity, and more. The community explores topics ranging from anxiety management to existential questions about life and meaning."},
+              id: "6",              title: "How do I connect with other users?",              content: "Browse community posts, comment on others' shared thoughts, ask questions, and receive supportive responses. You can connect based on interests, topics, or similar experiences. Follow users, join discussion threads, and build meaningful connections."},
           ]}
         />
       </div>
@@ -239,9 +240,8 @@ export default function HomePage() {
           ]}
           bottomLeftText="© 2025 MindVault. All rights reserved. Committed to your privacy and growth."
           bottomRightText="Made with thoughtfulness for the human mind"
-          containerClassName="bg-glass backdrop-blur-md border border-glass rounded-lg"
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
