diff --git a/_theme_files/property.html b/_theme_files/property.html
index ae6aa91..95f6f09 100644
--- a/_theme_files/property.html
+++ b/_theme_files/property.html
@@ -442,33 +442,35 @@
             <div class="bg-white p-6 rounded-lg shadow-md">
               <h3 class="text-xl font-bold mb-6">Contact Property Manager</h3>
               <form>
-              <div class='mb-4'>
-                <label
-                  class='block text-gray-700 text-sm font-bold mb-2'
-                  htmlFor='name'
-                >
-                  Name:
-                </label>
-                <input
-                  class='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
-                  id='name'
-                  type='text'
-                  placeholder='Enter your name'             
-                  required
-                />
-              </div>
-                <div class="mb-4">
+                <div class='mb-4'>
                   <label
-                    class="block text-gray-700 text-sm font-bold mb-2"
-                    for="email"
+                    class='block text-gray-700 text-sm font-bold mb-2'
+                    htmlFor='name'
+                  >
+                    Name:
+                  </label>
+                  <input
+                    class='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
+                    id='name'
+                    name='name'
+                    type='text'
+                    placeholder='Enter your name'
+                    required
+                  />
+                </div>
+                <div class='mb-4'>
+                  <label
+                    class='block text-gray-700 text-sm font-bold mb-2'
+                    htmlFor='email'
                   >
                     Email:
                   </label>
                   <input
-                    class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-                    id="email"
-                    type="email"
-                    placeholder="Enter your email"
+                    class='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
+                    id='email'
+                    name='email'
+                    type='email'
+                    placeholder='Enter your email'
                     required
                   />
                 </div>
@@ -482,29 +484,31 @@
                   <input
                     class='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
                     id='phone'
+                    name='phone'
                     type='text'
                     placeholder='Enter your phone number'
                   />
                 </div>
-                <div class="mb-4">
+                <div class='mb-4'>
                   <label
-                    class="block text-gray-700 text-sm font-bold mb-2"
-                    for="message"
+                    class='block text-gray-700 text-sm font-bold mb-2'
+                    htmlFor='message'
                   >
                     Message:
                   </label>
                   <textarea
-                    class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 h-44 focus:outline-none focus:shadow-outline"
-                    id="message"
-                    placeholder="Enter your message"
+                    class='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 h-44 focus:outline-none focus:shadow-outline'
+                    id='message'
+                    name='message'
+                    placeholder='Enter your message'
                   ></textarea>
                 </div>
                 <div>
                   <button
-                    class="bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded-full w-full focus:outline-none focus:shadow-outline flex items-center justify-center"
-                    type="submit"
+                    class='bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded-full w-full focus:outline-none focus:shadow-outline flex items-center justify-center'
+                    type='submit'
                   >
-                    <i class="fas fa-paper-plane mr-2"></i> Send Message
+                    <FaPaperPlane class='mr-2' /> Send Message
                   </button>
                 </div>
               </form>
diff --git a/app/properties/[id]/page.jsx b/app/properties/[id]/page.jsx
index 1b83199..9870d70 100644
--- a/app/properties/[id]/page.jsx
+++ b/app/properties/[id]/page.jsx
@@ -3,10 +3,23 @@ import PropertyDetails from '@/components/PropertyDetails';
 import connectDB from '@/config/database';
 import Property from '@/models/Property';
 import PropertyImages from '@/components/PropertyImages';
