diff --git a/.DS_Store b/.DS_Store
index 9cfc02de..3b497b8c 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/components/Authentication/LoginModal.tsx b/components/Authentication/LoginModal.tsx
index b1622c35..a67978f8 100644
--- a/components/Authentication/LoginModal.tsx
+++ b/components/Authentication/LoginModal.tsx
@@ -1,7 +1,7 @@
 import { ReactNode, useEffect } from 'react';
 // import { useHistory } from 'react-router-dom';
 import Link from 'next/link';
-import Layout from '../../components/Section/Layout';
+import Layout from '../_Core/Section/Layout';
 import { Auth, ThemeSupa } from '@supabase/auth-ui-react';
 import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react';
 import { useRouter } from 'next/router';
diff --git a/components/Content/Archive/ArchivedInventory.tsx b/components/Content/Archive/ArchivedInventory.tsx
index 23f94563..4dc64b8b 100644
--- a/components/Content/Archive/ArchivedInventory.tsx
+++ b/components/Content/Archive/ArchivedInventory.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-import Layout from "../../Section/Layout";
+import Layout from "../../_Core/Section/Layout";
 import OwnedPlanetsList from "./UserOwnedPlanets"; // Potentially this should be in a lists component dir
 import OwnedItemsList from "../Inventory/UserOwnedItems";
