diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 42fedca..69e83f3 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,19 +1,14 @@
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import { Archivo } from "next/font/google";
 import "./globals.css";
 import "./styles/variables.css";
 import "./styles/base.css";
 
+const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
   title: "Computer Club",  description: "Join a vibrant community of tech enthusiasts, innovators, and learners."};
 
-const archivo = Archivo({
-  variable: "--font-archivo",
-  subsets: ["latin"],
-});
-
 export default function RootLayout({
   children,
 }: {
@@ -21,7 +16,7 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
-      <body className={`${archivo.variable} antialiased`}>{children}
+      <body className={inter.className}>{children}
         <script
           dangerouslySetInnerHTML={{
             __html: `
@@ -263,7 +258,9 @@ export default function RootLayout({
   const getElementInfo = (element, assignId = false) => {
     const rect = element.getBoundingClientRect();
     const tagName = element.tagName.toLowerCase();
-            
+    const selector = getUniqueSelector(element, assignId);
+    const sectionId = getSectionId(element);
+    
     let className = undefined;
     try {
       if (element.className) {
@@ -291,7 +288,8 @@ export default function RootLayout({
     };
     
     if (tagName === 'img') {
-            info.imageData = {
+      const originalSrc = extractOriginalUrl(element.src);
+      info.imageData = {
         src: originalSrc,
         alt: element.alt || undefined,
         naturalWidth: element.naturalWidth,
@@ -302,7 +300,8 @@ export default function RootLayout({
 
     if (tagName === 'video') {
       const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
-            info.imageData = {
+      const resolvedSrc = extractOriginalUrl(rawSrc);
+      info.imageData = {
         src: resolvedSrc,
         alt: element.getAttribute('aria-label') || undefined,
         isBackground: false,
@@ -315,7 +314,8 @@ export default function RootLayout({
     if (backgroundImage && backgroundImage !== 'none') {
       const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
       if (urlMatch) {
-                if (tagName !== 'img') {
+        const originalBgSrc = extractOriginalUrl(urlMatch[1]);
+        if (tagName !== 'img') {
           info.imageData = {
             src: originalBgSrc,
             isBackground: true
@@ -327,7 +327,8 @@ export default function RootLayout({
       }
     }
     
-        info.elementType = elementType;
+    const elementType = getElementType(element);
+    info.elementType = elementType;
     
     if (elementType === 'Button') {
       const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || '';
@@ -420,11 +421,13 @@ export default function RootLayout({
   };
 
   const isTextElement = (element) => {
-        return elementType === 'Text';
+    const elementType = getElementType(element);
+    return elementType === 'Text';
   };
 
   const isButtonElement = (element) => {
-        return elementType === 'Button';
+    const elementType = getElementType(element);
+    return elementType === 'Button';
   };
 
   const updateButtonText = (element, newText) => {
@@ -499,7 +502,8 @@ export default function RootLayout({
     };
     
     const handleInput = () => {
-            let currentText = element.textContent;
+      const elementInfo = getElementInfo(element);
+      let currentText = element.textContent;
       
       // Ensure there's always at least a space to keep the element editable
       if (currentText === '' || currentText === null || currentText.length === 0) {
@@ -612,7 +616,8 @@ export default function RootLayout({
     }, '*');
     
     if (save && originalContent !== element.textContent) {
-            let finalText = element.textContent;
+      const elementInfo = getElementInfo(element);
+      let finalText = element.textContent;
       
       // Trim the final text and convert space-only to empty string for saving
       if (finalText === ' ' || finalText.trim() === '') {
@@ -741,7 +746,7 @@ export default function RootLayout({
     lastMouseX = e.clientX;
     lastMouseY = e.clientY;
 
-    || e.target;
+    const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;
 
     if (!isValidElement(target) || target === hoveredElement || target === selectedElement) {
       return;
@@ -773,7 +778,8 @@ export default function RootLayout({
       hoverOverlay = createHoverOverlay(target);
     }
     
-        showElementTypeLabel(target, elementType);
+    const elementType = getElementType(target);
+    showElementTypeLabel(target, elementType);
     
     window.parent.postMessage({
       type: 'webild-element-hover',
@@ -815,7 +821,7 @@ export default function RootLayout({
   e.preventDefault();
   e.stopPropagation();
 
-  || e.target;  
+  const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;  
   if (!isValidElement(target)) return;
     
     if (selectedElement && selectedElement !== target) {
@@ -860,7 +866,8 @@ export default function RootLayout({
       hoveredElement = null;
     }
     
-        selectedElement.dataset.webildSelector = elementInfo.selector;
+    const elementInfo = getElementInfo(target, true);
+    selectedElement.dataset.webildSelector = elementInfo.selector;
     showElementTypeLabel(target, elementInfo.elementType);
     
     window.parent.postMessage({
@@ -943,7 +950,8 @@ export default function RootLayout({
       isScrolling = false;
 
       if (lastMouseX > 0 && lastMouseY > 0) {
-                if (target && isValidElement(target) && target !== selectedElement) {
+        const target = getMostSpecificElement(lastMouseX, lastMouseY);
+        if (target && isValidElement(target) && target !== selectedElement) {
           hoveredElement = target;
 
           const computedStyle = window.getComputedStyle(target);
@@ -957,7 +965,8 @@ export default function RootLayout({
           hoveredElement.classList.add(hoverClass);
           hoverOverlay = createHoverOverlay(target);
 
-                    showElementTypeLabel(target, elementType);
+          const elementType = getElementType(target);
+          showElementTypeLabel(target, elementType);
 
           window.parent.postMessage({
             type: 'webild-element-hover',
@@ -980,7 +989,8 @@ export default function RootLayout({
 
   const saveChangeToStorage = (change) => {
     try {
-            const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]');
+      const storageKey = getStorageKey();
+      const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]');
 
       const filteredChanges = existingChanges.filter(c => {
         return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId);
@@ -1000,7 +1010,8 @@ export default function RootLayout({
 
   const clearLocalChanges = () => {
     try {
-            localStorage.removeItem(storageKey);
+      const storageKey = getStorageKey();
+      localStorage.removeItem(storageKey);
       window.parent.postMessage({
         type: 'webild-local-changes-cleared',
         data: {}
@@ -1049,7 +1060,8 @@ export default function RootLayout({
 
     if (e.data.type === 'webild-cancel-changes') {
       try {
-                const savedChanges = localStorage.getItem(storageKey);
+        const storageKey = getStorageKey();
+        const savedChanges = localStorage.getItem(storageKey);
         if (savedChanges) {
           const changes = JSON.parse(savedChanges);
           changes.forEach(change => {
@@ -1071,7 +1083,8 @@ export default function RootLayout({
                 if (isBackground) {
                   element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
                 } else {
-                                    if (revertTag === 'video' && oldMediaType === 'image') {
+                  const oldMediaType = getMediaTypeFromUrl(change.oldValue);
+                  if (revertTag === 'video' && oldMediaType === 'image') {
                     swapMediaElement(element, 'img', change.oldValue);
                   } else if (revertTag === 'img' && oldMediaType === 'video') {
                     swapMediaElement(element, 'video', change.oldValue);
@@ -1119,7 +1132,8 @@ export default function RootLayout({
               const el = textElements[i];
               if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) {
                 element = el;
-                                if (newSelector) {
+                const newSelector = getUniqueSelector(element, true);
+                if (newSelector) {
                   element.dataset.webildSelector = newSelector;
                 }
                 break;
@@ -1210,8 +1224,10 @@ export default function RootLayout({
           replaced = true;
         } else if (element.tagName.toLowerCase() === 'img') {
           oldValue = element.src;
-                    if (newMediaType === 'video' && allowMediaTypeSwap) {
-                        if (selectedElement === element) selectedElement = swapped;
+          const newMediaType = getMediaTypeFromUrl(newSrc);
+          if (newMediaType === 'video' && allowMediaTypeSwap) {
+            const swapped = swapMediaElement(element, 'video', newSrc);
+            if (selectedElement === element) selectedElement = swapped;
             element = swapped;
           } else {
             element.src = newSrc;
@@ -1219,9 +1235,11 @@ export default function RootLayout({
           replaced = true;
         } else if (element.tagName.toLowerCase() === 'video') {
           oldValue = element.src || element.currentSrc || '';
-                    const sources = element.querySelectorAll('source');
+          const newMediaType = getMediaTypeFromUrl(newSrc);
+          const sources = element.querySelectorAll('source');
           if (newMediaType === 'image' && allowMediaTypeSwap) {
-                        if (selectedElement === element) selectedElement = swapped;
+            const swapped = swapMediaElement(element, 'img', newSrc);
+            if (selectedElement === element) selectedElement = swapped;
             element = swapped;
           } else {
             if (sources.length > 0) {
@@ -1243,7 +1261,8 @@ export default function RootLayout({
         }
 
         if (replaced) {
-          
+          const elementInfo = getElementInfo(element);
+
           let cleanOldValue = oldValue;
           if (oldValue.includes('url(')) {
             const urlMatch = oldValue.match(/url(['"]?([^'")]+)['"]?)/);
@@ -1314,7 +1333,13 @@ export default function RootLayout({
     }
   }, true);
   
-    
+  const urlCheckInterval = setInterval(() => {
+    if (lastPathname !== window.location.pathname) {
+      lastPathname = window.location.pathname;
+      notifyPageChange();
+    }
+  }, 500);
+  
   notifyPageChange();
   
   window.webildCleanup = () => {
@@ -1361,4 +1386,4 @@ export default function RootLayout({
       </body>
     </html>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index cce33b4..584d366 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -90,8 +90,8 @@ export default function LandingPage() {
 
       <div id="features" data-section="features">
         <FeatureCardTwentyFive
-          title="What We Offer"
-          description="Comprehensive programs and experiences designed to elevate your technical skills and expand your network."
+          title="Transform Your Tech Journey"
+          description="Accelerate your skill growth and advance your career through hands-on learning, meaningful mentorship, and collaborative innovation with a supportive community."
           tag="Club Benefits"
           tagIcon={Star}
           tagAnimation="slide-up"
@@ -288,4 +288,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file