+import BookmarkButton from '@/components/BookmarkButton';
+import ShareButtons from '@/components/ShareButtons';
+import PropertyContactForm from '@/components/PropertyContactForm';
+import { convertToSerializeableObject } from '@/utils/convertToObject';
 
 const PropertyPage = async ({ params }) => {
   await connectDB();
-  const property = await Property.findById(params.id).lean();
+  const propertyDoc = await Property.findById(params.id).lean();
+  const property = convertToSerializeableObject(propertyDoc);
+
+  if (!property) {
+    return (
+      <h1 className='text-center text-2xl font-bold mt-10'>
+        Property Not Found
+      </h1>
+    );
+  }
 
   return (
     <>
@@ -18,86 +31,9 @@ const PropertyPage = async ({ params }) => {
 
             {/* <!-- Sidebar --> */}
             <aside className='space-y-4'>
-              <button className='bg-blue-500 hover:bg-blue-600 text-white font-bold w-full py-2 px-4 rounded-full flex items-center justify-center'>
-                <i className='fas fa-bookmark mr-2'></i> Bookmark Property
-              </button>
-              <button className='bg-orange-500 hover:bg-orange-600 text-white font-bold w-full py-2 px-4 rounded-full flex items-center justify-center'>
-                <i className='fas fa-share mr-2'></i> Share Property
-              </button>
-
-              {/* <!-- Contact Form --> */}
-              <div className='bg-white p-6 rounded-lg shadow-md'>
-                <h3 className='text-xl font-bold mb-6'>
-                  Contact Property Manager
-                </h3>
-                <form>
-                  <div className='mb-4'>
-                    <label
-                      className='block text-gray-700 text-sm font-bold mb-2'
-                      htmlFor='name'
-                    >
-                      Name:
-                    </label>
-                    <input
-                      className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
-                      id='name'
-                      type='text'
-                      placeholder='Enter your name'
-                      required
-                    />
-                  </div>
-                  <div className='mb-4'>
-                    <label
-                      className='block text-gray-700 text-sm font-bold mb-2'
-                      htmlFor='email'
-                    >
-                      Email:
-                    </label>
-                    <input
-                      className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
-                      id='email'
-                      type='email'
-                      placeholder='Enter your email'
-                      required
-                    />
-                  </div>
-                  <div className='mb-4'>
-                    <label
-                      className='block text-gray-700 text-sm font-bold mb-2'
-                      htmlFor='phone'
-                    >
-                      Phone:
-                    </label>
-                    <input
-                      className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
-                      id='phone'
-                      type='text'
-                      placeholder='Enter your phone number'
-                    />
-                  </div>
-                  <div className='mb-4'>
-                    <label
-                      className='block text-gray-700 text-sm font-bold mb-2'
-                      htmlFor='message'
-                    >
-                      Message:
-                    </label>
-                    <textarea
-                      className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 h-44 focus:outline-none focus:shadow-outline'
-                      id='message'
-                      placeholder='Enter your message'
-                    ></textarea>
-                  </div>
-                  <div>
-                    <button
-                      className='bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded-full w-full focus:outline-none focus:shadow-outline flex items-center justify-center'
-                      type='submit'
-                    >
-                      <i className='fas fa-paper-plane mr-2'></i> Send Message
-                    </button>
-                  </div>
-                </form>
-              </div>
+              <BookmarkButton property={property} />
+              <ShareButtons property={property} />
+              <PropertyContactForm property={property} />
             </aside>
           </div>
         </div>
diff --git a/components/BookmarkButton.jsx b/components/BookmarkButton.jsx
new file mode 100644
index 0000000..d134c87
--- /dev/null
+++ b/components/BookmarkButton.jsx
@@ -0,0 +1,11 @@
+import { FaBookmark } from 'react-icons/fa';
+
+const BookmarkButton = ({ property }) => {
+  return (
+    <button className='bg-blue-500 hover:bg-blue-600 text-white font-bold w-full py-2 px-4 rounded-full flex items-center justify-center'>
+      <FaBookmark className='mr-2' />
+      Bookmark Property
+    </button>
+  );
+};
+export default BookmarkButton;
diff --git a/components/PropertyContactForm.jsx b/components/PropertyContactForm.jsx
new file mode 100644
index 0000000..1f2decf
--- /dev/null
+++ b/components/PropertyContactForm.jsx
@@ -0,0 +1,81 @@
+import { FaPaperPlane } from 'react-icons/fa';
+
+const PropertyContactForm = ({ property }) => {
+  return (
+    <div className='bg-white p-6 rounded-lg shadow-md'>
+      <h3 className='text-xl font-bold mb-6'>Contact Property Manager</h3>
+      <form>
+        <div className='mb-4'>
+          <label
+            className='block text-gray-700 text-sm font-bold mb-2'
+            htmlFor='name'
+          >
+            Name:
+          </label>
+          <input
+            className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
+            id='name'
+            name='name'
+            type='text'
+            placeholder='Enter your name'
+            required
+          />
+        </div>
+        <div className='mb-4'>
+          <label
+            className='block text-gray-700 text-sm font-bold mb-2'
+            htmlFor='email'
+          >
+            Email:
+          </label>
+          <input
+            className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
+            id='email'
+            name='email'
+            type='email'
+            placeholder='Enter your email'
+            required
+          />
+        </div>
+        <div className='mb-4'>
+          <label
+            className='block text-gray-700 text-sm font-bold mb-2'
+            htmlFor='phone'
+          >
+            Phone:
+          </label>
+          <input
+            className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline'
+            id='phone'
+            name='phone'
+            type='text'
+            placeholder='Enter your phone number'
+          />
+        </div>
+        <div className='mb-4'>
+          <label
+            className='block text-gray-700 text-sm font-bold mb-2'
+            htmlFor='message'
+          >
+            Message:
+          </label>
+          <textarea
+            className='shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 h-44 focus:outline-none focus:shadow-outline'
+            id='message'
+            name='message'
+            placeholder='Enter your message'
+          ></textarea>
+        </div>
+        <div>
+          <button
+            className='bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded-full w-full focus:outline-none focus:shadow-outline flex items-center justify-center'
+            type='submit'
+          >
+            <FaPaperPlane className='mr-2' /> Send Message
+          </button>
+        </div>
+      </form>
+    </div>
+  );
+};
+export default PropertyContactForm;
diff --git a/components/ShareButtons.jsx b/components/ShareButtons.jsx
new file mode 100644
index 0000000..a1259fa
--- /dev/null
+++ b/components/ShareButtons.jsx
@@ -0,0 +1,10 @@
+import { FaShare } from 'react-icons/fa';
+
+const ShareButtons = ({ property }) => {
+  return (
+    <button className='bg-orange-500 hover:bg-orange-600 text-white font-bold w-full py-2 px-4 rounded-full flex items-center justify-center'>
+      <FaShare className='mr-2' /> Share Property
+    </button>
+  );
+};
+export default ShareButtons;