diff --git a/old/lib/client/constants.tsx b/old/lib/client/constants.tsx
index 8915d335..9863487d 100644
--- a/old/lib/client/constants.tsx
+++ b/old/lib/client/constants.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-export const supportEmail = 'mysharktrash@gmail.com (official email to be created)';
+export const supportEmail = 'compass.meet.marketing@gmail.com';
 
 export const pStyle = "mt-1 text-gray-800 dark:text-white whitespace-pre-line";
 
diff --git a/old/app/privacy/page.tsx b/web/pages/privacy.tsx
similarity index 89%
rename from old/app/privacy/page.tsx
rename to web/pages/privacy.tsx
index f251958e..d37a7ceb 100644
--- a/old/app/privacy/page.tsx
+++ b/web/pages/privacy.tsx
@@ -1,8 +1,12 @@
-import {supportEmail} from "@/lib/client/constants";
+import {supportEmail} from "../../old/lib/client/constants";
+import {LovePage} from "web/components/love-page";
 
 export default function PrivacyPage() {
   return (
-    <main className="max-w-4xl mx-auto p-8">
+    <LovePage
+      trackPageView={'terms'}
+      className="max-w-4xl mx-auto p-8"
+    >
       <h1 className="text-3xl font-semibold text-center mb-6">Privacy Policy</h1>
 
       <p className="text-center mb-12">
@@ -48,6 +52,6 @@ export default function PrivacyPage() {
           For questions about this Privacy Policy, reach out at {supportEmail}.
         </p>
       </section>
-    </main>
+    </LovePage>
   );
 }
diff --git a/web/pages/register.tsx b/web/pages/register.tsx
index 3b1b7924..16553643 100644
--- a/web/pages/register.tsx
+++ b/web/pages/register.tsx
@@ -191,7 +191,7 @@ function RegisterComponent() {
                 </div>
 
                 <div>
-                  <p className="text-xs text-gray-500 mt-2 text-center">
+                  <p className="text-xs mt-2 text-center">
                     By signing up, I agree to the{" "}
                     <a href="/terms" className="underline hover:text-blue-600">
                       Terms and Conditions
@@ -229,15 +229,15 @@ function RegisterComponent() {
                     type="button"
                     onClick={signupThenMaybeRedirectToSignup}
                     disabled={isLoading}
-                    className="w-full flex items-center justify-center gap-2 py-2 px-4 border border-gray-300 rounded-full shadow-sm text-sm font-medium text-gray-700  hover: focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-70 disabled:cursor-not-allowed"
+                    className="w-full flex items-center justify-center gap-2 py-2 px-4 border border-gray-300 rounded-full shadow-sm text-sm font-medium hover: focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-70 disabled:cursor-not-allowed"
                   >
                     <FcGoogle className="w-5 h-5"/>
-                    Continue with Google
+                    Google
                   </button>
                 </div>
               </form>
               <div className="text-center text-sm mt-2">
-                <p className="text-gray-600">
+                <p className="">
                   Already have an account?{' '}
                   <Link href="/signin" className="font-medium text-blue-600 hover:text-blue-500">
                     Sign in
diff --git a/web/pages/signin.tsx b/web/pages/signin.tsx
index e9d2cbf7..2653f4f3 100644
--- a/web/pages/signin.tsx
+++ b/web/pages/signin.tsx
@@ -176,10 +176,10 @@ function RegisterComponent() {
                 type="button"
                 onClick={handleGoogleSignIn}
                 disabled={isLoading}
-                className="w-full flex items-center justify-center gap-2 py-2 px-4 border border-gray-300 rounded-full shadow-sm text-sm font-medium text-gray-700  hover: focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-70 disabled:cursor-not-allowed"
+                className="w-full flex items-center justify-center gap-2 py-2 px-4 border border-gray-300 rounded-full shadow-sm text-sm font-medium  hover: focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-70 disabled:cursor-not-allowed"
               >
                 <FcGoogle className="w-5 h-5"/>
-                Sign in with Google
+                Google
               </button>
             </div>
           </form>
diff --git a/old/app/terms/page.tsx b/web/pages/terms.tsx
similarity index 67%
rename from old/app/terms/page.tsx
rename to web/pages/terms.tsx
index 2c5e2556..8dd5dd6d 100644
--- a/old/app/terms/page.tsx
+++ b/web/pages/terms.tsx
@@ -1,8 +1,12 @@
-import {supportEmail} from "@/lib/client/constants";
+import {supportEmail} from "../../old/lib/client/constants";
+import {LovePage} from "web/components/love-page";
 
 export default function TermsPage() {
   return (
-    <main className="max-w-4xl mx-auto p-8 text-gray-800 dark:text-white">
+    <LovePage
+      trackPageView={'terms'}
+      className="max-w-4xl mx-auto p-8 text-gray-800 dark:text-white"
+    >
       <h1 className="text-3xl font-semibold text-center mb-6">Terms & Conditions</h1>
 
       <p className="text-center text-gray-500 dark:text-white mb-12">
@@ -11,8 +15,8 @@ export default function TermsPage() {
 
       <section className="space-y-6 text-base leading-relaxed">
         <p>
-          Welcome to <span className="font-semibold">Compass</span>, a platform designed for
-          rational thinkers to connect, collaborate, and build meaningful interactions.
+          Welcome to <span className="font-semibold">Compass</span>, a platform to connect, collaborate, and build
+          meaningful interactions.
           By accessing or using our service, you agree to the following Terms and Conditions.
         </p>
 
@@ -30,15 +34,12 @@ export default function TermsPage() {
 
         <h2 className="text-xl font-semibold">3. Intellectual Property & Licensing</h2>
         <p>
-          a. <strong>Ownership and License.</strong> Compass is developed and
-          maintained as a <strong>free and open-source project</strong>. Unless
-          otherwise stated, all source code, designs, and related materials
-          (“Project Materials”) are licensed under the{" "}
-          <strong>MIT License</strong> or another permissive open-source license
-          determined by the community. Subject to the applicable license terms, you
-          are granted a worldwide, royalty-free, non-exclusive, irrevocable license
-          to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-          copies of the Project Materials.
+          a. <strong>Ownership and License.</strong> Compass is developed and maintained as a free and open-source
+          project. Unless otherwise stated, all source code, designs, and related materials (“Project Materials”) are
+          licensed under the AGPL-3.0 License. Certain components may be licensed under permissive open-source licenses,
+          as explicitly indicated. Subject to the applicable license terms, you are granted a worldwide, royalty-free,
+          non-exclusive, irrevocable license to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+          copies of the Project Materials in accordance with the terms of the applicable license.
         </p>
         <p>
           b. <strong>Community Governance.</strong> Compass operates under a{" "}
@@ -56,15 +57,15 @@ export default function TermsPage() {
           represent and warrant that you have the right to grant such a license and
           that your Contributions do not infringe on the rights of any third party.
         </p>
+        {/*<p>*/}
+        {/*  d. <strong>Trademarks and Branding.</strong> The name “Compass,” logos,*/}
+        {/*  and associated marks (“Marks”) are the exclusive property of the Compass*/}
+        {/*  community or its designated steward. Use of the Marks is only permitted as*/}
+        {/*  authorized in writing by the Compass governance body to avoid confusion*/}
+        {/*  or misuse.*/}
+        {/*</p>*/}
         <p>
-          d. <strong>Trademarks and Branding.</strong> The name “Compass,” logos,
-          and associated marks (“Marks”) are the exclusive property of the Compass
-          community or its designated steward. Use of the Marks is only permitted as
-          authorized in writing by the Compass governance body to avoid confusion
-          or misuse.
-        </p>
-        <p>
-          e. <strong>No Proprietary Restrictions.</strong> Compass shall remain{" "}
+          d. <strong>No Proprietary Restrictions.</strong> Compass shall remain{" "}
           <strong>free of advertising, proprietary lock-ins, and data monetization</strong>{" "}
           unless explicitly approved by the community in accordance with its
           governance process. Users and contributors must not introduce such
@@ -83,10 +84,10 @@ export default function TermsPage() {
           constitutes acceptance of the new Terms.
         </p>
 
-        <p className="text-gray-600 italic mt-8">
+        <p className="italic mt-8">
           For questions regarding these Terms, please contact us at {supportEmail}.
         </p>
       </section>
-    </main>
+    </LovePage>
   );
 }