-import MySpaceships from "../Inventory/Vehicles/MySpaceships";
+import MySpaceships from "../../Gameplay/Vehicles/MySpaceships";
 
 export default function V1Inventory() { // Inventory items for v1 of public schema, see notes below
     const supabase = useSupabaseClient();
diff --git a/components/Content/ClassificationFeed.tsx b/components/Content/ClassificationFeed.tsx
deleted file mode 100644
index 8765a9a9..00000000
--- a/components/Content/ClassificationFeed.tsx
+++ /dev/null
@@ -1,323 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useSession, useSupabaseClient, SupabaseClient } from "@supabase/auth-helpers-react";
-import CardForum, { CommentItem, RoverContentCard } from "./DiscussCard";
-
-export default function ClassificationFeed({ custommaxWidth = '85%' }) {
-  const supabase = useSupabaseClient();
-  const [posts, setPosts] = useState([]);
-
-  useEffect(() => {
-      fetchPosts();
-  }, []);
-
-  async function fetchPosts() {
-      try {
-          const postsResponse = await supabase
-              .from("basePlanets")
-              .select(
-                  "id, content, created_at, planets2, planetsss(id, temperature), profiles(id, avatar_url, full_name, username)"
-              )
-              .order('created_at', { ascending: false });
-
-          const roverImagePostsResponse = await supabase
-              .from("contentROVERIMAGES")
-              .select("id, content, created_at")
-              .order('created_at', { ascending: false });
-
-          const combinedPosts = [...postsResponse.data, ...roverImagePostsResponse.data];
-
-          const sortedPosts = combinedPosts.sort((a, b) =>
-              new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
-          );
-
-          setPosts(sortedPosts);
-      } catch (error) {
-          console.error("Error fetching posts:", error.message);
-      }
-  }
-
-  return (
-      <ul
-          aria-label="Nested user feed"
-          role="feed"
-          className="relative flex flex-col gap-12 py-12 before:absolute before:top-0 before:left-8 before:h-full before:-translate-x-1/2 after:absolute after:top-6 after:left-8 after:bottom-6 after:-translate-x-1/2"
-          style={{ maxWidth: custommaxWidth, margin: 'auto' }}
-      >
-          {posts.map((post) => (
-              <li key={post.id} role="article" className="relative">
-                  <CardForum {...post} />
-              </li>
-          ))}
-      </ul>
-  );
-}
-
-export function FactionFeed({ custommaxWidth = '85%', factionId }) {
-  const supabase: SupabaseClient = useSupabaseClient();
-  const session = useSession();
-
-  const [posts, setPosts] = useState([]);
-  // const [profile, setProfile] = useState(null);
-  const [planetPosts, setPlanetPosts] = useState([]);
-
-  useEffect(() => {
-      fetchPosts();
-    }, []);  
-  
-  useEffect(() => {
-      if (planetPosts.length > 0) {
-        console.log("Comments: ", planetPosts.flatMap((post) => post.comments));
-      }
-  }, []);
-
-  async function fetchPosts() {
-      const postsResponse = await supabase
-      .from("posts_duplicates")
-      .select(
-        "id, content, created_at, planets2, faction, planetsss(id, temperature), profiles(id, avatar_url, full_name, username)"
-      )
-      .eq('faction', factionId)
-      .order('created_at', { ascending: false });
-  
-    const postIds = postsResponse.data.map((post) => post.id);
-    const commentsResponse = await supabase
-      .from("comments")
-      .select("id, content, created_at, profiles(id, avatar_url, username), post_id") // Add the closing parenthesis for profiles select
-      .in("post_id", postIds)
-      .order("created_at", { ascending: true });
-
-    const commentsByPostId: { [postId: number]: Comment[] } = commentsResponse.data.reduce((acc, comment) => {
-      const postId = comment.post_id;
-      if (!acc[postId]) {
-        acc[postId] = [];
-      }
-      acc[postId].push(comment);
-      return acc;
-    }, {});
-
-    // const postsWithComments: Post[] = postsResponse.data.map((post) => ({
-    const postsWithComments = postsResponse.data.map((post) => ({
-      ...post,
-      comments: commentsByPostId[post.id] || [],
-    }));
-
-    setPosts(postsWithComments);
-  }
-
-  return (
-    <ul
-      aria-label="Nested user feed"
-      role="feed"
-      className="relative flex flex-col gap-12 py-12 pl-8 before:absolute before:top-0 before:left-8 before:h-full before:-translate-x-1/2 after:absolute after:top-6 after:left-8 after:bottom-6 after:-translate-x-1/2"
-      style={{ maxWidth: custommaxWidth, margin: 'auto' }}
-    >
-      {posts.map((post) => (
-        <li key={post.id} role="article" className="relative">
-          <RoverContentCard {...post} />
-        </li>
-      ))}
-    </ul>
-  );
-};
-
-export function MultiClassificationFeed({ custommaxWidth = '85%' }) {
-  const supabase: SupabaseClient = useSupabaseClient();
-  const session = useSession();
-
-  const [posts, setPosts] = useState([]);
-  const [planetPosts, setPlanetPosts] = useState([]);
-
-  useEffect(() => {
-      fetchPosts();
-  }, []);
-
-  useEffect(() => {
-      if (planetPosts.length > 0) {
-          console.log("Comments: ", planetPosts.flatMap((post) => post.comments));
-      }
-  }, []);
-
-  async function fetchPosts() {
-      const postsResponse = await supabase
-          .from("posts_duplicates")
-          .select(
-              "id, content, created_at, planets2, planetsss(id, temperature), profiles(id, avatar_url, full_name, username)"
-          )
-          .order('created_at', { ascending: false });
-
-      const roverImagePostsResponse = await supabase
-          .from("contentROVERIMAGES")
-          .select("id, content, created_at")
-          .order('created_at', { ascending: false });
-
-      const combinedPosts = [...postsResponse.data, ...roverImagePostsResponse.data];
-
-      const sortedPosts = combinedPosts.sort((a: { created_at: string }, b: { created_at: string }) =>
-        new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
-      );
-
-      setPosts(sortedPosts);
-  }
-
-  return (
-      <ul
-          aria-label="Nested user feed"
-          role="feed"
-          className="relative flex flex-col gap-12 py-12 before:absolute before:top-0 before:left-8 before:h-full before:-translate-x-1/2 after:absolute after:top-6 after:left-8 after:bottom-6 after:-translate-x-1/2"
-          style={{ maxWidth: custommaxWidth, margin: 'auto' }}
-      >
-          {posts.map((post) => (
-              <li key={post.id} role="article" className="relative">
-                  <CardForum {...post} />
-              </li>
-          ))}
-      </ul>
-  );
-}
-
-export function ClassificationFeedForIndividualPlanet(planetId, backgroundColorSet) {
-  const supabase: SupabaseClient = useSupabaseClient();
-  const session = useSession();
-
-  const [posts, setPosts] = useState([]);
-  // const [profile, setProfile] = useState(null);
-  const [planetPosts, setPlanetPosts] = useState([]);
-
-  useEffect(() => {
-      fetchPosts();
-    }, []);  
-  
-  useEffect(() => {
-      if (planetPosts.length > 0) {
-        console.log("Comments: ", planetPosts.flatMap((post) => post.comments));
-      }
-  }, []);
-
-  async function fetchPosts() {
-    try {
-      const postsResponse = await supabase
-        .from("classifications")
-        // .select("id, content, created_at, author, anomaly, basePlanets, profiles(id, avatar_url, full_name, username)")
-        .select("id, created_at, content, anomaly, media, profiles(id, avatar_url, full_name, username)")
-        .eq('anomaly', planetId.planetId.id)
-        .order('created_at', { ascending: false });
-  
-      if (postsResponse.error || !postsResponse.data) {
-        console.error("Error fetching posts:", postsResponse.error);
-        return;
-      }
-  
-      const postIds = postsResponse.data.map((post) => post.id);
-  
-      const commentsResponse = await supabase
-        .from("comments")
-        .select("id, content, created_at, profiles(id, avatar_url, username), post_id")
-        .in("post_id", postIds)
-        .order("created_at", { ascending: true });
-  
-      const commentsByPostId = commentsResponse.data.reduce((acc, comment) => {
-        const postId = comment.post_id;
-        if (!acc[postId]) {
-          acc[postId] = [];
-        }
-        acc[postId].push(comment);
-        return acc;
-      }, {});
-  
-      const postsWithComments = postsResponse.data.map((post) => ({
-        ...post,
-        comments: commentsByPostId[post.id] || [],
-      }));
-  
-      setPosts(postsWithComments);
-      // console.log(posts);
-    } catch (error) {
-      console.error("Error fetching posts:", error.message);
-    }
-  }  
-
-  return (
-      <div className="flex flex-col items-center gap-4 py-5" style={{ maxWidth: '100%', margin: 'auto' }}>
-          {posts.map((post) => (
-              <>
-                <CardForum key={post.id} {...post} backgroundColor={backgroundColorSet} />
-                <p>{post.planetId}</p>
-              </>
-          ))}
-      </div>
-  );
-};
-
-export function ClassificationFeedForIndividualPlanetDuplicates(planetId) {
-  const supabase: SupabaseClient = useSupabaseClient();
-  const session = useSession();
-
-  const [posts, setPosts] = useState([]);
-  // const [profile, setProfile] = useState(null);
-  const [planetPosts, setPlanetPosts] = useState([]);
-
-  useEffect(() => {
-      fetchPosts();
-    }, []);  
-  
-  useEffect(() => {
-      if (planetPosts.length > 0) {
-        console.log("Comments: ", planetPosts.flatMap((post) => post.comments));
-      }
-  }, []);
-
-  async function fetchPosts() {
-    try {
-      const postsResponse = await supabase
-        .from("posts_duplicates")
-        .select(
-          "id, anomaly, content, created_at, planets2, planetsss(id, temperature), profiles(id, avatar_url, full_name, username)"
-        )
-        // .eq('anomaly', planetId) // 'planets2', planetId
-        .order('created_at', { ascending: false });
-  
-      if (postsResponse.error || !postsResponse.data) {
-        console.error("Error fetching posts:", postsResponse.error);
-        return;
-      }
-  
-      const postIds = postsResponse.data.map((post) => post.id);
-  
-      const commentsResponse = await supabase
-        .from("comments")
-        .select("id, content, created_at, profiles(id, avatar_url, username), post_id")
-        .in("post_id", postIds)
-        .order("created_at", { ascending: true });
-  
-      const commentsByPostId = commentsResponse.data.reduce((acc, comment) => {
-        const postId = comment.post_id;
-        if (!acc[postId]) {
-          acc[postId] = [];
-        }
-        acc[postId].push(comment);
-        return acc;
-      }, {});
-  
-      const postsWithComments = postsResponse.data.map((post) => ({
-        ...post,
-        comments: commentsByPostId[post.id] || [],
-      }));
-  
-      setPosts(postsWithComments);
-      console.log(posts);
-    } catch (error) {
-      console.error("Error fetching posts:", error.message);
-    }
-  }  
-
-  return (
-      <div className="flex flex-col items-center gap-4 py-2" style={{ maxWidth: '100%', margin: 'auto' }}>
-          {posts.map((post) => (
-              <>
-                <CardForum key={post.id} {...post} />
-                <p>{post.planetId}</p>
-              </>
-          ))}
-      </div>
-  );
-};
\ No newline at end of file
diff --git a/components/Content/Classify/AnomalyPostFormCard.tsx b/components/Content/Classify/AnomalyPostFormCard.tsx
index f4f40c7b..f76eab6c 100644
--- a/components/Content/Classify/AnomalyPostFormCard.tsx
+++ b/components/Content/Classify/AnomalyPostFormCard.tsx
@@ -114,82 +114,5 @@ export default function PostFormCardAnomalyTag({ onPost, planetId }) {
                 </div>
             </div>
         </div>
-    )
-}
-
-export function PostFormCardAnomalyTagOldSchema({ onPost, planetId }) {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [content, setContent] = useState('');
-    const profile = session?.user?.id;
-    const [avatar_url, setAvatarUrl] = useState(null);
-    /* const [uploads, setUploads] = useState([]);
-    const [isUploading, setIsUploading] = useState(false);
-    const [userExperience, setUserExperience] = useState();
-    const [hasRequiredItem, setHasRequiredItem] = useState(false); */
-
-    const router = useRouter();
-    const anomalytId = router.query.id;
-
-    // Check if user has items to make post -> not required functionality yet
-
-    // Create the publication
-    async function createPost() {
-        // Will add an identifier to determine the number of posts mentioning the planet, as that will affect the classification rating
-
-        supabase
-            .from("posts_duplicates")
-            .insert({
-                author: profile,
-                content,
-                // media: uploads
-                // planets2: planetId,   
-                anomaly: planetId, // Set this to multiple anomaly types/foreign key options            
-            }).then(response => {
-                if (!response.error) {
-                  alert(`Post ${content} created`);
-                  setContent('');
-                //   setUploads([]);
-                  if ( onPost ) {
-                    onPost();
-                  }
-                }
-            });
-            
-            // .then (update user experience/currency)                                                                        
-    }
-
-    /* Get user avatar & other data
-    useEffect(() => {
-        supabase
-            .from('profiles')
-            .select(`avatatar_url`)
-            .eq("id", profile)
-            .then((result) => {
-                setAvatarUrl(result?.data[0]?.avatatar_url);
-            });
-    }, [session]); */
-
-    // Function to add media to the publication
-
-    // Frontend output
-    return (
-        <>
-            <div className="flex gap-2 mx-5 mt-5">
-                {/* <div>
-                    <img src={avatar_url} width='60px' height='60px' />
-                </div> */}
-                <textarea
-                    value={content}
-                    onChange={(e) => setContent(e.target.value)}
-                    className="grow p-3 h-24 rounded-xl"
-                    placeholder={`What do you think about this planet candidate, ${profile}?`}
-                />
-                <div className="text-center">
-                    <button onClick={createPost} className="text-black px-2 py-1 rounded-md">Share</button>
-                </div>
-            </div>
-        </>
-    )
-}
\ No newline at end of file
+    );
+};
\ No newline at end of file
diff --git a/components/Content/Classify/ClassificationFeed.tsx b/components/Content/Classify/ClassificationFeed.tsx
new file mode 100644
index 00000000..1623aa7d
--- /dev/null
+++ b/components/Content/Classify/ClassificationFeed.tsx
@@ -0,0 +1,70 @@
+import React, { useEffect, useState } from "react";
+import { useSession, useSupabaseClient, SupabaseClient } from "@supabase/auth-helpers-react";
+import CardForum from "../../_Core/ui/Content/DiscussCard";
+
+export function ClassificationFeedForIndividualPlanet(planetId, backgroundColorSet) {
+  const supabase: SupabaseClient = useSupabaseClient();
+  const session = useSession();
+
+  const [posts, setPosts] = useState([]);
+  // const [profile, setProfile] = useState(null);
+  const [planetPosts, setPlanetPosts] = useState([]);
+
+  useEffect(() => {
+      fetchPosts();
+    }, []);  
+
+  async function fetchPosts() {
+    try {
+      const postsResponse = await supabase
+        .from("classifications")
+        // .select("id, content, created_at, author, anomaly, basePlanets, profiles(id, avatar_url, full_name, username)")
+        .select("id, created_at, content, anomaly, media, profiles(id, avatar_url, full_name, username)")
+        .eq('anomaly', planetId.planetId.id)
+        .order('created_at', { ascending: false });
+  
+      if (postsResponse.error || !postsResponse.data) {
+        console.error("Error fetching posts:", postsResponse.error);
+        return;
+      }
+  
+      const postIds = postsResponse.data.map((post) => post.id);
+  
+      const commentsResponse = await supabase
+        .from("comments")
+        .select("id, content, created_at, profiles(id, avatar_url, username), post_id")
+        .in("post_id", postIds)
+        .order("created_at", { ascending: true });
+  
+      const commentsByPostId = commentsResponse.data.reduce((acc, comment) => {
+        const postId = comment.post_id;
+        if (!acc[postId]) {
+          acc[postId] = [];
+        }
+        acc[postId].push(comment);
+        return acc;
+      }, {});
+  
+      const postsWithComments = postsResponse.data.map((post) => ({
+        ...post,
+        comments: commentsByPostId[post.id] || [],
+      }));
+  
+      setPosts(postsWithComments);
+      // console.log(posts);
+    } catch (error) {
+      console.error("Error fetching posts:", error.message);
+    }
+  }  
+
+  return (
+      <div className="flex flex-col items-center gap-4 py-5" style={{ maxWidth: '100%', margin: 'auto' }}>
+          {posts.map((post) => (
+              <>
+                <CardForum key={post.id} {...post} backgroundColor={backgroundColorSet} />
+                <p>{post.planetId}</p>
+              </>
+          ))}
+      </div>
+  );
+};
\ No newline at end of file
diff --git a/components/Content/Classify/CreatePostForm.tsx b/components/Content/Classify/CreatePostForm.tsx
new file mode 100644
index 00000000..851ca2b8
--- /dev/null
+++ b/components/Content/Classify/CreatePostForm.tsx
@@ -0,0 +1,87 @@
+import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
+import { Button } from "../../_Core/ui/Button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../../_Core/ui/Card";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "../../_Core/ui/Form";
+import { Textarea } from "../../_Core/ui/TextArea";
+import { useToast } from "../../_Core/ui/use-toast";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { VenetianMask } from "lucide-react";
+import React, { useContext, useEffect, useState} from "react";
+import { useForm } from "react-hook-form";
+import { UserContext } from "../../../context/UserContext";
+import { useRouter } from "next/router";
+import { Avatar, AvatarFallback } from "../../_Core/ui/Avatar";
+import { AvatarImage } from "@radix-ui/react-avatar";
+
+// -----------
+import PostFormCardAnomalyTag from "./AnomalyPostFormCard"; // This is important -> this file is for post creation not specifically for (referencing components on top of anomalies instead) classifications. Anomaly is for posts as classifications
+import { ClimbingBoxLoader } from "react-spinners";
+// -----------
+
+type TProps = {
+    category_id: "1" | "2",
+    openCreateMenu: boolean;
+    setOpenCreateMenu: (value: React.SetStateAction<boolean>) => void;
+    setCreatedPost: (value: React.SetStateAction<boolean>) => void;
+};
+
+// Look into methods to engage resource gathering with the lightcurves, make it a scrollable feed with planet content, show how the curves lead into the rover. 
+
+export function RoverContentPostForm( { metadata, imageLink, sector } ) {
+    const supabase = useSupabaseClient();
+    const session = useSession();
+
+    const [postContent, setPostContent] = useState('');
+    const [media, setMedia] = useState([]);
+
+    function createRoverClassification() {
+        supabase
+            .from('contentROVERIMAGES')
+            .insert({
+                author: session?.user?.id,
+                metadata: metadata,
+                imageLink: imageLink,
+                content: postContent,
+                media: media,
+                sector: sector,
+            },);
+    };
+
+    const handlePostSubmit = async () => {
+        if (postContent) {
+            const user = session?.user?.id;
+            if (user) {
+                const response = await supabase.from('contentROVERIMAGES').upsert([
+                    {
+                        author: user,
+                        metadata: metadata,
+                        imageLink: imageLink,
+                        // planet: '1', // Change this when upserting in planets/[id].tsx
+                        // basePlanet: '1',
+                        content: postContent,
+                        media: null, // See slack comms
+                        sector: sector,
+                    },
+                ]);
+
+                if (response.error) {
+                    console.error(response.error);
+                } else {
+                    setPostContent('');
+                }
+            }
+        };
+    }
+
+    return (
+        <div className="flex gap-2">
+            {/* <Avatar>
+                <AvatarFallback>{session?.user?.id}</AvatarFallback>
+            </Avatar> */}
+            <textarea value={postContent} onChange={e => setPostContent(e.target.value)} className="grow p-3 h-24 rounded-xl" placeholder={"What do you think about this image"} />
+            <div className="text-center">
+                <button onClick={handlePostSubmit} className="text-black px-2 py-1 rounded-md">Share</button>
+            </div>
+        </div>
+    );
+};
\ No newline at end of file
diff --git a/components/Content/CreatePostForm.tsx b/components/Content/CreatePostForm.tsx
deleted file mode 100644
index 824808bb..00000000
--- a/components/Content/CreatePostForm.tsx
+++ /dev/null
@@ -1,287 +0,0 @@
-import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-import { Button } from "../ui/Button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/Card";
-import { Form, FormControl, FormField, FormItem, FormMessage } from "../ui/Form";
-import { Textarea } from "../ui/TextArea";
-import { useToast } from "../ui/use-toast";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { VenetianMask } from "lucide-react";
-import React, { useContext, useEffect, useState} from "react";
-import { useForm } from "react-hook-form";
-import { UserContext } from "../../context/UserContext";
-import { useRouter } from "next/router";
-import { Avatar, AvatarFallback } from "../ui/Avatar";
-import { AvatarImage } from "@radix-ui/react-avatar";
-
-// -----------
-import PostFormCardAnomalyTag from "./Classify/AnomalyPostFormCard"; // This is important -> this file is for post creation not specifically for (referencing components on top of anomalies instead) classifications. Anomaly is for posts as classifications
-import { ClimbingBoxLoader } from "react-spinners";
-// -----------
-
-type TProps = {
-    category_id: "1" | "2",
-    openCreateMenu: boolean;
-    setOpenCreateMenu: (value: React.SetStateAction<boolean>) => void;
-    setCreatedPost: (value: React.SetStateAction<boolean>) => void;
-};
-
-export default function CreatePostForm ( { planetId2 } ) { // category_id
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [postContent, setPostContent] = useState('')
-    const profile = useContext(UserContext);
-    const [username, setUsername] = useState('');
-
-    const [uploads, SetUploads] = useState('');
-    const [isUploading, setIsUploading] = useState(false);
-    const [avatar_url, setAvatarUrl] = useState(null);
-    const [userExperience, setUserExperience] = useState();
-    // const [hasRequiredItem, setHasRequiredItem] = useState(false);
-
-    function createPost() {
-        supabase
-            .from('posts_duplicates')
-            .insert({
-                author: session?.user?.id,
-                content: postContent,
-                media: uploads,
-                planets2: planetId2,
-            }).then(async response => {
-                if (!response.error) {
-                    await supabase.from('inventoryPLANETS').insert([
-                        {
-                            planet_id: planetId2,
-                            owner_id: session?.user?.id,
-                        },
-                    ]);
-
-                    setPostContent('');
-                };
-            });
-    };
-
-    useEffect(() => {
-        supabase
-            .from('profiles')
-            .select(`avatar_url, experience, username`)
-            .eq('id', session?.user?.id)
-            .then(result => {
-                setAvatarUrl(result?.data[0]?.avatar_url);
-                setUsername(result?.data[0]?.username);
-            });
-    }, [session]);
-
-    // async function addMedia ( e ) {
-    //     const files = e.target.files;
-    //     if (files.length > 0) {
-    //       setIsUploading(true);
-    //       for (const file of files) { // To-Do: List of user's photos from the image gallery in wb3-10
-    //         const fileName = Date.now() + session?.user?.id + file.name; // Generate a random string to make the file unique
-    //         const result = await supabase.storage
-    //           .from('media') // Upload the file/media
-    //           .upload(fileName, file);
-    
-    //         if (result.data) {
-    //           const url = process.env.NEXT_PUBLIC_SUPABASE_URL + '/storage/v1/object/public/media/' + result.data.path;
-    //           SetUploads(prevUploads => [...prevUploads, url]); // Add the most recently uploaded image to an array of images that are in state
-    //         } else {
-    //           console.log(result);
-    //         }
-    //       }
-    //       setIsUploading(false);
-    //     }
-    // }
-
-    const form = useForm({
-        defaultValues: {
-            content: "",
-        },
-    });
-
-    return (
-        <>
-        <div className="flex gap-2">
-                        <Avatar>
-                            {/* <AvatarImage src={"https://qwbufbmxkjfaikoloudl.supabase.co/storage/v1/object/public/avatars/" + avatar_url ?? ""}> */}
-                                <AvatarFallback>{username}</AvatarFallback>
-                            {/* </AvatarImage> */}
-                        </Avatar>
-                    </div>
-                    {/* <CardContent className="p-0 pt-2">
-                        <Form {...form}>
-                            
-                        </Form>
-                    </CardContent> */}
-                    <textarea value={postContent} onChange={e => setPostContent(e.target.value)} className="grow p-3 h-24 rounded-xl" placeholder={"What do you think about this candidate"} />
-                    {/* {uploads.length > 0 && (
-                        <div className="flex gap-2 mt-4">
-                            {uploads.map(upload => (
-                                <div className=""><img src={upload} className="w-auto h-48 rounded-md" />
-                            ))}
-                        </div>
-                    )} */}
-            {/* <div className={`fixed inset-0 bg-white/80 backdrop-blur-md z-20 items-center justify-center`}> */}
-                {/* <Card> */}
-                {/* </Card> */}
-            {/* </div> */}
-        </>
-    )
-}
-
-// Look into methods to engage resource gathering with the lightcurves, make it a scrollable feed with planet content, show how the curves lead into the rover. 
-
-export function RoverContentPostForm( { metadata, imageLink, sector } ) {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [postContent, setPostContent] = useState('');
-    const [media, setMedia] = useState([]);
-
-    function createRoverClassification() {
-        supabase
-            .from('contentROVERIMAGES')
-            .insert({
-                author: session?.user?.id,
-                metadata: metadata,
-                imageLink: imageLink,
-                content: postContent,
-                media: media,
-                sector: sector,
-            },);
-    };
-
-    const handlePostSubmit = async () => {
-        if (postContent) {
-            const user = session?.user?.id;
-            if (user) {
-                const response = await supabase.from('contentROVERIMAGES').upsert([
-                    {
-                        author: user,
-                        metadata: metadata,
-                        imageLink: imageLink,
-                        // planet: '1', // Change this when upserting in planets/[id].tsx
-                        // basePlanet: '1',
-                        content: postContent,
-                        media: null, // See slack comms
-                        sector: sector,
-                    },
-                ]);
-
-                if (response.error) {
-                    console.error(response.error);
-                } else {
-                    setPostContent('');
-                }
-            }
-        };
-    }
-
-    return (
-        <div className="flex gap-2">
-            {/* <Avatar>
-                <AvatarFallback>{session?.user?.id}</AvatarFallback>
-            </Avatar> */}
-            <textarea value={postContent} onChange={e => setPostContent(e.target.value)} className="grow p-3 h-24 rounded-xl" placeholder={"What do you think about this image"} />
-            <div className="text-center">
-                <button onClick={handlePostSubmit} className="text-black px-2 py-1 rounded-md">Share</button>
-            </div>
-        </div>
-    );
-};
-
-export function FactionPostForm( { factionId, planetId } ) {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [postContent, setPostContent] = useState('');
-    const [media, setMedia] = useState([]);
-    const [uploads, setUploads] = useState([]);
-    const [isUploading, setIsUploading] = useState(false);
-
-    function createFactionPost() {
-        supabase
-            .from('posts_duplicates')
-            .insert({
-                author: session?.user?.id,
-                content: postContent,
-                media: media,
-                anomaly: planetId,
-                faction: factionId,
-            },
-        );
-    };
-
-    async function addMedia(e) {
-        const files = e.target.files;
-        if (files.length > 0) {
-            setIsUploading(true);
-            const newUploads = [];
-            for (const file of files) {
-                const fileName = Date.now() + session?.user?.id + file.name;
-                const result = await supabase.storage.from('media').upload(fileName, file);
-    
-                if (result.data) {
-                    const url = process.env.NEXT_PUBLIC_SUPABASE_URL + '/storage/v1/object/public/media/' + result.data.path;
-                    newUploads.push(url);
-                } else {
-                    console.log(result);
-                }
-            }
-    
-            setUploads(prevUploads => [...prevUploads, ...newUploads]);
-            setMedia(prevMedia => [...prevMedia, ...newUploads]);
-    
-            setIsUploading(false);
-        };
-    };    
-
-    const handlePostSubmit = async () => {
-        if (postContent && session) {
-            const user = session?.user?.id;
-            if (user) {
-                const response = await supabase.from('posts_duplicates').upsert([
-                    {
-                        author: user,
-                        content: postContent,
-                        media: media,
-                        anomaly: planetId,
-                        faction: factionId,
-                    },
-                ]);
-
-                if (response.error) {
-                    console.error(response.error);
-                } else {
-                    setPostContent('');
-                };
-            };
-        };
-    };
-
-    return (
-        <div className="flex gap-2">
-        <textarea value={postContent} onChange={e => setPostContent(e.target.value)} className="grow p-3 h-24 rounded-xl" placeholder={"What do you think about this image"} />
-        {isUploading && (
-                <div><ClimbingBoxLoader /></div>
-            )}
-                {isUploading && (
-                    <div className="flex gap-2 mt-4">
-                        {uploads.map((upload, index) => (
-                            <div key={index} className=""><img src={upload} className="w-auto h-48 rounded-md" /></div>
-                        ))}
-                    </div>
-                )}
-                <label className="flex gap-1">
-                        <input type="file" className="hidden" onChange={addMedia} />
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-                                <path strokeLinecap="round" strokeLinejoin="round" d="M18.375 12.739l-7.693 7.693a4.5 4.5 0 01-6.364-6.364l10.94-10.94A3 3 0 1119.5 7.372L8.552 18.32m.009-.01l-.01.01m5.699-9.941l-7.81 7.81a1.5 1.5 0 002.112 2.13" />
-                            </svg>
-                            <span className="hidden md:block">Media</span>
-                        </label>
-        <div className="text-center">
-            <button onClick={handlePostSubmit} className="text-black px-2 py-1 rounded-md">Share</button>
-        </div>
-    </div>
-    );
-};
\ No newline at end of file
diff --git a/components/Content/Planets/PlanetData/ContentGrid.tsx b/components/Content/Planets/PlanetData/ContentGrid.tsx
deleted file mode 100644
index c56e3dda..00000000
--- a/components/Content/Planets/PlanetData/ContentGrid.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-import PostFormCardAnomalyTag from "../../Classify/AnomalyPostFormCard";
-import { ClassificationFeedForIndividualPlanet } from "../../ClassificationFeed";
-
-export default function IndividualBasePlanetGrid(planetId) {
-  return (
-        <div className="grid grid-cols-2 gap-4">
-            <div><PostFormCardAnomalyTag planetId={planetId} onPost={null} /></div>
-            <div><ClassificationFeedForIndividualPlanet planetId={{ id: planetId as string }} /> </div>
-        </div>
-    );
-}; 
\ No newline at end of file
diff --git a/components/Content/Planets/PlanetData/PopulatePlanetData.tsx b/components/Content/Planets/PlanetData/PopulatePlanetData.tsx
index 4c211b3b..784662ca 100644
--- a/components/Content/Planets/PlanetData/PopulatePlanetData.tsx
+++ b/components/Content/Planets/PlanetData/PopulatePlanetData.tsx
@@ -58,7 +58,7 @@ const LightcurveGenerator = ({ planetId }: { planetId: string }) => {
                 const imageURL = process.env.NEXT_PUBLIC_SUPABASE_URL + '/storage/v1/object/public/planetsss/' + result.data.path;
     
                 // Update the 'lightkurve' column in the 'basePlanets' table with the image URL
-                console.log("planetId:", planetId); // Check the value of planetId
+                console.log("planetId:", planetId); // Check the value  of planetId
                 await supabase
                     .from('basePlanets')
                     .update({ lightkurve: imageURL })
diff --git a/components/Content/Planets/PlanetData/RandomRoverImage.tsx b/components/Content/Planets/PlanetData/RandomRoverImage.tsx
index 80a8db9a..f6cabadf 100644
--- a/components/Content/Planets/PlanetData/RandomRoverImage.tsx
+++ b/components/Content/Planets/PlanetData/RandomRoverImage.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from "react";
 import axios from "axios";
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-import Card from "../../../Card";
-import { RoverContentPostForm } from "../../CreatePostForm";
+import Card from "../../../_Core/ui/Content/Card";
+import { RoverContentPostForm } from "../../Classify/CreatePostForm";
 
 interface RoverImageCardProps {
     roverImage: {
@@ -13,20 +13,6 @@ interface RoverImageCardProps {
     };
 };
 
-function RoverImageCard({ roverImage }: RoverImageCardProps) {
-    const { id, content, image, planets2 } = roverImage;
-
-    return (
-        <div className="col-md-4 mb-4">
-            <Card noPadding={false}>
-                <div style={{ width: "100%", height: "200px", overflow: "hidden" }}>
-                    <img src={image} alt="Rover image" className="w-100 h-auto" />
-                </div>
-            </Card>
-        </div>
-    );
-};
-
 export const RoverImage = ({ date, rover, onImageMetadataChange }) => {
     const [imageUrl, setImageUrl] = useState('');
     const apiKey = 'iT0FQTZKpvadCGPzerqXdO5F4b62arNBOP0dtkXE';
@@ -150,33 +136,4 @@ export default function RoverImageGallery() {
             </div>
         </Card>
     );
-};
-
-/*
-
-const handlePostSubmit = async () => {
-        if (content) {
-            const user = session?.user?.id;
-            if (user) {
-                const response = await supabase.from('contentROVERIMAGES').upsert([
-                    {
-                        author: user,
-                        metadata: metadata,
-                        imageLink: RoverImage,
-                        // planet: '1', // Change this when upserting in planets/[id].tsx
-                        // basePlanet: '1',
-                        content: content,
-                        media: null, // See slack comms
-                    },
-                ]);
-
-                if (response.error) {
-                    console.error(response.error);
-                } else {
-                    setContent('');
-                }
-            }
-        };
-    }
-
-*/
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/components/Content/Planets/Sectors/StructureCreate.tsx b/components/Content/Populate/StructureCreate.tsx
similarity index 100%
rename from components/Content/Planets/Sectors/StructureCreate.tsx
rename to components/Content/Populate/StructureCreate.tsx
diff --git a/components/Content/RoverData/RandomImage.tsx b/components/Content/RoverData/RandomImage.tsx
deleted file mode 100644
index e31cedb5..00000000
--- a/components/Content/RoverData/RandomImage.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React, { useState, useEffect } from "react";
-import axios from 'axios';
-import { useSupabaseClient, useSession } from "@supabase/auth-helpers-react";
-import { Form } from "react-hook-form";
-
-const RoverImage = ({ date, rover }) => {
-    const [imageUrl, setImageUrl] = useState('');
-    const apiKey = "iT0FQTZKpvadCGPzerqXdO5F4b62arNBOP0dtkXE"
-
-    useEffect(() => {
-        const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/${rover}/photos?sol=${date}&api_key=${apiKey}`;
-        axios.get(apiUrl)
-            .then((response) => {
-                if (response.data.photos && response.data.photos.length > 0) {
-                    const firstImage = response.data.photos[0].img_src;
-                    setImageUrl(firstImage);
-                } else {
-                    setImageUrl("No images found for the given date and rover");
-                }
-            })
-            .catch((error) => {
-                setImageUrl('');
-                console.error(error);
-            });
-    }, [date, rover]);
-
-    return (
-        <div>
-            <h2>Mars Rover Photo</h2>
-            <p>Date: {date}</p>
-            <p>Rover: {rover}</p>
-            <img src={imageUrl} alt="Mars Rover" />
-        </div>
-    );
-};
-
-const RoverImagePage = () => {
-    const randomDate = Math.floor(Math.random() * 1000);
-    const selectedRover = 'perseverance';
-
-    return (
-        <div>
-            <h1>Mars Rover Image</h1>
-            <RoverImage date={randomDate} rover={selectedRover} />
-        </div>
-    );
-};
-
-export function RoverGallerySingle({ inventoryPlanetId }) {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [roverImage, setRoverImage] = useState(null);
-    const [loading, setLoading] = useState(true);
-    const [metadata, setMetadata] = useState('');
-    const [imageMetadata, setImageMetadata] = useState('');
-    const [content, setContent] = useState('');
-
-    const fetchImage = async () => {
-        const randomDate = Math.floor(Math.random() * 1000) + 1;
-        const selectedRover = 'perseverance'; // You can change this to 'curiosity' or 'opportunity' as needed
-        const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/${selectedRover}/photos?sol=${randomDate}&api_key=iT0FQTZKpvadCGPzerqXdO5F4b62arNBOP0dtkXE`;
-    
-        try {
-            const response = await axios.get(apiUrl);
-            if (response.data.photos && response.data.photos.length > 0) {
-                const firstImage = response.data.photos[0].img_src;
-                setRoverImage(firstImage);
-
-                // Set metadata from the fetched image
-                const metadataText = JSON.stringify(response.data.photos[0], null, 2);
-                setImageMetadata(metadataText);
-                setMetadata('Metadata for the current image:');
-            } else {
-                setRoverImage('No images found for the given date and rover.');
-                setMetadata('No image available.');
-                setImageMetadata('');
-            } 
-        } catch (error) {
-            console.error(error);
-            setRoverImage('An error occurred while fetching the image.');
-            setMetadata('Error fetching the image.');
-            setImageMetadata('');
-        }
-    
-    setLoading(false); // Set loading to false when the image is loaded
-    };
-
-    const generateNewImage = () => {
-        setLoading(true); 
-        fetchImage();
-    };
-    
-    useEffect(() => {
-        fetchImage();
-    }, []);
-
-    const handlePostSubmit = async () => {
-        if (content) {
-          const user = session?.user?.id;
-          if (user) {
-            const response = await supabase.from('contentROVERIMAGES').upsert([
-              {
-                author: user,
-                metadata: imageMetadata,
-                imageLink: roverImage,
-                planet: inventoryPlanetId,
-                content,
-                media: null,
-              },
-            ]);
-    
-            if (response.error) {
-              console.error(response.error);
-            } else {
-              setContent('');
-            }
-          }
-        }
-    };
-
-    return (
-        <RoverImageCard roverImage={{ id: '1', content: '', image: roverImage, planets2: '' }} /> // Form components to be placed in
-    )
-}
-
-interface Props {
-    roverImage: {
-        id: string;
-        content: string;
-        image: string;
-        planets2: string;
-    };
-};
-
-export function RoverImageCard({ roverImage }: Props) {
-    const { id, content, image, planets2 } = roverImage;
-    return (
-        <div className="col-md-4 mb-4">
-            <div style={{ width: '100%', height: "200px", overflow: "hidden" }}>
-                <img
-                    src={image}
-                    alt="Rover Image"
-                    className="w-100 h-auto"
-                />                    
-            </div>
-        </div>
-    )
-}
\ No newline at end of file
diff --git a/components/Content/Planets/Base/BasePlanetAllSectors.tsx b/components/Content/[id]/BasePlanetAllSectors.tsx
similarity index 98%
rename from components/Content/Planets/Base/BasePlanetAllSectors.tsx
rename to components/Content/[id]/BasePlanetAllSectors.tsx
index 6e5d203b..73572fa5 100644
--- a/components/Content/Planets/Base/BasePlanetAllSectors.tsx
+++ b/components/Content/[id]/BasePlanetAllSectors.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { useRouter } from "next/router";
 import { useSupabaseClient, useSession } from "@supabase/auth-helpers-react";
-import Card from "../../../Card";
+import Card from "../../_Core/ui/Content/Card";
 
 export default function BasePlanetSectors({ planetId }: { planetId: string }) {
     const router = useRouter();
diff --git a/components/Content/Planets/Base/BasePlanetSector.tsx b/components/Content/[id]/BasePlanetSector.tsx
similarity index 94%
rename from components/Content/Planets/Base/BasePlanetSector.tsx
rename to components/Content/[id]/BasePlanetSector.tsx
index 384b1e23..58fa7d37 100644
--- a/components/Content/Planets/Base/BasePlanetSector.tsx
+++ b/components/Content/[id]/BasePlanetSector.tsx
@@ -1,9 +1,9 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import { useRouter } from "next/router";
 import React, { useEffect, useState } from "react";
-import RoverImageGallery, { RoverImage, RoverImageNoHandle } from "../PlanetData/RandomRoverImage";
-import StructureComponent, { PlacedStructures } from "../Sectors/StructureCreate";
-import { SectorStructureOwned } from "../../Inventory/UserOwnedItems";
+import RoverImageGallery, { RoverImage, RoverImageNoHandle } from "../Planets/PlanetData/RandomRoverImage";
+import StructureComponent, { PlacedStructures } from "../Populate/StructureCreate";
+import { SectorStructureOwned } from "../Inventory/UserOwnedItems";
 // import { CreateMenuBar, SectorCircularMenu } from "../../../Core/BottomBar";
 
 const AddResourceToInventory = ({ resource, sectorId }) => {
@@ -253,14 +253,6 @@ export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
           <SectorStructureOwned sectorid={sectorid} />
           <RoverImageNoHandle date='853' rover='opportunity' sectorNo={id} />
           <StructureComponent sectorId={sectorid} />
-          {/* {imageUrl ? (
-            <>
-                <img src={imageUrl} alt="Rover image" />
-                <RoverContentPostForm metadata={metadata} imageLink={imageUrl} sector={id} />
-            </>
-          ) : (
-            <p>Loading...</p>
-          )} */}
       </div>
     </>
   );
diff --git a/components/Content/Planets/Base/IndividualBasePlanet.tsx b/components/Content/[id]/IndividualBasePlanet.tsx
similarity index 98%
rename from components/Content/Planets/Base/IndividualBasePlanet.tsx
rename to components/Content/[id]/IndividualBasePlanet.tsx
index bb4c15e7..78852b63 100644
--- a/components/Content/Planets/Base/IndividualBasePlanet.tsx
+++ b/components/Content/[id]/IndividualBasePlanet.tsx
@@ -1,9 +1,8 @@
 import React, { useState, useEffect } from "react";
 import { useRouter } from "next/router";
 import { useSupabaseClient, useSession } from "@supabase/auth-helpers-react";
-import ContentPlaceholder, { ActivateButton } from "../PlanetData/ContentPlaceholder";
 import Link from "next/link";
-import { LightkurveBaseGraph } from "../PlanetData/ContentPlaceholder";
+import { LightkurveBaseGraph } from "../Planets/PlanetData/ContentPlaceholder";
 
 export function IndividualBasePlanetDesktop({ id }: { id: string }) { 
   const router = useRouter();
diff --git a/components/Core/Section/BottomBar.tsx b/components/Core/Section/BottomBar.tsx
new file mode 100644
index 00000000..c55e4e19
--- /dev/null
+++ b/components/Core/Section/BottomBar.tsx
@@ -0,0 +1,320 @@
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React from "react";
+
+import { BuildingIcon, CarIcon, RocketIcon, CpuIcon, MessageSquareDashedIcon } from "lucide-react";
+import { CircleMenu, CircleMenuItem, TooltipPlacement} from 'react-circular-menu';
+import { useState } from "react";
+
+import { ClassificationFeedForIndividualPlanet } from "../../Content/Classify/ClassificationFeed";
+import ContentPlaceholder from "../../Content/Planets/PlanetData/ContentPlaceholder";
+
+const bottombarLinks = [
+  {
+    imgURL: "/home.svg",
+    route: "/feed",
+    label: "Feed",
+  },
+  {
+    imgURL: "/planet.svg",
+    route: "/garden",
+    label: "Garden",
+  },
+  {
+    imgURL: "/eagle.svg",
+    route: "/explore",
+    label: "Explore",
+  },
+  {
+    imgURL: "/rover.svg",
+    route: "/create-post",
+    label: "Gather",
+  },
+  {
+    imgURL: "/satellite.svg",
+    route: "/create-post",
+    label: "Missions",
+  },
+];
+
+const Bottombar = () => {
+  const { pathname } = useRouter();
+
+  return (
+    <section className="bottom-bar flex justify-between items-center p-4 bg-white fixed bottom-0 left-0 w-full border-t">
+      {bottombarLinks.map((link) => {
+        const isActive = pathname === link.route;
+        return (
+          <Link legacyBehavior key={`bottombar-${link.label}`} href={link.route} passHref>
+            <a className={`${
+              isActive && "rounded-[10px] bg-primary-500 "
+            } flex flex-col items-center justify-center p-2 transition`}>
+              <img
+                src={link.imgURL}
+                alt={link.label}
+                width={24} 
+                height={24}
+                className={`mb-1 ${isActive ? "invert-white" : "text-light-2"}`}
+              />
+              <p className={`tiny-medium ${isActive ? "text-light-3" : "text-light-2"}`}>
+                {link.label}
+              </p>
+            </a>
+          </Link>
+        );
+      })}
+    </section>
+  );
+};
+
+export default Bottombar;
+
+export const CreateBar = ({ onTabClick }) => {
+  return (
+    <div className="fixed z-50 w-full h-16 max-w-lg -translate-x-1/2 bg-white border border-gray-200 rounded-full bottom-4 left-1/2 dark:bg-gray-700 dark:border-gray-600">
+      <div className="grid h-full max-w-lg grid-cols-5 mx-auto">
+        <button
+          data-tooltip-target="tooltip-home"
+          type="button"
+          className="inline-flex flex-col items-center justify-center px-5 rounded-s-full hover:bg-gray-50 dark:hover:bg-gray-800 group"
+          onClick={() => onTabClick('home')}
+        >
+          <svg
+            className="w-5 h-5 mb-1 text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="currentColor"
+            viewBox="0 0 20 20"
+          >
+            <path
+              d="m19.707 9.293-2-2-7-7a1 1 0 0 0-1.414 0l-7 7-2 2a1 1 0 0 0 1.414 1.414L2 10.414V18a2 2 0 0 0 2 2h3a1 1 0 0 0 1-1v-4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v4a1 1 0 0 0 1 1h3a2 2 0 0 0 2-2v-7.586l.293.293a1 1 0 0 0 1.414-1.414Z"
+            />
+          </svg>
+          <span className="sr-only">Home</span>
+        </button>
+        <div
+          id="tooltip-home"
+          role="tooltip"
+          className="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700"
+        >
+          Home
+          <div className="tooltip-arrow" data-popper-arrow></div>
+        </div>
+        <button
+          data-tooltip-target="tooltip-wallet"
+          type="button"
+          className="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group"
+          onClick={() => onTabClick('wallet')}
+        >
+          <svg
+            className="w-5 h-5 mb-1 text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="currentColor"
+            viewBox="0 0 20 20"
+          >
+            <path
+              d="M11.074 4 8.442.408A.95.95 0 0 0 7.014.254L2.926 4h8.148ZM9 13v-1a4 4 0 0 1 4-4h6V6a1 1 0 0 0-1-1H1a1 1 0 0 0-1 1v13a1 1 0 0 0 1 1h17a1 1 0 0 0 1-1v-2h-6a4 4 0 0 1-4-4Z"
+            />
+            <path
+              d="M19 10h-6a2 2 0 0 0-2 2v1a2 2 0 0 0 2 2h6a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1Zm-4.5 3.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2ZM12.62 4h2.78L12.539.41a1.086 1.086 0 1 0-1.7 1.352L12.62 4Z"
+            />
+          </svg>
+          <span className="sr-only">Wallet</span>
+        </button>
+        <div
+          id="tooltip-wallet"
+          role="tooltip"
+          className="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700"
+        >
+          Wallet
+          <div className="tooltip-arrow" data-popper-arrow></div>
+        </div>
+        <div className="flex items-center justify-center">
+          <button
+            data-tooltip-target="tooltip-new"
+            type="button"
+            className="inline-flex items-center justify-center w-10 h-10 font-medium bg-blue-600 rounded-full hover:bg-blue-700 group focus:ring-4 focus:ring-blue-300 focus:outline-none dark:focus:ring-blue-800"
+          >
+            <svg
+              className="w-4 h-4 text-white"
+              aria-hidden="true"
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 18 18"
+            >
+              <path
+                stroke="currentColor"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth="2"
+                d="M9 1v16M1 9h16"
+              />
+            </svg>
+            <span className="sr-only">New item</span>
+          </button>
+        </div>
+        <div
+          id="tooltip-new"
+          role="tooltip"
+          className="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700"
+        >
+          Create new item
+          <div className="tooltip-arrow" data-popper-arrow></div>
+        </div>
+        <button
+          data-tooltip-target="tooltip-settings"
+          type="button"
+          className="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group"
+        >
+          <svg
+            className="w-5 h-5 mb-1 text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 20 20"
+          >
+            <path
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+              d="M4 12.25V1m0 11.25a2.25 2.25 0 0 0 0 4.5m0-4.5a2.25 2.25 0 0 1 0 4.5M4 19v-2.25m6-13.5V1m0 2.25a2.25 2.25 0 0 0 0 4.5m0-4.5a2.25 2.25 0 0 1 0 4.5M10 19V7.75m6 4.5V1m0 11.25a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5ZM16 19v-2"
+            />
+          </svg>
+          <span className="sr-only">Settings</span>
+        </button>
+        <div
+          id="tooltip-settings"
+          role="tooltip"
+          className="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700"
+        >
+          Settings
+          <div className="tooltip-arrow" data-popper-arrow></div>
+        </div>
+        <button
+          data-tooltip-target="tooltip-profile"
+          type="button"
+          className="inline-flex flex-col items-center justify-center px-5 rounded-e-full hover:bg-gray-50 dark:hover:bg-gray-800 group"
+        >
+          <svg
+            className="w-5 h-5 mb-1 text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="currentColor"
+            viewBox="0 0 20 20"
+          >
+            <path
+              d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6ZM0 10a10 10 0 1 1 20 0 10 10 0 0 1-20 0Z"
+            />
+          </svg>
+          <span className="sr-only">Profile</span>
+        </button>
+        <div
+          id="tooltip-profile"
+          role="tooltip"
+          className="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700"
+        >
+          Profile
+          <div className="tooltip-arrow" data-popper-arrow></div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const CreateMenuBar = ({ onUpdatesClick, onSecondButtonClick }) => {
+  return (
+    <ul className="fixed bottom-5 left-1/2 transform -translate-x-1/2 flex justify-center space-x-4 bg-gray-200 rounded-full p-2 shadow-lg">
+      <li className="flex flex-col items-center justify-center">
+        <a onClick={onUpdatesClick} className="flex flex-col items-center justify-center p-1 cursor-pointer">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
+          </svg>
+          <span className="bg-gray-500 text-white text-xs px-1 rounded">99+</span>
+          <span>Inbox</span>
+        </a>
+      </li>
+      <li className="flex flex-col items-center justify-center">
+        <a onClick={onSecondButtonClick} className="flex flex-col items-center justify-center p-1">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+          </svg>
+          <span className="bg-yellow-500 text-white text-xs px-1 rounded">NEW</span>
+          <span>Feed</span>
+        </a>
+      </li>
+      <li className="flex flex-col items-center justify-center">
+        <a onClick={onUpdatesClick} className="flex flex-col items-center justify-center p-1 cursor-pointer">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
+          </svg>
+          <span className="bg-gray-500 text-white text-xs px-1 rounded">99+</span>
+          <span>Inbox</span>
+        </a>
+      </li>
+      <li className="flex flex-col items-center justify-center">
+        <a onClick={onUpdatesClick} className="flex flex-col items-center justify-center p-1 cursor-pointer">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
+          </svg>
+          <span className="bg-gray-500 text-white text-xs px-1 rounded">99+</span>
+          <span>Inbox</span>
+        </a>
+      </li>      
+    </ul>
+  );
+};
+
+export const SectorCircularMenu = (props) => {
+  const [activeComponent, setActiveComponent] = useState(null);
+
+  const handleItemClick = (itemName) => {
+    // Set the active component based on the clicked item
+    switch (itemName) {
+      case 'Email':
+        setActiveComponent('ClassificationFeedForIndividualPlanet');
+        break;
+      case 'Help':
+        setActiveComponent('ContentPlaceholder');
+        break;
+      case 'Location':
+        // Set active component for other items if needed
+        break;
+      case 'Info':
+        // Set active component for other items if needed
+        break;
+      default:
+        setActiveComponent(null);
+    }
+  };
+
+  return (<>
+    <CircleMenu
+      startAngle={-90}
+      rotationAngle={360}
+      itemSize={2}
+      radius={5}
+      rotationAngleInclusive={false}
+    >
+      <CircleMenuItem
+        onClick={() => alert("Clicked the item")}
+        tooltip="Email"
+        tooltipPlacement={TooltipPlacement.Right}
+      >
+        <BuildingIcon />
+      </CircleMenuItem>
+      <CircleMenuItem tooltip="Help">
+        <MessageSquareDashedIcon />
+      </CircleMenuItem>
+      <CircleMenuItem tooltip="Location">
+        <CarIcon />
+      </CircleMenuItem>
+      <CircleMenuItem tooltip="Info">
+        <RocketIcon />
+      </CircleMenuItem>
+    </CircleMenu>
+
+    {activeComponent === 'ContentPlaceholder' && <ContentPlaceholder />}</>
+  );;
+};
\ No newline at end of file
diff --git a/components/Core/assets/MusicPlayer.tsx b/components/Core/assets/MusicPlayer.tsx
deleted file mode 100644
index 00e0ef66..00000000
--- a/components/Core/assets/MusicPlayer.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, { useRef } from 'react';
-import { faPlay, faPause, faStepForward, faStepBackward } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-const MusicPlayer: React.FC = () => {
-  const audioRef = useRef<HTMLAudioElement | null>(null);
-  
-  return (
-    <div className="fixed bottom-0 w-full bg-white block md:block z-50 transform scale-95 md:scale-100"> {/* Show on all screens, scale down on mobile */}
-      <div className="h-[10%] flex items-center justify-center p-4"> {/* Center content */}
-      <div className="flex items-center pl-4">
-          </div>
-      </div>
-      <audio ref={audioRef} src="/assets/audio/WakeUp.mp3" />
-    </div>
-  );
-};
-
-export default MusicPlayer;
\ No newline at end of file
diff --git a/components/Gameplay/Explore/RandomImage.tsx b/components/Gameplay/Explore/RandomImage.tsx
new file mode 100644
index 00000000..318399c2
--- /dev/null
+++ b/components/Gameplay/Explore/RandomImage.tsx
@@ -0,0 +1,59 @@
+import React, { useState, useEffect } from "react";
+import axios from 'axios';
+import { useSupabaseClient, useSession } from "@supabase/auth-helpers-react";
+import { Form } from "react-hook-form";
+
+const RoverImage = ({ date, rover }) => {
+    const [imageUrl, setImageUrl] = useState('');
+    const apiKey = "iT0FQTZKpvadCGPzerqXdO5F4b62arNBOP0dtkXE"
+
+    useEffect(() => {
+        const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/${rover}/photos?sol=${date}&api_key=${apiKey}`;
+        axios.get(apiUrl)
+            .then((response) => {
+                if (response.data.photos && response.data.photos.length > 0) {
+                    const firstImage = response.data.photos[0].img_src;
+                    setImageUrl(firstImage);
+                } else {
+                    setImageUrl("No images found for the given date and rover");
+                }
+            })
+            .catch((error) => {
+                setImageUrl('');
+                console.error(error);
+            });
+    }, [date, rover]);
+
+    return (
+        <div>
+            <h2>Mars Rover Photo</h2>
+            <p>Date: {date}</p>
+            <p>Rover: {rover}</p>
+            <img src={imageUrl} alt="Mars Rover" />
+        </div>
+    );
+};
+
+interface Props {
+    roverImage: {
+        id: string;
+        content: string;
+        image: string;
+        planets2: string;
+    };
+};
+
+export function RoverImageCard({ roverImage }: Props) {
+    const { id, content, image, planets2 } = roverImage;
+    return (
+        <div className="col-md-4 mb-4">
+            <div style={{ width: '100%', height: "200px", overflow: "hidden" }}>
+                <img
+                    src={image}
+                    alt="Rover Image"
+                    className="w-100 h-auto"
+                />                    
+            </div>
+        </div>
+    );
+};
\ No newline at end of file
diff --git a/components/Content/RoverData/RoverExplore.tsx b/components/Gameplay/Explore/RoverExplore.tsx
similarity index 98%
rename from components/Content/RoverData/RoverExplore.tsx
rename to components/Gameplay/Explore/RoverExplore.tsx
index 71b39b87..93481217 100644
--- a/components/Content/RoverData/RoverExplore.tsx
+++ b/components/Gameplay/Explore/RoverExplore.tsx
@@ -3,11 +3,11 @@ import { useRouter } from "next/router";
 import React, { useEffect, useState } from "react";
 
 // UI elements
-import { Button } from "../../ui/Button";
-import { Checkbox } from "../../ui/checkbox";
+import { Button } from "../../_Core/ui/Button";
+import { Checkbox } from "../../_Core/ui/checkbox";
 // import { ResponsiveLine } from "@nivo/line";
-import { Input } from "../../ui/input";
-import { Textarea } from "../../ui/TextArea";
+import { Input } from "../../_Core/ui/input";
+import { Textarea } from "../../_Core/ui/TextArea";
 
 export default function RoverExploreDesktop({ id }: { id: string }) {
     const supabase = useSupabaseClient();
diff --git a/components/Gameplay/FactionHomebase.tsx b/components/Gameplay/FactionHomebase.tsx
deleted file mode 100644
index 767e437c..00000000
--- a/components/Gameplay/FactionHomebase.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Card from "../Card";
-import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-import { FactionPostForm } from "../Content/CreatePostForm";
-import { FactionFeed } from "../Content/ClassificationFeed";
-
-export default function HomebaseSelector({ factionId }) {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    const [planetData, setPlanetData] = useState(null);
-
-    // Function to pull in planet data. Match the planet to the factionId
-    const getPlanetData = async () => {
-        if (!session) {
-            return null;
-        }
-
-        try {
-            const { data, error } = await supabase
-                .from("basePlanets")
-                .select("*")
-                .eq('Faction', factionId)
-                .single();
-
-            if (data) {
-                setPlanetData(data);
-            }
-
-            if (error) {
-                throw error;
-            }
-        } catch (error) {
-            console.error(error.message);
-        }
-    };
-
-    useEffect(() => {
-        const fetchData = async () => {
-            if (session && factionId) {
-                await getPlanetData();
-            }
-        };
-
-        fetchData();
-    }, [session, factionId]);
-
-    const { id, content, coverUrl } = planetData || {};
-
-    return (
-        <>
-            <Card noPadding={false}>
-                <div
-                    className="flex-col justify-center mt-[-80px] bg-cover bg-center rounded-15"
-                    style={{
-                        // backgroundImage: `url(${coverUrl})`,
-                        backgroundImage: `url('https://images.unsplash.com/photo-1446776811953-b23d57bd21aa?q=80&w=2372&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D')`
-                    }}
-                >
-                    <div className="h-[80vh] flex flex-col items-center justify-center relative">
-                        <h1 className="text-center text-slate-300 text-opacity-100 font-['Inter'] tracking-[3.48px] mt-[-50px] mb-4 text-4xl font-extrabold leading-none tracking-tight text-red-900 md:text-5xl lg:text-6xl text-red-400">
-                            {content} | Miners Faction {/* Change name dynamically, later based from table/db */}
-                        </h1>
-                    </div>
-                </div>
-            </Card>
-            <div className="h-grow px-10">
-                <FactionPostForm factionId={factionId} planetId={id} />
-                <FactionFeed factionId={factionId} />
-            </div>
-        </>
-    );
-};
\ No newline at end of file
diff --git a/components/Content/Planets/Sectors/SectorStructures.tsx b/components/Gameplay/Sandbox/SectorStructures.tsx
similarity index 100%
rename from components/Content/Planets/Sectors/SectorStructures.tsx
rename to components/Gameplay/Sandbox/SectorStructures.tsx
diff --git a/components/Content/Planets/Base/SelectYourPlanet.tsx b/components/Gameplay/SelectYourPlanet.tsx
similarity index 100%
rename from components/Content/Planets/Base/SelectYourPlanet.tsx
rename to components/Gameplay/SelectYourPlanet.tsx
diff --git a/components/Content/Inventory/Vehicles/MySpaceships.tsx b/components/Gameplay/Vehicles/MySpaceships.tsx
similarity index 100%
rename from components/Content/Inventory/Vehicles/MySpaceships.tsx
rename to components/Gameplay/Vehicles/MySpaceships.tsx
diff --git a/components/Modals/UponSignup.tsx b/components/Modals/UponSignup.tsx
index 23390791..b99fb423 100644
--- a/components/Modals/UponSignup.tsx
+++ b/components/Modals/UponSignup.tsx
@@ -3,7 +3,7 @@
  * @see https://v0.dev/t/bOg9oEOPYfV
  * Documentation: https://v0.dev/docs#integrating-generated-code-into-your-nextjs-app
  */
-import { Button } from "../ui/Button"
+import { Button } from "../_Core/ui/Button"
 
 export default function UponSignupModal() {
   return (
diff --git a/components/Modals/rover-interface.tsx b/components/Modals/rover-interface.tsx
index fe445fae..fe84db83 100644
--- a/components/Modals/rover-interface.tsx
+++ b/components/Modals/rover-interface.tsx
@@ -1,9 +1,9 @@
-import { Button } from "../ui/Button";
-import { Checkbox } from "../ui/checkbox";
+import { Button } from "../_Core/ui/Button";
+import { Checkbox } from "../_Core/ui/checkbox";
 // import { ResponsiveLine } from "@nivo/line";
-import { Input } from "../ui/input";
+import { Input } from "../_Core/ui/input";
 
-import { Textarea } from "../ui/TextArea";
+import { Textarea } from "../_Core/ui/TextArea";
 
 export function RoverInterface() {
   return (
diff --git a/components/Modals/rover-mobile-test.tsx b/components/Modals/rover-mobile-test.tsx
index 88dd4e70..d03450ac 100644
--- a/components/Modals/rover-mobile-test.tsx
+++ b/components/Modals/rover-mobile-test.tsx
@@ -1,5 +1,5 @@
-import { Button } from "../ui/Button";
-import { Checkbox } from "../ui/checkbox";
+import { Button } from "../_Core/ui/Button";
+import { Checkbox } from "../_Core/ui/checkbox";
 import { Line } from "react-chartjs-2";
 
 export function RoverMobileTest() {
diff --git a/components/NavigationCard.tsx b/components/NavigationCard.tsx
deleted file mode 100644
index 081995e3..00000000
--- a/components/NavigationCard.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import Card from "./Card";
-import { useRouter } from "next/router";
-import Link from "next/link";
-import styles from '../styles/social-graph/Home.module.css';
-import React from "react";
-import { useSupabaseClient } from "@supabase/auth-helpers-react";
-
-export default function NavigationCard(){
-  const router = useRouter();
-  const { asPath:pathname } = router;
-  const activeElementClasses = 'text-sm md:text-md flex gap-1 md:gap-3 py-3 my-1 bg-socialBlue text-white md:-mx-7 px-6 md:px-7 rounded-md shadow-md shadow-gray-300 items-center';
-  const nonActiveElementClasses= 'text-sm md:text-md flex gap-1 md:gap-3 py-2 my-2 hover:bg-blue-500 hover:bg-opacity-20 md:-mx-4 px-6 md:px-4 rounded-md transition-all hover:scale-110 hover:shadow-md shadow-gray-300 items-center';
-
-  const supabase = useSupabaseClient();
-  async function logout() { await supabase.auth.signOut(); }
-
-  return (
-    <Card noPadding={true}>
-      <div className="px-4 py-2 flex justify-between md:block shadow-md shadow-gray-500 md:shadow-none">
-        <h2 className="text-gray-400 mb-3 hidden md:block">Navigation</h2>
-        <Link legacyBehavior href ="/" className={pathname === '/' ? activeElementClasses : nonActiveElementClasses}>
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-            <path strokeLinecap="round" strokeLinejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
-          </svg>
-          <span className="hidden md:block">Home</span>
-        </Link>
-        <Link legacyBehavior href ="/posts/user/cebdc7a2-d8af-45b3-b37f-80f328ff54d6" className={pathname === '/profile/friends' ? activeElementClasses : nonActiveElementClasses}>
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-            <path strokeLinecap="round" strokeLinejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" />
-          </svg>
-          <span className="hidden md:block">Friends</span>
-        </Link>
-        <Link legacyBehavior href ="/posts/saved" className={pathname === '/saved' ? activeElementClasses : nonActiveElementClasses}>
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-            <path strokeLinecap="round" strokeLinejoin="round" d="M17.593 3.322c1.1.128 1.907 1.077 1.907 2.185V21L12 17.25 4.5 21V5.507c0-1.108.806-2.057 1.907-2.185a48.507 48.507 0 0111.186 0z" />
-          </svg>
-          <span className="hidden md:block">Saved posts</span>
-        </Link>
-        <Link legacyBehavior href ="/planets/fdd401bf-3925-49ba-a155-4c3dba8dd93f" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}> {/* For testing -> final should be /posts/notifications */}
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-            <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-          </svg>
-          <span className="hidden md:block">Notifications</span>
-        </Link>
-        <button onClick={logout} className='w-full -my-2'>
-          <span className={nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-            </svg>
-            <span className="hidden md:block">Logout</span>
-          </span>
-        </button>
-      </div>
-    </Card>
-  );
-}
-
-export function ProfileNavigationCard(){
-  const router = useRouter();
-  const { asPath:pathname } = router;
-  const activeElementClasses = 'text-sm md:text-md flex gap-1 md:gap-3 py-3 my-1 bg-socialBlue text-white md:-mx-7 px-6 md:px-7 rounded-md shadow-md shadow-gray-300 items-center';
-  const nonActiveElementClasses= 'text-sm md:text-md flex gap-1 md:gap-3 py-2 my-2 hover:bg-blue-500 hover:bg-opacity-20 md:-mx-4 px-6 md:px-4 rounded-md transition-all hover:scale-110 hover:shadow-md shadow-gray-300 items-center';
-
-  const supabase = useSupabaseClient();
-  async function logout() { await supabase.auth.signOut(); }
-
-  return (
-    <>
-      <Card noPadding={true}>
-        <div className="px-4 py-2 flex justify-between md:block shadow-md shadow-gray-500 md:shadow-none">
-          <h2 className="text-gray-400 mb-3 hidden md:block">Navigation</h2>
-          <Link legacyBehavior href ="/posts" className={pathname === '/' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
-            </svg>
-            <span className="hidden md:block">Home</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/profile/friends" className={pathname === '/profile/friends' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" />
-            </svg>
-            <span className="hidden md:block">Friends</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/saved" className={pathname === '/saved' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M17.593 3.322c1.1.128 1.907 1.077 1.907 2.185V21L12 17.25 4.5 21V5.507c0-1.108.806-2.057 1.907-2.185a48.507 48.507 0 0111.186 0z" />
-            </svg>
-            <span className="hidden md:block">Saved posts</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/notifications" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-            </svg>
-            <span className="hidden md:block">Notifications</span>
-          </Link>
-          <button onClick={logout} className='w-full -my-2'>
-            <span className={nonActiveElementClasses}>
-              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-                <path strokeLinecap="round" strokeLinejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-              </svg>
-              <span className="hidden md:block">Logout</span>
-            </span>
-          </button>
-        </div>
-      </Card>
-      <Card noPadding={true}>
-        <div className="px-4 py-2 flex justify-between md:block shadow-md shadow-gray-500 md:shadow-none">
-          <h2 className="text-gray-400 mb-3 hidden md:block">Sandbox</h2>
-          <Link legacyBehavior href ="/posts" className={pathname === '/' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
-            </svg>
-            <span className="hidden md:block">Contracts</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/profile/friends" className={pathname === '/profile/friends' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" />
-            </svg>
-            <span className="hidden md:block">Components</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/saved" className={pathname === '/saved' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M17.593 3.322c1.1.128 1.907 1.077 1.907 2.185V21L12 17.25 4.5 21V5.507c0-1.108.806-2.057 1.907-2.185a48.507 48.507 0 0111.186 0z" />
-            </svg>
-            <span className="hidden md:block">Datasets</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/notifications" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-            </svg>
-            <span className="hidden md:block">Edge Functions/Forks</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/lens/feed" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-            </svg>
-            <span className="hidden md:block">Lens Feed</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/notifications" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-            </svg>
-            <span className="hidden md:block">All together :/</span>
-          </Link>
-          <Link legacyBehavior href ="/posts/notifications" className={pathname === '/notifications' ? activeElementClasses : nonActiveElementClasses}>
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-              <path strokeLinecap="round" strokeLinejoin="round" d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0" />
-            </svg>
-            <span className="hidden md:block">Publications</span>
-          </Link>
-          <button onClick={logout} className='w-full -my-2'>
-            <span className={nonActiveElementClasses}>
-              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-6 h-6">
-                <path strokeLinecap="round" strokeLinejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-              </svg>
-              <span className="hidden md:block">View on ORCID/ETH</span>
-            </span>
-          </button>
-        </div>
-      </Card>
-    </>
-  );
-}
\ No newline at end of file
diff --git a/components/Overlays/1-Feed.tsx b/components/Overlays/1-Feed.tsx
index 1f444d0a..90e0b2df 100644
--- a/components/Overlays/1-Feed.tsx
+++ b/components/Overlays/1-Feed.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { GardenDashboard } from '../../@/components/garden-dashboard';
-import { Button } from '../../@/components/ui/button';
+import { GardenDashboard } from '../garden-dashboard';
+import { Button } from '../_Core/ui/addons/button';
 import { useMediaQuery } from 'react-responsive';
 import Link from 'next/link';
 
diff --git a/components/Core/BottomBar.tsx b/components/_Core/Section/BottomBar.tsx
similarity index 96%
rename from components/Core/BottomBar.tsx
rename to components/_Core/Section/BottomBar.tsx
index b65b191c..bdceaaf8 100644
--- a/components/Core/BottomBar.tsx
+++ b/components/_Core/Section/BottomBar.tsx
@@ -5,8 +5,8 @@ import { BuildingIcon, CarIcon, RocketIcon, CpuIcon, MessageSquareDashedIcon } f
 import { CircleMenu, CircleMenuItem, TooltipPlacement} from 'react-circular-menu';
 import { useState } from "react";
 
-import { ClassificationFeedForIndividualPlanet } from "../Content/ClassificationFeed";
-import ContentPlaceholder from "../Content/Planets/PlanetData/ContentPlaceholder";
+import { ClassificationFeedForIndividualPlanet } from "../../Content/Classify/ClassificationFeed";
+import ContentPlaceholder from "../../Content/Planets/PlanetData/ContentPlaceholder";
 
 const bottombarLinks = [
   {
@@ -144,9 +144,9 @@ export const CreateBar = ({ onTabClick }) => {
             >
               <path
                 stroke="currentColor"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth="2"
                 d="M9 1v16M1 9h16"
               />
             </svg>
@@ -175,9 +175,9 @@ export const CreateBar = ({ onTabClick }) => {
           >
             <path
               stroke="currentColor"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
               d="M4 12.25V1m0 11.25a2.25 2.25 0 0 0 0 4.5m0-4.5a2.25 2.25 0 0 1 0 4.5M4 19v-2.25m6-13.5V1m0 2.25a2.25 2.25 0 0 0 0 4.5m0-4.5a2.25 2.25 0 0 1 0 4.5M10 19V7.75m6 4.5V1m0 11.25a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5ZM16 19v-2"
             />
           </svg>
diff --git a/components/Public/LandingContent.tsx b/components/_Core/Section/Info/LandingContent.tsx
similarity index 100%
rename from components/Public/LandingContent.tsx
rename to components/_Core/Section/Info/LandingContent.tsx
diff --git a/components/Info/faq.tsx b/components/_Core/Section/Info/faq.tsx
similarity index 100%
rename from components/Info/faq.tsx
rename to components/_Core/Section/Info/faq.tsx
diff --git a/components/Section/Layout.tsx b/components/_Core/Section/Layout.tsx
similarity index 95%
rename from components/Section/Layout.tsx
rename to components/_Core/Section/Layout.tsx
index ff6e2a25..c34f6a80 100644
--- a/components/Section/Layout.tsx
+++ b/components/_Core/Section/Layout.tsx
@@ -1,8 +1,8 @@
 import Navbar from "./Navbar";
 import React, { ReactNode, useEffect, useState } from "react";
-import Bottombar from "../Core/BottomBar";
+import Bottombar from "./BottomBar";
 import { useMediaQuery } from "react-responsive";
-import FeedOverlay from "../Overlays/1-Feed";
+import FeedOverlay from "../../Overlays/1-Feed";
 
 interface DashboardLayoutProps {
   children: ReactNode;
@@ -72,9 +72,9 @@ const Layout: React.FC<DashboardLayoutProps> = ({ children }) => {
                    xmlns="http://www.w3.org/2000/svg"
                  >
                    <path
-                     stroke-linecap="round"
-                     stroke-linejoin="round"
-                     stroke-width="2"
+                     strokeLinecap="round"
+                     strokeLinejoin="round"
+                     strokeWidth="2"
                      d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"
                    ></path>
                  </svg>
diff --git a/components/Section/NavItem.tsx b/components/_Core/Section/NavItem.tsx
similarity index 92%
rename from components/Section/NavItem.tsx
rename to components/_Core/Section/NavItem.tsx
index 0ba4aa29..6499b535 100644
--- a/components/Section/NavItem.tsx
+++ b/components/_Core/Section/NavItem.tsx
@@ -3,7 +3,7 @@ import { LucideIcon } from "lucide-react";
 import Link from "next/link";
 import { usePathname, useSearchParams } from "next/navigation";
 import React from "react";
-import { checkCurrentActiveUrl } from "../../lib/helper/str.helper";
+import { checkCurrentActiveUrl } from "../../../lib/helper/str.helper";
 
 type TProps = {
   url: string;
diff --git a/components/Section/Navbar.tsx b/components/_Core/Section/Navbar.tsx
similarity index 100%
rename from components/Section/Navbar.tsx
rename to components/_Core/Section/Navbar.tsx
diff --git a/components/icons/alert-circle.tsx b/components/_Core/icons/alert-circle.tsx
similarity index 100%
rename from components/icons/alert-circle.tsx
rename to components/_Core/icons/alert-circle.tsx
diff --git a/components/icons/check-in-circle.tsx b/components/_Core/icons/check-in-circle.tsx
similarity index 100%
rename from components/icons/check-in-circle.tsx
rename to components/_Core/icons/check-in-circle.tsx
diff --git a/components/icons/check.tsx b/components/_Core/icons/check.tsx
similarity index 100%
rename from components/icons/check.tsx
rename to components/_Core/icons/check.tsx
diff --git a/components/icons/directory.tsx b/components/_Core/icons/directory.tsx
similarity index 100%
rename from components/icons/directory.tsx
rename to components/_Core/icons/directory.tsx
diff --git a/components/icons/edit.tsx b/components/_Core/icons/edit.tsx
similarity index 100%
rename from components/icons/edit.tsx
rename to components/_Core/icons/edit.tsx
diff --git a/components/icons/expanding-arrow.tsx b/components/_Core/icons/expanding-arrow.tsx
similarity index 100%
rename from components/icons/expanding-arrow.tsx
rename to components/_Core/icons/expanding-arrow.tsx
diff --git a/components/icons/github.tsx b/components/_Core/icons/github.tsx
similarity index 100%
rename from components/icons/github.tsx
rename to components/_Core/icons/github.tsx
diff --git a/components/icons/index.tsx b/components/_Core/icons/index.tsx
similarity index 100%
rename from components/icons/index.tsx
rename to components/_Core/icons/index.tsx
diff --git a/components/icons/loading-dots.module.css b/components/_Core/icons/loading-dots.module.css
similarity index 100%
rename from components/icons/loading-dots.module.css
rename to components/_Core/icons/loading-dots.module.css
diff --git a/components/icons/loading-dots.tsx b/components/_Core/icons/loading-dots.tsx
similarity index 100%
rename from components/icons/loading-dots.tsx
rename to components/_Core/icons/loading-dots.tsx
diff --git a/components/icons/search.tsx b/components/_Core/icons/search.tsx
similarity index 100%
rename from components/icons/search.tsx
rename to components/_Core/icons/search.tsx
diff --git a/components/icons/upload.tsx b/components/_Core/icons/upload.tsx
similarity index 100%
rename from components/icons/upload.tsx
rename to components/_Core/icons/upload.tsx
diff --git a/components/icons/x-circle.tsx b/components/_Core/icons/x-circle.tsx
similarity index 100%
rename from components/icons/x-circle.tsx
rename to components/_Core/icons/x-circle.tsx
diff --git a/components/icons/x.tsx b/components/_Core/icons/x.tsx
similarity index 100%
rename from components/icons/x.tsx
rename to components/_Core/icons/x.tsx
diff --git a/components/ui/Avatar.tsx b/components/_Core/ui/Avatar.tsx
similarity index 97%
rename from components/ui/Avatar.tsx
rename to components/_Core/ui/Avatar.tsx
index 438fda22..059cff37 100644
--- a/components/ui/Avatar.tsx
+++ b/components/_Core/ui/Avatar.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as AvatarPrimitive from '@radix-ui/react-avatar';
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const Avatar = React.forwardRef<
 React.ElementRef<typeof AvatarPrimitive.Root>,
diff --git a/components/ui/Button.tsx b/components/_Core/ui/Button.tsx
similarity index 97%
rename from components/ui/Button.tsx
rename to components/_Core/ui/Button.tsx
index 4b8c73b5..c410d620 100644
--- a/components/ui/Button.tsx
+++ b/components/_Core/ui/Button.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
diff --git a/components/ui/Card.tsx b/components/_Core/ui/Card.tsx
similarity index 97%
rename from components/ui/Card.tsx
rename to components/_Core/ui/Card.tsx
index 303025d2..70bc6b6a 100644
--- a/components/ui/Card.tsx
+++ b/components/_Core/ui/Card.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const Card = React.forwardRef<
 HTMLDivElement,
diff --git a/components/Card.tsx b/components/_Core/ui/Content/Card.tsx
similarity index 100%
rename from components/Card.tsx
rename to components/_Core/ui/Content/Card.tsx
diff --git a/components/Content/DiscussCard.tsx b/components/_Core/ui/Content/DiscussCard.tsx
similarity index 69%
rename from components/Content/DiscussCard.tsx
rename to components/_Core/ui/Content/DiscussCard.tsx
index 178b706e..dd4f9b2d 100644
--- a/components/Content/DiscussCard.tsx
+++ b/components/_Core/ui/Content/DiscussCard.tsx
@@ -1,9 +1,9 @@
-import { AvatarFallback, Avatar, AvatarImage } from "../ui/Avatar";
-import { Button } from "../ui/Button";
+import { AvatarFallback, Avatar, AvatarImage } from "../Avatar";
+import { Button } from "../Button";
 import { Card, CardContent, CardFooter, CardTitle } from "./PostCard";
 import { Separator } from "@radix-ui/react-separator";
-import { useToast } from "../ui/use-toast";
-import { getMetaData } from "../../lib/helper/str.helper";
+import { useToast } from "../use-toast";
+import { getMetaData } from "../../../../lib/helper/str.helper";
 import { Megaphone, MessagesSquare, Share2 } from "lucide-react";
 import Link from "next/link";
 import React, { useEffect, useState } from "react";
@@ -36,23 +36,6 @@ interface Comment {
     avatar_url: string;
     username: string;
   };
-}
-
-export const CommentItem: React.FC<Comment> = ({ id, content, created_at, profiles }) => {
-  return (
-    <div className="ml-2 my-3">
-      <div className="flex items-center mb-2">
-        <Avatar className="rounded-full">
-          <AvatarImage src={"https://qwbufbmxkjfaikoloudl.supabase.co/storage/v1/object/public/avatars/" + profiles?.avatar_url ?? ""} />
-          <AvatarFallback>Test</AvatarFallback>
-        </Avatar>
-        <div className="flex flex-wrap items-center ml-2">
-          <div className="font-bold">{profiles?.username}</div>
-        </div>
-      </div>
-      <div className="my-3 text-sm">{content}</div>
-    </div>
-  );
 };
 
 const CardForum: React.FC<TProps> = ({
@@ -107,31 +90,6 @@ const CardForum: React.FC<TProps> = ({
       </CardContent>
       <CardFooter className="p-0 flex-col items-start pb-2">
         <Separator className="mb-2" />
-        {/* <div className="space-x-2 px-4 py-2">
-          {comments && (
-            <Button onClick={toggleComments} variant="outline" size="default" className="space-x-2">
-              <MessagesSquare className="w-5 aspect-square" />
-            </Button>
-          )}
-          <Button variant="outline" size="icon">
-            <Share2 className="w-5 aspect-square" />
-          </Button>
-          <Button
-            onClick={toggleComments}
-            variant="destructive"
-            size="icon"
-          >
-            <Megaphone className="w-5 aspect-square" />
-          </Button>
-        </div>
-        {showComments && comments && comments.length > 0 && (
-          <CardContent className="p-4 pt-2">
-            <h3 className="text-lg font-semibold mb-2">Comments</h3>
-            {comments.map((comment) => (
-              <CommentItem key={comment.id} {...comment} />
-            ))}
-          </CardContent>
-        )} */}
       </CardFooter>
     </>
   );
@@ -160,7 +118,7 @@ export function RoverContentCard({
           </div>
           <div className="text-gray-500 cursor-pointer">
             <button className="hover:bg-gray-50 rounded-full p-1">
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
                 <circle cx="12" cy="7" r="1" />
                 <circle cx="12" cy="12" r="1" />
                 <circle cx="12" cy="17" r="1" />
@@ -175,7 +133,7 @@ export function RoverContentCard({
           <div className="mb-4">
             <div key={media}><img src={media} className="w-full h-48 object-cover rounded-md" /></div> 
           </div>
-        )} {/* Comment/action section */}
+        )}
       </div>
     </div>
   )
diff --git a/components/Content/PostCard.tsx b/components/_Core/ui/Content/PostCard.tsx
similarity index 97%
rename from components/Content/PostCard.tsx
rename to components/_Core/ui/Content/PostCard.tsx
index c2444e68..5985950c 100644
--- a/components/Content/PostCard.tsx
+++ b/components/_Core/ui/Content/PostCard.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../../lib/uitls";
 
 const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
   ({ className, ...props }, ref) => (
diff --git a/components/ui/Form.tsx b/components/_Core/ui/Form.tsx
similarity index 99%
rename from components/ui/Form.tsx
rename to components/_Core/ui/Form.tsx
index 765d8263..1390b9a4 100644
--- a/components/ui/Form.tsx
+++ b/components/_Core/ui/Form.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { Slot } from "@radix-ui/react-slot";
 import { Controller, ControllerProps, FieldPath, FieldValues, FormProvider, useFormContext } from "react-hook-form";
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 import { Label } from "./Label";
 
 const Form = FormProvider;
diff --git a/components/ui/Label.tsx b/components/_Core/ui/Label.tsx
similarity index 94%
rename from components/ui/Label.tsx
rename to components/_Core/ui/Label.tsx
index 26fd8f31..eb250d50 100644
--- a/components/ui/Label.tsx
+++ b/components/_Core/ui/Label.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const labelVariants = cva(
     "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
diff --git a/components/ui/Separator.tsx b/components/_Core/ui/Separator.tsx
similarity index 94%
rename from components/ui/Separator.tsx
rename to components/_Core/ui/Separator.tsx
index c8a4db2e..3640ddb7 100644
--- a/components/ui/Separator.tsx
+++ b/components/_Core/ui/Separator.tsx
@@ -3,7 +3,7 @@
 import * as React from "react";
 import * as SeparatorPrimitive from "@radix-ui/react-separator";
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const Separator = React.forwardRef<
   React.ElementRef<typeof SeparatorPrimitive.Root>,
diff --git a/components/ui/TextArea.tsx b/components/_Core/ui/TextArea.tsx
similarity index 94%
rename from components/ui/TextArea.tsx
rename to components/_Core/ui/TextArea.tsx
index ac5edaa5..210d7fef 100644
--- a/components/ui/TextArea.tsx
+++ b/components/_Core/ui/TextArea.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 export interface TextareaProps
   extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
diff --git a/components/ui/Typography.tsx b/components/_Core/ui/Typography.tsx
similarity index 100%
rename from components/ui/Typography.tsx
rename to components/_Core/ui/Typography.tsx
diff --git a/components/Avatar.tsx b/components/_Core/ui/User/Avatar.tsx
similarity index 100%
rename from components/Avatar.tsx
rename to components/_Core/ui/User/Avatar.tsx
diff --git a/@/components/ui/button.tsx b/components/_Core/ui/addons/button.tsx
similarity index 97%
rename from @/components/ui/button.tsx
rename to components/_Core/ui/addons/button.tsx
index c0f23b69..f5586c90 100644
--- a/@/components/ui/button.tsx
+++ b/components/_Core/ui/addons/button.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "../../../lib/uitls";
+import { cn } from "../../../../lib/uitls";
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
diff --git a/@/components/ui/card.tsx b/components/_Core/ui/addons/card.tsx
similarity index 97%
rename from @/components/ui/card.tsx
rename to components/_Core/ui/addons/card.tsx
index 6ef45eb1..ecbc4ed7 100644
--- a/@/components/ui/card.tsx
+++ b/components/_Core/ui/addons/card.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "../../../lib/uitls";
+import { cn } from "../../../../lib/uitls";
 
 const Card = React.forwardRef<
   HTMLDivElement,
diff --git a/@/components/ui/dropdown-menu.tsx b/components/_Core/ui/addons/dropdown-menu.tsx
similarity index 99%
rename from @/components/ui/dropdown-menu.tsx
rename to components/_Core/ui/addons/dropdown-menu.tsx
index 055badea..8221b312 100644
--- a/@/components/ui/dropdown-menu.tsx
+++ b/components/_Core/ui/addons/dropdown-menu.tsx
@@ -6,7 +6,7 @@ import {
   DotFilledIcon,
 } from "@radix-ui/react-icons"
 
-import { cn } from "../../../lib/uitls";
+import { cn } from "../../../../lib/uitls";
 
 const DropdownMenu = DropdownMenuPrimitive.Root
 
diff --git a/components/ui/checkbox.tsx b/components/_Core/ui/checkbox.tsx
similarity index 96%
rename from components/ui/checkbox.tsx
rename to components/_Core/ui/checkbox.tsx
index a7c301ad..d0d0b6b8 100644
--- a/components/ui/checkbox.tsx
+++ b/components/_Core/ui/checkbox.tsx
@@ -4,7 +4,7 @@ import * as React from "react"
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
 import { CheckIcon } from "@radix-ui/react-icons"
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,
diff --git a/components/ui/input.tsx b/components/_Core/ui/input.tsx
similarity index 94%
rename from components/ui/input.tsx
rename to components/_Core/ui/input.tsx
index cc3ab241..ff2e9e5a 100644
--- a/components/ui/input.tsx
+++ b/components/_Core/ui/input.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement> {}
diff --git a/components/ui/toast.tsx b/components/_Core/ui/toast.tsx
similarity index 99%
rename from components/ui/toast.tsx
rename to components/_Core/ui/toast.tsx
index 3d6fb94c..c8d59fc8 100644
--- a/components/ui/toast.tsx
+++ b/components/_Core/ui/toast.tsx
@@ -3,7 +3,7 @@ import { Cross2Icon } from "@radix-ui/react-icons";
 import * as ToastPrimitives from "@radix-ui/react-toast";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "../../lib/uitls";
+import { cn } from "../../../lib/uitls";
 
 const ToastProvider = ToastPrimitives.Provider;
 
diff --git a/components/ui/use-toast.tsx b/components/_Core/ui/use-toast.tsx
similarity index 100%
rename from components/ui/use-toast.tsx
rename to components/_Core/ui/use-toast.tsx
diff --git a/components/dashboard-logs.tsx b/components/dashboard-logs.tsx
index 0499cead..75b375d7 100644
--- a/components/dashboard-logs.tsx
+++ b/components/dashboard-logs.tsx
@@ -1,5 +1,5 @@
 import { ShoppingBagIcon } from "@heroicons/react/24/outline";
-import { CardTitle, CardHeader, CardContent, Card } from "../@/components/ui/card";
+import { CardTitle, CardHeader, CardContent, Card } from "./_Core/ui/addons/card";
 import OwnedItemsList from "./Content/Inventory/UserOwnedItems";
 
 export function InventoryBlock() {
diff --git a/@/components/garden-dashboard.tsx b/components/garden-dashboard.tsx
similarity index 79%
rename from @/components/garden-dashboard.tsx
rename to components/garden-dashboard.tsx
index c21817f7..4910e326 100644
--- a/@/components/garden-dashboard.tsx
+++ b/components/garden-dashboard.tsx
@@ -1,8 +1,8 @@
 import Link from "next/link"
-import { Button } from "./ui/button"
-import { DashboardLogs, InventoryBlock } from "../../components/dashboard-logs";
+import { Button } from "./_Core/ui/addons/button"
+import { DashboardLogs, InventoryBlock } from "./dashboard-logs";
 import { useState } from "react";
-import { Garden } from "../../components/Content/Planets/GalleryList";
+import { Garden } from "./Content/Planets/GalleryList";
 
 export function GardenDashboard() {
   const [showGalaxy, setShowGalaxy] = useState(false);
@@ -15,7 +15,6 @@ export function GardenDashboard() {
       <div className="flex-1 flex flex-col items-center justify-center text-center">
         <div className="grid gap-4 p-4">
         </div>
-        {/* <QuickLook /> */}
         {/* <DashboardLogs /> */}
         <InventoryBlock />
         <Button onClick={handleOpenGalaxy} className="mt-4 px-4 py-2 rounded">
diff --git a/components/quick-look.tsx b/components/quick-look.tsx
deleted file mode 100644
index bd1d0975..00000000
--- a/components/quick-look.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { CardDescription, CardHeader, CardContent, Card, CardTitle } from "../@/components/ui/card"
-import { Button } from "./ui/Button"
-
-export function QuickLook() {
-  return (
-    <Card>
-      <CardHeader className="flex flex-col md:flex-row items-start md:items-center justify-between gap-2 md:gap-0">
-        <div className="flex flex-col gap-1">
-          <CardTitle className="text-base">Welcome to the Intergalactic Science Guild</CardTitle>
-          <CardDescription className="text-sm">Your hub for scientific discovery across the cosmos</CardDescription>
-        </div>
-        <Button className="md:ml-auto w-full md:w-auto" size="sm">
-          Upgrade Membership
-        </Button>
-      </CardHeader>
-      <CardContent className="grid gap-4 md:grid-cols-2">
-        <div className="flex flex-col gap-2">
-          <div className="flex items-center gap-2">
-            <UserIcon className="w-8 h-8 rounded-lg bg-gray-100 p-2 dark:bg-gray-800" />
-            <div className="flex flex-col">
-              <h2 className="font-semibold">Commander Nova</h2>
-              <p className="text-sm text-gray-500 dark:text-gray-400">Level 5 Astrophysicist</p>
-            </div>
-          </div>
-          <div className="grid gap-1">
-            <p>
-              <strong>Home Planet:</strong>
-              Earth{"\n                      "}
-            </p>
-            <p>
-              <strong>Ship:</strong>
-              Odyssey Explorer{"\n                      "}
-            </p>
-            <p>
-              <strong>Current Location:</strong>
-              Space Station Alpha{"\n                      "}
-            </p>
-          </div>
-        </div>
-        <div className="flex flex-col gap-2">
-          <div className="grid gap-1">
-            <p>
-              <strong>Rank:</strong>
-              Science Officer{"\n                      "}
-            </p>
-            <p>
-              <strong>Experience:</strong>
-              2,345 XP{"\n                      "}
-            </p>
-            <p>
-              <strong>Badges:</strong>
-              5{"\n                      "}
-            </p>
-          </div>
-          <div className="grid gap-1">
-            <p>
-              <strong>Next Mission:</strong>
-              Analyze Exoplanet Zeta{"\n                      "}
-            </p>
-            <p>
-              <strong>Deadline:</strong>
-              3 days{"\n                      "}
-            </p>
-          </div>
-        </div>
-      </CardContent>
-    </Card>
-  )
-}
-
-
-function UserIcon(props) {
-  return (
-    <svg
-      {...props}
-      xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      strokeWidth="2"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    >
-      <path d="M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2" />
-      <circle cx="12" cy="7" r="4" />
-    </svg>
-  )
-}
diff --git a/pages/auto/index.tsx b/pages/auto/index.tsx
deleted file mode 100644
index 4b2245cf..00000000
--- a/pages/auto/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-import Layout from "../../components/Section/Layout";
-import RoverImageGallery from "../../components/Content/Planets/PlanetData/RandomRoverImage";
-
-export default function AutomationTest() {
-    return (
-        <Layout>
-            <RoverImageGallery />
-        </Layout>
-    );
-};
\ No newline at end of file
diff --git a/pages/explore/[id].tsx b/pages/explore/[id].tsx
index ad7fbbea..437efce1 100644
--- a/pages/explore/[id].tsx
+++ b/pages/explore/[id].tsx
@@ -1,8 +1,8 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import { useRouter } from "next/router";
 import React from "react";
-import Navigation from "../../components/Section/Navbar";
-import RoverExploreDesktop from "../../components/Content/RoverData/RoverExplore";
+import Navigation from "../../components/_Core/Section/Navbar";
+import RoverExploreDesktop from "../../components/Gameplay/Explore/RoverExplore";
 
 export default function ExplorePlanet () {
     const supabase = useSupabaseClient();
diff --git a/pages/explore/index.tsx b/pages/explore/index.tsx
index bb612f28..2e1bcaeb 100644
--- a/pages/explore/index.tsx
+++ b/pages/explore/index.tsx
@@ -2,8 +2,8 @@
 import React, { useState } from "react";
 import { RoverMobileTest } from "../../components/Modals/rover-mobile-test";
 import { RoverInterface, RoverInterfaceDark } from "../../components/Modals/rover-interface";
-import Layout from "../../components/Section/Layout";
-import Navigation from "../../components/Section/Navbar";
+import Layout from "../../components/_Core/Section/Layout";
+import Navigation from "../../components/_Core/Section/Navbar";
 import FeedOverlay from "../../components/Overlays/1-Feed";
 
 export default function Explore() {
@@ -65,9 +65,9 @@ export default function Explore() {
                    xmlns="http://www.w3.org/2000/svg"
                  >
                    <path
-                     stroke-linecap="round"
-                     stroke-linejoin="round"
-                     stroke-width="2"
+                     strokeLinecap="round"
+                     strokeLinejoin="round"
+                     strokeWidth="2"
                      d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"
                    ></path>
                  </svg>
diff --git a/pages/factions/index.tsx b/pages/factions/index.tsx
deleted file mode 100644
index b2643b7a..00000000
--- a/pages/factions/index.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// FCDB-13
-// Will perform dynamic routes, but it will all go into the index route.
-// I think we'll have it that there will be 6 different factions (independant of species), each has their home planet (one of the 6 base planets), you pick your faction and you get assigned a planet/part of planet to classify & collate
-// Row in `basePlanets` `Faction`': Will later be a foreign key to the (currently non-existent) `factions` table. Will be labelled 1-6, for simplicity with pulling ids in the client code. Naming schema & other variables will be set manually in client repo UNTIL new table is created
-// Add in a toggle to view other factions once you've "earnt their trust", right now we don't need or want people to view others' homebases.
-
-import React, { useEffect, useState } from "react";
-import Layout from "../../components/Section/Layout";
-import HomebaseSelector from "../../components/Gameplay/FactionHomebase";
-import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-
-export default function Homebase() {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    // const [userFaction, setUserFaction] = useState<number>();
-    const [userData, setUserData] = useState(null);
-
-    // Get user data from here, determine their faction
-    const getUserFaction = async () => {
-        if (!session) {
-            return null;
-        };
-
-        try {
-            const {
-                data, error 
-            } = await supabase
-                .from('profiles')
-                .select('*')
-                .eq('id', session?.user?.id)
-                .single();
-            
-            if (data) {
-                setUserData(data);
-            };
-
-            if (error) {
-                throw error;
-            };
-        } catch (error) {
-            console.error(error.message);
-        };
-    };
-
-    const { level, location, factions } = userData || {};
-
-    useEffect(() => {
-        const fetchData = async () => {
-            if (session) {
-                await getUserFaction();
-            };
-        };
-
-        fetchData();
-    }, [session]);
-
-    if (!userData) {
-        return (
-            <div>Loading...</div>
-        );
-    };
-
-    return (
-        <Layout>
-            <HomebaseSelector factionId={userData.factions} />
-        </Layout>
-    );
-};
\ No newline at end of file
diff --git a/pages/feed/index.tsx b/pages/feed/index.tsx
index e5b8e295..b74bf2bb 100644
--- a/pages/feed/index.tsx
+++ b/pages/feed/index.tsx
@@ -1,7 +1,7 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import React, { useEffect, useState } from "react";
-import Layout from "../../components/Section/Layout";
-import ClassificationFeed from "../../components/Content/ClassificationFeed";
+import Layout from "../../components/_Core/Section/Layout";
+// import ClassificationFeed from "../../components/Content/ClassificationFeed";
 import Login from "../login";
 
 export default function Home() {
@@ -37,7 +37,7 @@ export default function Home() {
             <HomePlanetStats />
           </div> */}
           <div className="py-10">
-            <ClassificationFeed custommaxWidth={customMaxWidth} />
+            {/* <ClassificationFeed custommaxWidth={customMaxWidth} /> */}
           </div>
         </Layout>
       );
diff --git a/pages/garden.tsx b/pages/garden.tsx
index 20391cf1..e4e6bd86 100644
--- a/pages/garden.tsx
+++ b/pages/garden.tsx
@@ -1,8 +1,7 @@
 import React from "react";
-// import Garden from "../components/Gameplay/Garden";
 import { Garden } from "../components/Content/Planets/GalleryList";
-import Layout, { LayoutNoNav } from "../components/Section/Layout";
-import Navbar from "../components/Section/Navbar";
+import Layout, { LayoutNoNav } from "../components/_Core/Section/Layout";
+import Navbar from "../components/_Core/Section/Navbar";
 
 export default function GardenPage() {
     return (
@@ -12,5 +11,5 @@ export default function GardenPage() {
                 throw new Error("Function not implemented.");
             } } />
         </LayoutNoNav>
-    )
-}
\ No newline at end of file
+    );
+};
\ No newline at end of file
diff --git a/pages/gather/index.tsx b/pages/gather/index.tsx
index dc2257d1..a589478a 100644
--- a/pages/gather/index.tsx
+++ b/pages/gather/index.tsx
@@ -2,24 +2,13 @@ import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import { Auth, ThemeSupa } from "@supabase/auth-ui-react";
 import React from "react";
 import Link from "next/link";
-import Layout from "../../components/Section/Layout";
+import Layout from "../../components/_Core/Section/Layout";
 import CreateBasePlanetSector, { AllSectors, UserOwnedSectorGrid } from "../../components/Content/Planets/Sectors/SectorSetup";
 
 export default function GatherResourcesPage() {
     const supabase = useSupabaseClient();
     const session = useSession();
 
-    const sectorImageUrls = [
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00090/ids/edr/browse/edl/EBE_0090_0674952393_193ECM_N0040048EDLC00090_0030LUJ01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00088/ids/edr/browse/ncam/NLF_0088_0674754382_784ECM_N0040048NCAM00503_01_295J01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00898/ids/edr/browse/ncam/NLF_0898_0746644503_691ECM_N0440830NCAM00501_01_295J01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00452/ids/edr/browse/ncam/NLG_0452_0707069810_116ECM_N0260000NCAM00521_00_2I4J01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00142/ids/edr/browse/ncam/NLE_0142_0679544984_506ECM_N0051812NCAM00208_04_0LLJ01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00014/ids/edr/browse/ncam/NLM_0014_0668187567_632ECM_N0030074AUT_04096_00_2LLJ01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00214/ids/edr/browse/ncam/NLF_0214_0685920377_855ECM_N0072050NCAM00514_01_295J01_1200.jpg',
-        'https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00721/ids/edr/browse/ncam/NLF_0721_0730956964_909ECM_N0345120NCAM15721_01_195J01_1200.jpg',
-    ];
-
     if (!session) {
         return (
             <div className='w-80%'><Auth supabaseClient={supabase} appearance={{ theme: ThemeSupa }} theme='dark' /></div>
diff --git a/pages/index.tsx b/pages/index.tsx
index b78dcb81..8537d299 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,6 +1,6 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import React, { useEffect, useState } from "react";
-import Layout, { LayoutNoNav } from "../components/Section/Layout";
+import Layout, { LayoutNoNav } from "../components/_Core/Section/Layout";
 import { useRouter } from "next/router";
 import { useMediaQuery } from 'react-responsive';
 
@@ -14,15 +14,13 @@ import {
   footerNavigation,
   modules,
   navigation,
-} from "../components/Public/LandingContent";
+} from "../components/_Core/Section/Info/LandingContent";
 import Navigation, {
   UserDropdownMenu,
   UserMenuItems,
-} from "../components/Section/Navbar";
-import { GardenDashboard } from "../@/components/garden-dashboard";
+} from "../components/_Core/Section/Navbar";
+import { GardenDashboard } from "../components/garden-dashboard";
 import FeedOverlay from "../components/Overlays/1-Feed";
-import Link from "next/link";
-import { AppWindowIcon, MenuIcon } from "lucide-react";
 import UponSignupModal from "../components/Modals/UponSignup";
 
 export const metadata: Metadata = {
@@ -120,7 +118,7 @@ export function PublicLanding() {
 <div className="chat chat-start">
   <div className="chat-bubble">A dust storm is brewing on your home planet, time to investigate.</div>
 </div></div>
-<UponSignupModal />
+{isDesktopOrLaptop && ( <UponSignupModal /> )}
            </div>
            <div className="absolute inset-0 grid grid-cols-3 grid-rows-3 gap-4 p-40 my-12">
              {/* Content here */}
@@ -154,9 +152,9 @@ export function PublicLanding() {
                    xmlns="http://www.w3.org/2000/svg"
                  >
                    <path
-                     stroke-linecap="round"
-                     stroke-linejoin="round"
-                     stroke-width="2"
+                     strokeLinecap="round"
+                     strokeLinejoin="round"
+                     strokeWidth="2"
                      d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"
                    ></path>
                  </svg>
diff --git a/pages/inventory/explore.tsx b/pages/inventory/explore.tsx
deleted file mode 100644
index 0579fa31..00000000
--- a/pages/inventory/explore.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from "react";
-import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
-import Layout from "../../components/Section/Layout";
-import OwnedPlanetsList from "../../components/Content/Archive/UserOwnedPlanets";
-import OwnedItemsList from "../../components/Content/Inventory/UserOwnedItems";
-import MySpaceships from "../../components/Content/Inventory/Vehicles/MySpaceships";
-
-export default function Explore() {
-    const supabase = useSupabaseClient();
-    const session = useSession();
-
-    return (
-        <Layout>
-            <OwnedPlanetsList />
-            <OwnedItemsList />
-            <MySpaceships />
-        </Layout>
-    );
-};
\ No newline at end of file
diff --git a/pages/inventory/index.tsx b/pages/inventory/index.tsx
deleted file mode 100644
index 964b1f47..00000000
--- a/pages/inventory/index.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from "react";
-import Layout, { InventoryLayout } from "../../components/Section/Layout";
-
-export default function Inventory() {
-    return (
-      <InventoryLayout>
-        <div className="grid grid-cols-6 gap-2 px-5">
-          {/* <div className="col-span-2 px-5"><SelectedItem /></div> */}
-          <div className="col-span-4 px-2"><div className="w-[526px] h-[664px] px-[31px] py-[17px] bg-neutral-700 justify-center items-center gap-[46px] inline-flex">
-    <div className="h-[630px] justify-between items-center flex">
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-    </div>
-    <div className="h-[630px] justify-between items-center flex">
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-    </div>
-    <div className="h-[630px] justify-between items-center flex">
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-        <div className="p-3 flex-col justify-center items-center gap-2.5 inline-flex">
-            <div className="text-center text-white text-base font-medium font-['Inter'] uppercase tracking-[2.56px]">nO ITEM</div>
-            <div className="w-[100px] h-[100px] bg-white bg-opacity-5 rounded-[15px] justify-center items-center gap-2.5 inline-flex" />
-        </div>
-    </div>
-</div></div>
-          {/* <OwnedToolItems /> */}
-        </div>
-        {/* <EquippedToolItems /> */}
-      </InventoryLayout>
-    );
-};  
\ No newline at end of file
diff --git a/pages/login/index.tsx b/pages/login/index.tsx
index 3f3c05d5..b518a5e8 100644
--- a/pages/login/index.tsx
+++ b/pages/login/index.tsx
@@ -2,7 +2,7 @@ import { Auth, ThemeSupa } from '@supabase/auth-ui-react';
 import React, { useEffect } from 'react';
 import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react';
 import { useRouter } from 'next/router'; // Import the useRouter hook
-import Layout from '../../components/Section/Layout';
+import Layout from '../../components/_Core/Section/Layout';
 import LoginPage from '../../components/Authentication/LoginModal';
 
 const Login = () => {
diff --git a/pages/login/register.tsx b/pages/login/register.tsx
index 25540108..eae9706f 100644
--- a/pages/login/register.tsx
+++ b/pages/login/register.tsx
@@ -2,7 +2,7 @@ import { Auth, ThemeSupa } from '@supabase/auth-ui-react';
 import React, { useEffect } from 'react';
 import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react';
 import { useRouter } from 'next/router'; // Import the useRouter hook
-import Layout from '../../components/Section/Layout';
+import Layout from '../../components/_Core/Section/Layout';
 import LoginPage from '../../components/Authentication/LoginModal';
 
 const Register = () => {
diff --git a/pages/onboarding/select.tsx b/pages/onboarding/select.tsx
index d24b1f1d..463f01fe 100644
--- a/pages/onboarding/select.tsx
+++ b/pages/onboarding/select.tsx
@@ -1,8 +1,7 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import React, { useState } from "react";
-import Layout from "../../components/Section/Layout";
-import SelectYourBasePlanet from "../../components/Content/Planets/Base/SelectYourPlanet";
-import ClassificationFeed from "../../components/Content/ClassificationFeed";
+import Layout from "../../components/_Core/Section/Layout";
+import SelectYourBasePlanet from "../../components/Gameplay/SelectYourPlanet";
 
 export default function Home() {
     const session = useSession();
@@ -27,4 +26,4 @@ export default function Home() {
     return (
         <Layout>Hello</Layout>
     );
-};
\ No newline at end of file
+}; 
\ No newline at end of file
diff --git a/pages/planets/[id].tsx b/pages/planets/[id].tsx
index 552a0e63..07bbccf4 100644
--- a/pages/planets/[id].tsx
+++ b/pages/planets/[id].tsx
@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from "react";
 import { useRouter } from "next/router";
-import { IndividualBasePlanetDesktop } from "../../components/Content/Planets/Base/IndividualBasePlanet";
-import { ClassificationFeedForIndividualPlanet } from "../../components/Content/ClassificationFeed";
+import { IndividualBasePlanetDesktop } from "../../components/Content/[id]/IndividualBasePlanet";
+import { ClassificationFeedForIndividualPlanet } from "../../components/Content/Classify/ClassificationFeed";
 import PostFormCardAnomalyTag from "../../components/Content/Classify/AnomalyPostFormCard";
-import Navbar from "../../components/Section/Navbar";
-import { CreateBar, CreateMenuBar } from "../../components/Core/BottomBar";
+import Navbar from "../../components/_Core/Section/Navbar";
+import { CreateBar, CreateMenuBar } from "../../components/_Core/Section/BottomBar";
 import { useSupabaseClient } from "@supabase/auth-helpers-react";
 import ContentPlaceholder from "../../components/Content/Planets/PlanetData/ContentPlaceholder";
 
diff --git a/pages/planets/map.tsx b/pages/planets/map.tsx
deleted file mode 100644
index 74e194fc..00000000
--- a/pages/planets/map.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-// import Garden from "../components/Gameplay/Garden";
-import { Garden } from "../../components/Content/Planets/GalleryList";
-import Layout, { LayoutNoNav } from "../../components/Section/Layout";
-
-export default function GardenPage() {
-    return (
-        <LayoutNoNav>
-            {/* <Garden /> */}I think I can
-        </LayoutNoNav>
-    )
-}
\ No newline at end of file
diff --git a/pages/planets/sector/[id].tsx b/pages/planets/sector/[id].tsx
index c7e7c2ea..0e48db20 100644
--- a/pages/planets/sector/[id].tsx
+++ b/pages/planets/sector/[id].tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { useRouter } from "next/router";
-import Layout from "../../../components/Section/Layout";
-import BasePlanetSector from "../../../components/Content/Planets/Base/BasePlanetSector";
+import Layout from "../../../components/_Core/Section/Layout";
+import BasePlanetSector from "../../../components/Content/[id]/BasePlanetSector";
 
 export default function SectorPage () {
     const router = useRouter();
diff --git a/pages/planets/sectors/[id].tsx b/pages/planets/sectors/[id].tsx
index 7a589857..0ce0ce24 100644
--- a/pages/planets/sectors/[id].tsx
+++ b/pages/planets/sectors/[id].tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useRouter } from "next/router";
-import Layout from "../../../components/Section/Layout";
-import BasePlanetSectors from "../../../components/Content/Planets/Base/BasePlanetAllSectors";
+import Layout from "../../../components/_Core/Section/Layout";
+import BasePlanetSectors from "../../../components/Content/[id]/BasePlanetAllSectors";
 
 export default function PlanetSectors() {
     const router = useRouter();
diff --git a/pages/tests/placeholder.tsx b/pages/tests/placeholder.tsx
deleted file mode 100644
index 5fb62499..00000000
--- a/pages/tests/placeholder.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import ContentPlaceholder from "../../components/Content/Planets/PlanetData/ContentPlaceholder";
-import Layout from "../../components/Section/Layout";
-
-export default function PlaceholderPageForTestingComponents () {
-    return (
-        <Layout>
-            <ContentPlaceholder />
-        </Layout>
-    )
-}
\ No newline at end of file
diff --git a/public/assets/governance/dashboard.svg b/public/assets/governance/dashboard.svg
index 612ceef6..c13a94ef 100644
--- a/public/assets/governance/dashboard.svg
+++ b/public/assets/governance/dashboard.svg
@@ -1,6 +1,6 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fillRule="evenodd" clip-rule="evenodd" d="M1 4.5C1 1.87479 1.02811 1 4.5 1C7.97189 1 8 1.87479 8 4.5C8 7.12521 8.01107 8 4.5 8C0.988927 8 1 7.12521 1 4.5Z" stroke="#1DC071" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
-<path fillRule="evenodd" clip-rule="evenodd" d="M12 4.5C12 1.87479 12.0281 1 15.5 1C18.9719 1 19 1.87479 19 4.5C19 7.12521 19.0111 8 15.5 8C11.9889 8 12 7.12521 12 4.5Z" stroke="#1DC071" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
-<path fillRule="evenodd" clip-rule="evenodd" d="M1 15.5C1 12.8748 1.02811 12 4.5 12C7.97189 12 8 12.8748 8 15.5C8 18.1252 8.01107 19 4.5 19C0.988927 19 1 18.1252 1 15.5Z" stroke="#1DC071" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
-<path fillRule="evenodd" clip-rule="evenodd" d="M12 15.5C12 12.8748 12.0281 12 15.5 12C18.9719 12 19 12.8748 19 15.5C19 18.1252 19.0111 19 15.5 19C11.9889 19 12 18.1252 12 15.5Z" stroke="#1DC071" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
+<path fillRule="evenodd" clip-rule="evenodd" d="M1 4.5C1 1.87479 1.02811 1 4.5 1C7.97189 1 8 1.87479 8 4.5C8 7.12521 8.01107 8 4.5 8C0.988927 8 1 7.12521 1 4.5Z" stroke="#1DC071" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+<path fillRule="evenodd" clip-rule="evenodd" d="M12 4.5C12 1.87479 12.0281 1 15.5 1C18.9719 1 19 1.87479 19 4.5C19 7.12521 19.0111 8 15.5 8C11.9889 8 12 7.12521 12 4.5Z" stroke="#1DC071" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+<path fillRule="evenodd" clip-rule="evenodd" d="M1 15.5C1 12.8748 1.02811 12 4.5 12C7.97189 12 8 12.8748 8 15.5C8 18.1252 8.01107 19 4.5 19C0.988927 19 1 18.1252 1 15.5Z" stroke="#1DC071" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+<path fillRule="evenodd" clip-rule="evenodd" d="M12 15.5C12 12.8748 12.0281 12 15.5 12C18.9719 12 19 12.8748 19 15.5C19 18.1252 19.0111 19 15.5 19C11.9889 19 12 18.1252 12 15.5Z" stroke="#1DC071" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
 </svg>
diff --git a/public/assets/governance/payment.svg b/public/assets/governance/payment.svg
index 30336d84..349bc6d2 100644
--- a/public/assets/governance/payment.svg
+++ b/public/assets/governance/payment.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18.1111 8.14286V5.57143C18.1111 4.88944 17.8536 4.23539 17.3951 3.75315C16.9367 3.27092 16.315 3 15.6667 3H3.44444C2.79614 3 2.17438 3.27092 1.71596 3.75315C1.25754 4.23539 1 4.88944 1 5.57143V13.2857C1 13.9677 1.25754 14.6218 1.71596 15.104C2.17438 15.5862 2.79614 15.8571 3.44444 15.8571H5.88889M8.33333 21H20.5556C21.2039 21 21.8256 20.7291 22.284 20.2468C22.7425 19.7646 23 19.1106 23 18.4286V10.7143C23 10.0323 22.7425 9.37825 22.284 8.89601C21.8256 8.41377 21.2039 8.14286 20.5556 8.14286H8.33333C7.68503 8.14286 7.06327 8.41377 6.60485 8.89601C6.14643 9.37825 5.88889 10.0323 5.88889 10.7143V18.4286C5.88889 19.1106 6.14643 19.7646 6.60485 20.2468C7.06327 20.7291 7.68503 21 8.33333 21ZM16.8889 14.5714C16.8889 15.2534 16.6313 15.9075 16.1729 16.3897C15.7145 16.8719 15.0928 17.1429 14.4444 17.1429C13.7961 17.1429 13.1744 16.8719 12.716 16.3897C12.2575 15.9075 12 15.2534 12 14.5714C12 13.8894 12.2575 13.2354 12.716 12.7532C13.1744 12.2709 13.7961 12 14.4444 12C15.0928 12 15.7145 12.2709 16.1729 12.7532C16.6313 13.2354 16.8889 13.8894 16.8889 14.5714Z" stroke="#1DC071" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
+<path d="M18.1111 8.14286V5.57143C18.1111 4.88944 17.8536 4.23539 17.3951 3.75315C16.9367 3.27092 16.315 3 15.6667 3H3.44444C2.79614 3 2.17438 3.27092 1.71596 3.75315C1.25754 4.23539 1 4.88944 1 5.57143V13.2857C1 13.9677 1.25754 14.6218 1.71596 15.104C2.17438 15.5862 2.79614 15.8571 3.44444 15.8571H5.88889M8.33333 21H20.5556C21.2039 21 21.8256 20.7291 22.284 20.2468C22.7425 19.7646 23 19.1106 23 18.4286V10.7143C23 10.0323 22.7425 9.37825 22.284 8.89601C21.8256 8.41377 21.2039 8.14286 20.5556 8.14286H8.33333C7.68503 8.14286 7.06327 8.41377 6.60485 8.89601C6.14643 9.37825 5.88889 10.0323 5.88889 10.7143V18.4286C5.88889 19.1106 6.14643 19.7646 6.60485 20.2468C7.06327 20.7291 7.68503 21 8.33333 21ZM16.8889 14.5714C16.8889 15.2534 16.6313 15.9075 16.1729 16.3897C15.7145 16.8719 15.0928 17.1429 14.4444 17.1429C13.7961 17.1429 13.1744 16.8719 12.716 16.3897C12.2575 15.9075 12 15.2534 12 14.5714C12 13.8894 12.2575 13.2354 12.716 12.7532C13.1744 12.2709 13.7961 12 14.4444 12C15.0928 12 15.7145 12.2709 16.1729 12.7532C16.6313 13.2354 16.8889 13.8894 16.8889 14.5714Z" stroke="#1DC071" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
 </svg>
diff --git a/public/assets/governance/profile.svg b/public/assets/governance/profile.svg
index 636797c5..38b14bfd 100644
--- a/public/assets/governance/profile.svg
+++ b/public/assets/governance/profile.svg
@@ -1,5 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="12" cy="9" r="3" stroke="#1DC071" strokeWidth="2" stroke-linecap="round"/>
+<circle cx="12" cy="9" r="3" stroke="#1DC071" strokeWidth="2" strokeLinecap="round"/>
 <circle cx="12" cy="12" r="11" stroke="#1DC071" strokeWidth="2"/>
-<path d="M19 20C18.5871 18.8525 17.6773 17.8384 16.4117 17.1152C15.146 16.392 13.5953 16 12 16C10.4047 16 8.85398 16.392 7.58835 17.1152C6.32271 17.8384 5.41289 18.8525 5 20" stroke="#1DC071" strokeWidth="2" stroke-linecap="round"/>
+<path d="M19 20C18.5871 18.8525 17.6773 17.8384 16.4117 17.1152C15.146 16.392 13.5953 16 12 16C10.4047 16 8.85398 16.392 7.58835 17.1152C6.32271 17.8384 5.41289 18.8525 5 20" stroke="#1DC071" strokeWidth="2" strokeLinecap="round"/>
 </svg>
diff --git a/public/assets/governance/search.svg b/public/assets/governance/search.svg
index 7e6bda0c..3941f014 100644
--- a/public/assets/governance/search.svg
+++ b/public/assets/governance/search.svg
@@ -1,6 +1,6 @@
 <svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_2290_2179)">
-<path d="M16.9702 16.5L13.2202 12.75M15.0952 8.0625C15.0952 8.9243 14.9255 9.77766 14.5957 10.5739C14.2659 11.3701 13.7825 12.0935 13.1731 12.7029C12.5637 13.3123 11.8403 13.7957 11.0441 14.1255C10.2479 14.4553 9.39451 14.625 8.53271 14.625C7.67092 14.625 6.81755 14.4553 6.02135 14.1255C5.22516 13.7957 4.50171 13.3123 3.89233 12.7029C3.28294 12.0935 2.79955 11.3701 2.46976 10.5739C2.13996 9.77766 1.97021 8.9243 1.97021 8.0625C1.97021 6.32202 2.66162 4.65282 3.89233 3.42211C5.12303 2.1914 6.79223 1.5 8.53271 1.5C10.2732 1.5 11.9424 2.1914 13.1731 3.42211C14.4038 4.65282 15.0952 6.32202 15.0952 8.0625Z" stroke="white" strokeWidth="2" stroke-linecap="round" strokeLinejoin="round"/>
+<path d="M16.9702 16.5L13.2202 12.75M15.0952 8.0625C15.0952 8.9243 14.9255 9.77766 14.5957 10.5739C14.2659 11.3701 13.7825 12.0935 13.1731 12.7029C12.5637 13.3123 11.8403 13.7957 11.0441 14.1255C10.2479 14.4553 9.39451 14.625 8.53271 14.625C7.67092 14.625 6.81755 14.4553 6.02135 14.1255C5.22516 13.7957 4.50171 13.3123 3.89233 12.7029C3.28294 12.0935 2.79955 11.3701 2.46976 10.5739C2.13996 9.77766 1.97021 8.9243 1.97021 8.0625C1.97021 6.32202 2.66162 4.65282 3.89233 3.42211C5.12303 2.1914 6.79223 1.5 8.53271 1.5C10.2732 1.5 11.9424 2.1914 13.1731 3.42211C14.4038 4.65282 15.0952 6.32202 15.0952 8.0625Z" stroke="white" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
 </g>
 <defs>
 <clipPath id="clip0_2290_2179">
diff --git a/public/assets/ui/planet.svg b/public/assets/ui/planet.svg
index 0abe35e6..c078b3a5 100644
--- a/public/assets/ui/planet.svg
+++ b/public/assets/ui/planet.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
 	 viewBox="0 0 496 496" xml:space="preserve">
 <g>
-	<path style="fill:none;stroke:#5C546A;strokeWidth:0;stroke-linecap:round;strokeLinejoin:round;" d="M416,247.647
+	<path style="fill:none;stroke:#5C546A;strokeWidth:0;strokeLinecap:round;strokeLinejoin:round;" d="M416,247.647
 		c0,0.078,0,0.078,0,0.078"/>
 	<path style="fill:#5C546A;" d="M115.218,108.547c0.336,0.218,0.666,0.443,0.991,0.675c0.024,0.017,0.047,0.033,0.071,0.051
 		c0.335,0.24,0.664,0.487,0.988,0.741c0.013,0.01,0.025,0.02,0.038,0.03c0.331,0.261,0.656,0.529,0.975,0.804
diff --git a/tsconfig.json b/tsconfig.json
index 7ed7a551..f72997b8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,5 +16,5 @@
     "incremental": true
   },
   "exclude": ["node_modules"],
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "components/PostFormCard.jsx", "constants/contracts.ts", "pages/posts.tsx/index.jsx", "components/Lens/Utterances.jsx", "components/Lens/Utterances.jsx", "components/Posts/ProfileCard.tsx", "components/Posts/ProfileCard.tsx", "context/UserContext.js", "context/UserContext.js", "components/PostCard.jsx", "components/PostCard.jsx", "components/Core/Sidebar.jsx", "components/Core/Sidebar.jsx", "components/Core/Layout.tsx", "components/Core/Layout.tsx", "components/Gameplay/Generator/Notebooks/Notebook.js", "components/Gameplay/Generator/Notebooks/Notebook.js", "components/Governance/Connections/ConnectWallet.js", "components/Governance/Connections/ConnectWallet.js", "components/Governance/Navbar.jsx", "components/Governance/Navbar.jsx", "pages/governance/vote.jsx", "pages/governance/vote.jsx", "components/Gameplay/Models/Character/CharacterCanvas.jsx", "components/Gameplay/Models/Character/Interface.jsx", "components/Journal/Discussion/Reply.js", "pages/tests/planet.tsx"  ]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "components/PostFormCard.jsx", "constants/contracts.ts", "pages/posts.tsx/index.jsx", "components/Lens/Utterances.jsx", "components/Lens/Utterances.jsx", "components/Posts/ProfileCard.tsx", "components/Posts/ProfileCard.tsx", "context/UserContext.js", "context/UserContext.js", "components/PostCard.jsx", "components/PostCard.jsx", "components/_Core/Sidebar.jsx", "components/_Core/Sidebar.jsx", "components/_Core/Layout.tsx", "components/_Core/Layout.tsx", "components/Gameplay/Generator/Notebooks/Notebook.js", "components/Gameplay/Generator/Notebooks/Notebook.js", "components/Governance/Connections/ConnectWallet.js", "components/Governance/Connections/ConnectWallet.js", "components/Governance/Navbar.jsx", "components/Governance/Navbar.jsx", "pages/governance/vote.jsx", "pages/governance/vote.jsx", "components/Gameplay/Models/Character/CharacterCanvas.jsx", "components/Gameplay/Models/Character/Interface.jsx", "components/Journal/Discussion/Reply.js", "pages/tests/planet.tsx"  ]
 }
\ No newline at end of file