diff --git a/.gitignore b/.gitignore
index 2a738cb..dfa6613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@
 .env*.local
 
 # Python
+**/__pycache__/
 __pycache__/
 *.py[cod]
+*.pyc
 *.pyo
 *.pyd
 .Python
diff --git a/backend/market/management/commands/create_listing_offers.py b/backend/market/management/commands/create_listing_offers.py
new file mode 100644
index 0000000..4d60e09
--- /dev/null
+++ b/backend/market/management/commands/create_listing_offers.py
@@ -0,0 +1,121 @@
+from decimal import Decimal
+
+from django.contrib.auth import get_user_model
+from django.core.management.base import BaseCommand
+
+from market.models import Listing, Offer
+
+
+# Create two pending test offers on each listing sold by USER_ID.
+#  manage.py create_listing_offers <USER_ID>
+
+User = get_user_model()
+
+
+def _seed_two_buyers(stdout, style):
+    alice, _ = User.objects.get_or_create(
+        username="alice",
+        defaults={
+            "email": "alice@example.com",
+            "first_name": "Alice",
+            "last_name": "Johnson",
+            "phone_number": "+12155551234",
+            "phone_verified": True,
+        },
+    )
+    alice.set_password("testpassword123")
+    alice.save()
+
+    bob, _ = User.objects.get_or_create(
+        username="bob",
+        defaults={
+            "email": "bob@example.com",
+            "first_name": "Bob",
+            "last_name": "Williams",
+            "phone_number": "+12155555678",
+            "phone_verified": True,
+        },
+    )
+    bob.set_password("testpassword123")
+    bob.save()
+
+    stdout.write(style.SUCCESS("Buyers ready: Alice Johnson, Bob Williams"))
+    return alice, bob
+
+
+def _add_offers_to_listing(listing, alice, bob):
+    """Returns (created_count, skipped_count) for this listing."""
+    _, created_alice = Offer.objects.get_or_create(
+        user=alice,
+        listing=listing,
+        defaults={
+            "offered_price": Decimal("40.00"),
+            "message": "Would you take $40? I can pick up today.",
+        },
+    )
+
+    _, created_bob = Offer.objects.get_or_create(
+        user=bob,
+        listing=listing,
+        defaults={
+            "offered_price": Decimal("45.00"),
+            "message": "Interested! Is the price negotiable?",
+        },
+    )
+
+    new_count = int(created_alice) + int(created_bob)
+    return new_count, 2 - new_count
+
+
+class Command(BaseCommand):
+    help = "Create two pending test offers on each listing for USER_ID."
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "user_id",
+            type=int,
+            help="Seller's User.id; offers are added to all of their listings.",
+        )
+
+    def handle(self, *args, **options):
+        user_id = options["user_id"]
+
+        try:
+            seller = User.objects.get(pk=user_id)
+        except User.DoesNotExist:
+            self.stdout.write(self.style.ERROR(f"No user with id={user_id}"))
+            return
+
+        alice, bob = _seed_two_buyers(self.stdout, self.style)
+
+        listings = list(Listing.objects.filter(seller=seller).order_by("id"))
+        if not listings:
+            self.stdout.write(
+                self.style.WARNING(
+                    f"User {seller.username} (id={user_id}) has no listings."
+                )
+            )
+            return
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Seeding offers on {len(listings)} listing(s) for "
+                f"{seller.username} (id={user_id})"
+            )
+        )
+
+        total_created = 0
+        total_skipped = 0
+        for listing in listings:
+            c, s = _add_offers_to_listing(listing, alice, bob)
+            total_created += c
+            total_skipped += s
+            self.stdout.write(
+                f"  listing id={listing.id} {listing.title!r}: +{c} new, {s} skipped"
+            )
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"\nDone! Created {total_created} offers, "
+                f"skipped {total_skipped} (already existed)."
+            )
+        )
diff --git a/backend/market/migrations/0005_offer_status.py b/backend/market/migrations/0005_offer_status.py
new file mode 100644
index 0000000..1c467aa
--- /dev/null
+++ b/backend/market/migrations/0005_offer_status.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.2 on 2026-03-27 21:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("market", "0004_rename_address_sublet_street_address_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="offer",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("pending", "Pending"),
+                    ("accepted", "Accepted"),
+                    ("rejected", "Rejected"),
+                ],
+                default="pending",
+                max_length=10,
+            ),
+        ),
+    ]
diff --git a/backend/market/models.py b/backend/market/models.py
index 7812865..341176e 100644
--- a/backend/market/models.py
+++ b/backend/market/models.py
@@ -22,6 +22,11 @@ class User(AbstractUser):
 
 
 class Offer(models.Model):
+    class Status(models.TextChoices):
+        PENDING = "pending", "Pending"
+        ACCEPTED = "accepted", "Accepted"
+        REJECTED = "rejected", "Rejected"
+
     class Meta:
         constraints = [
             models.UniqueConstraint(
@@ -42,11 +47,15 @@ class Meta:
         max_digits=10, decimal_places=2, validators=[MinValueValidator(0)]
     )
     message = models.TextField(max_length=500, blank=True)
+    status = models.CharField(
+        max_length=10, choices=Status.choices, default=Status.PENDING
+    )
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"Offer for {self.listing} made by {self.user}"
 
+
 class Category(models.Model):
     name = models.CharField(max_length=100, unique=True)
 
@@ -170,7 +179,8 @@ def _calculate_approximate_location(self, latitude, longitude):
     def approximate_location(self):
         if self.latitude is not None and self.longitude is not None:
             approximate_location = self._calculate_approximate_location(
-                self.latitude, self.longitude)
+                self.latitude, self.longitude
+            )
             return approximate_location
         return None, None
 
diff --git a/backend/market/permissions.py b/backend/market/permissions.py
index 4dc214a..c7828cb 100644
--- a/backend/market/permissions.py
+++ b/backend/market/permissions.py
@@ -43,16 +43,27 @@ def has_object_permission(self, request, view, obj):
         )
 
 
-class OfferOwnerPermission(permissions.BasePermission):
+class ListingOwnerOffersPermission(permissions.BasePermission):
     """
-    Custom permission to allow owner of an offer to delete it.
+    The listing seller may act on an Offer for their listing.
+    Use only on views/actions where that is intended (e.g. list offers, PATCH status).
     """
 
     def has_permission(self, request, view):
         return request.user.is_authenticated
 
     def has_object_permission(self, request, view, obj):
-        if request.method in permissions.SAFE_METHODS:  # GET
-            return obj.listing.seller == request.user
+        return obj.listing.seller == request.user
+
+
+class OfferOwnerPermission(permissions.BasePermission):
+    """
+    The user who created the offer may act on that Offer.
+    Use only on buyer-facing views (e.g. withdraw offer, PATCH details).
+    """
 
-        return obj.user == request.user
+    def has_permission(self, request, view):
+        return request.user.is_authenticated
+
+    def has_object_permission(self, request, view, obj):
+        return obj.user_id == request.user.id
diff --git a/backend/market/serializers.py b/backend/market/serializers.py
index c129131..ab573db 100644
--- a/backend/market/serializers.py
+++ b/backend/market/serializers.py
@@ -1,4 +1,3 @@
-
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError as ModelValidationError
 from profanity_check import predict
@@ -47,14 +46,49 @@ class OfferSerializer(ModelSerializer):
 
     class Meta:
         model = Offer
-        fields = ["id", "user", "listing", "offered_price", "message", "created_at"]
-        read_only_fields = ["id", "created_at", "user"]
+        fields = [
+            "id",
+            "user",
+            "listing",
+            "offered_price",
+            "message",
+            "status",
+            "created_at",
+        ]
+        read_only_fields = ["id", "created_at", "user", "status"]
 
     def create(self, validated_data):
         validated_data["user"] = self.context["request"].user
         return super().create(validated_data)
 
 
+class OfferStatusSerializer(ModelSerializer):
+    class Meta:
+        model = Offer
+        fields = ["id", "status"]
+        read_only_fields = ["id"]
+
+    def validate_status(self, value):
+        valid_statuses = [choice[0] for choice in Offer.Status.choices]
+        if value not in valid_statuses:
+            raise ValidationError(
+                f"Invalid status. Must be one of: {', '.join(valid_statuses)}"
+            )
+        return value
+
+
+class OfferDetailsSerializer(ModelSerializer):
+    """
+    Allows the offer owner to edit the offer's offered_price and message.
+    Status is intentionally read-only (managed by the listing owner).
+    """
+
+    class Meta:
+        model = Offer
+        fields = ["id", "offered_price", "message", "status"]
+        read_only_fields = ["id", "status"]
+
+
 # Create/Update Image Serializer
 class ListingImageSerializer(ModelSerializer):
     image = ImageField(write_only=True, required=False, allow_null=True)
@@ -126,6 +160,7 @@ def get_longitude(self, obj):
             return float(approx_lon)
         return None
 
+
 # Unified serializer for all listing types (Items and Sublets); used for CRUD operations
 class ListingSerializer(ListingTypeMixin, ModelSerializer):
     LISTING_TYPE_CONFIG = {
@@ -291,7 +326,6 @@ def _create_sublet(self, validated_data, additional_data):
         latitude = additional_data.get("latitude")
         longitude = additional_data.get("longitude")
 
-
         if latitude is not None:
             latitude = float(latitude)
         if longitude is not None:
diff --git a/backend/market/urls.py b/backend/market/urls.py
index b00a13c..04028a1 100644
--- a/backend/market/urls.py
+++ b/backend/market/urls.py
@@ -6,9 +6,12 @@
     DeleteImage,
     Favorites,
     Listings,
+    MyOfferForListing,
+    OfferDetailsUpdate,
     Offers,
     OffersMade,
     OffersReceived,
+    OfferStatusUpdate,
     Tags,
     UserFavorites,
     get_current_user,
@@ -46,9 +49,28 @@
     # post: create an offer for an listing
     # delete: delete an offer for an listing
     path(
-        "listings/<listing_id>/offers/",
+        "listings/<int:listing_id>/offers/",
         Offers.as_view({"get": "list", "post": "create", "delete": "destroy"}),
     ),
+    # Current user's offer for an individual listing
+    # (Returns 404 when the user has no offer for that listing.)
+    path(
+        "listings/<int:listing_id>/offers/mine/",
+        MyOfferForListing.as_view(),
+        name="offers-mine",
+    ),
+    # Update offer status only (PATCH; listing seller or superuser)
+    path(
+        "offers/<int:offer_id>/status/",
+        OfferStatusUpdate.as_view(),
+        name="offer-status",
+    ),
+    # Update offer offered_price + message (PATCH; offer owner or superuser)
+    path(
+        "offers/<int:offer_id>/details/",
+        OfferDetailsUpdate.as_view(),
+        name="offer-details",
+    ),
     # Image Creation
     path("listings/<listing_id>/images/", CreateImages.as_view()),
     # Image Deletion
diff --git a/backend/market/views.py b/backend/market/views.py
index d61d749..5f6dbf9 100644
--- a/backend/market/views.py
+++ b/backend/market/views.py
@@ -9,6 +9,8 @@
     CreateAPIView,
     DestroyAPIView,
     ListAPIView,
+    RetrieveAPIView,
+    UpdateAPIView,
     get_object_or_404,
 )
 from rest_framework.parsers import FormParser, MultiPartParser
@@ -21,6 +23,7 @@
 from market.permissions import (
     IsSuperUser,
     ListingImageOwnerPermission,
+    ListingOwnerOffersPermission,
     ListingOwnerPermission,
     OfferOwnerPermission,
 )
@@ -30,7 +33,9 @@
     ListingSerializer,
     ListingSerializerList,
     ListingSerializerPublic,
+    OfferDetailsSerializer,
     OfferSerializer,
+    OfferStatusSerializer,
     TagSerializer,
     UserSerializer,
 )
@@ -192,6 +197,11 @@ def retrieve(self, request, *args, **kwargs):
         serializer = serializer_class(instance, context={"request": request})
         return Response(serializer.data)
 
+    def destroy(self, request, *args, **kwargs):
+        instance = self.get_object()
+        self.perform_destroy(instance)
+        return Response({"deleted": True}, status=status.HTTP_200_OK)
+
 
 # TODO: This doesn't use CreateAPIView's functionality
 # since we overrode the create method.
@@ -296,10 +306,18 @@ class Offers(viewsets.ModelViewSet):
     Delete the offer between the user and the listing matching the ID.
     """
 
-    permission_classes = [OfferOwnerPermission | IsSuperUser]
     serializer_class = OfferSerializer
     pagination_class = PageSizeOffsetPagination
 
+    def get_permissions(self):
+        if self.action == "create":
+            return [IsAuthenticated()]
+        if self.action == "destroy":
+            return [(OfferOwnerPermission | IsSuperUser)()]
+        if self.action == "list":
+            return [(ListingOwnerOffersPermission | IsSuperUser)()]
+        return [(ListingOwnerOffersPermission | IsSuperUser)()]
+
     def get_queryset(self):
         if Listing.objects.filter(pk=int(self.kwargs["listing_id"])).exists():
             return Offer.objects.filter(
@@ -332,7 +350,7 @@ def destroy(self, request, *args, **kwargs):
         obj = get_object_or_404(queryset, **filter)
         self.check_object_permissions(self.request, obj)
         self.perform_destroy(obj)
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response({"deleted": True}, status=status.HTTP_200_OK)
 
     def list(self, request, *args, **kwargs):
         if not Listing.objects.filter(pk=int(self.kwargs["listing_id"])).exists():
@@ -342,6 +360,56 @@ def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
 
+class OfferStatusUpdate(UpdateAPIView):
+    """Allow the listing seller (or superuser) to update an offer's status (PATCH)."""
+
+    queryset = Offer.objects.all()
+    serializer_class = OfferStatusSerializer
+    permission_classes = [ListingOwnerOffersPermission | IsSuperUser]
+    lookup_url_kwarg = "offer_id"
+    http_method_names = ["patch"]
+
+    def partial_update(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
+        serializer.is_valid(raise_exception=True)
+        self.perform_update(serializer)
+        return Response(OfferSerializer(instance).data)
+
+
+class OfferDetailsUpdate(UpdateAPIView):
+    """Offer owner (or superuser) may PATCH offered_price and message."""
+
+    queryset = Offer.objects.all()
+    serializer_class = OfferDetailsSerializer
+    permission_classes = [OfferOwnerPermission | IsSuperUser]
+    lookup_url_kwarg = "offer_id"
+    http_method_names = ["patch"]
+
+    def partial_update(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance, data=request.data, partial=True)
+        serializer.is_valid(raise_exception=True)
+        self.perform_update(serializer)
+        return Response(OfferSerializer(instance).data)
+
+
+class MyOfferForListing(RetrieveAPIView):
+    """Return the authenticated user's offer for a given listing (GET)."""
+
+    serializer_class = OfferSerializer
+    permission_classes = [IsAuthenticated]
+
+    def get_object(self):
+        offer = Offer.objects.filter(
+            listing_id=self.kwargs["listing_id"],
+            user=self.request.user,
+        ).first()
+        if offer is None:
+            raise exceptions.NotFound("No offer for this listing")
+        return offer
+
+
 @api_view(["POST"])
 @permission_classes([IsAuthenticated])
 def send_verification_code(request):
diff --git a/backend/tests/market/__pycache__/__init__.cpython-311.pyc b/backend/tests/market/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index b421b5a..0000000
Binary files a/backend/tests/market/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/backend/tests/market/__pycache__/test_market.cpython-311.pyc b/backend/tests/market/__pycache__/test_market.cpython-311.pyc
deleted file mode 100644
index 33d9aef..0000000
Binary files a/backend/tests/market/__pycache__/test_market.cpython-311.pyc and /dev/null differ
diff --git a/backend/tests/market/__pycache__/test_market_2.cpython-311.pyc b/backend/tests/market/__pycache__/test_market_2.cpython-311.pyc
deleted file mode 100644
index 2b4ab09..0000000
Binary files a/backend/tests/market/__pycache__/test_market_2.cpython-311.pyc and /dev/null differ
diff --git a/backend/tests/market/__pycache__/test_permissions.cpython-311.pyc b/backend/tests/market/__pycache__/test_permissions.cpython-311.pyc
deleted file mode 100644
index 317cfe2..0000000
Binary files a/backend/tests/market/__pycache__/test_permissions.cpython-311.pyc and /dev/null differ
diff --git a/backend/tests/market/test_market.py b/backend/tests/market/test_market.py
index 5318a81..c938793 100644
--- a/backend/tests/market/test_market.py
+++ b/backend/tests/market/test_market.py
@@ -1369,7 +1369,8 @@ def test_create_offer_existing(self):
     def test_delete_offer(self):
         self.assertTrue(Offer.objects.filter(id=self.offers[0].id).exists())
         response = self.client.delete(f"/market/listings/{self.items[1].id}/offers/")
-        self.assertEqual(response.status_code, 204)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {"deleted": True})
         self.assertFalse(Offer.objects.filter(id=self.offers[0].id).exists())
 
     def test_delete_offer_nonexistent(self):
diff --git a/frontend/app/edit/item/[id]/page.tsx b/frontend/app/edit/item/[id]/page.tsx
new file mode 100644
index 0000000..ffaa0de
--- /dev/null
+++ b/frontend/app/edit/item/[id]/page.tsx
@@ -0,0 +1,26 @@
+import Link from "next/link";
+import { notFound } from "next/navigation";
+import { BackButton } from "@/components/listings/detail/BackButton";
+import { ItemForm } from "@/components/listings/form/ItemForm";
+import { getCurrentUser, getListingOrNotFound } from "@/lib/actions";
+
+export default async function EditItemPage({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  const [listing, currentUser] = await Promise.all([getListingOrNotFound(id), getCurrentUser()]);
+
+  if (listing.listing_type !== "item" || currentUser.id !== listing.seller.id) {
+    notFound();
+  }
+
+  return (
+    <div className="container mx-auto w-full max-w-[96rem] px-12 pt-4 pb-12">
+      <Link href={`/items/${listing.id}`}>
+        <BackButton />
+      </Link>
+
+      <h1 className="mb-8 pt-2 text-3xl font-bold">Edit Item</h1>
+
+      <ItemForm initialListing={listing} />
+    </div>
+  );
+}
diff --git a/frontend/app/edit/sublet/[id]/page.tsx b/frontend/app/edit/sublet/[id]/page.tsx
new file mode 100644
index 0000000..287e609
--- /dev/null
+++ b/frontend/app/edit/sublet/[id]/page.tsx
@@ -0,0 +1,26 @@
+import Link from "next/link";
+import { notFound } from "next/navigation";
+import { BackButton } from "@/components/listings/detail/BackButton";
+import { SubletForm } from "@/components/listings/form/SubletForm";
+import { getCurrentUser, getListingOrNotFound } from "@/lib/actions";
+
+export default async function EditSubletPage({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  const [listing, currentUser] = await Promise.all([getListingOrNotFound(id), getCurrentUser()]);
+
+  if (listing.listing_type !== "sublet" || currentUser.id !== listing.seller.id) {
+    notFound();
+  }
+
+  return (
+    <div className="container mx-auto w-full max-w-[96rem] px-12 pt-6 pb-12">
+      <Link href={`/sublets/${listing.id}`}>
+        <BackButton />
+      </Link>
+
+      <h1 className="mb-8 pt-2 text-3xl font-bold">Edit Sublet</h1>
+
+      <SubletForm initialListing={listing} />
+    </div>
+  );
+}
diff --git a/frontend/app/items/[id]/edit/page.tsx b/frontend/app/items/[id]/edit/page.tsx
new file mode 100644
index 0000000..080e962
--- /dev/null
+++ b/frontend/app/items/[id]/edit/page.tsx
@@ -0,0 +1,6 @@
+import { redirect } from "next/navigation";
+
+export default async function EditItemPage({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  redirect(`/edit/item/${id}`);
+}
diff --git a/frontend/app/items/[id]/page.tsx b/frontend/app/items/[id]/page.tsx
index 464b8ac..740f3b6 100644
--- a/frontend/app/items/[id]/page.tsx
+++ b/frontend/app/items/[id]/page.tsx
@@ -1,20 +1,33 @@
 import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { ListingDetail } from "@/components/listings/detail/ListingDetail";
-import { getListingOrNotFound } from "@/lib/actions";
+import {
+  getCurrentUser,
+  getListingOrNotFound,
+  getMyOfferForListing,
+  getOffersReceivedForListing,
+} from "@/lib/actions";
 import { queryKeys } from "@/lib/queryKeys";
 
 export default async function ItemPage({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
-  const item = await getListingOrNotFound(id);
+  const [item, currentUser] = await Promise.all([getListingOrNotFound(id), getCurrentUser()]);
+  const isOwner = currentUser?.id === item.seller.id;
+  const offersReceivedResponse = isOwner ? await getOffersReceivedForListing(item.id) : null;
+  const offersReceived = offersReceivedResponse?.results ?? [];
+  const myOfferGiven = !isOwner ? await getMyOfferForListing(item.id) : null;
 
-  // seed the cache with the already-fetched listing (no additional fetch).
-  // We use setQueryData instead of prefetchQuery to preserve the notFound() throw above.
   const queryClient = new QueryClient();
   queryClient.setQueryData(queryKeys.listing(item.id), item);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <ListingDetail listingId={item.id} />
+      <ListingDetail
+        listing={item}
+        initialIsFavorited={item.is_favorited ?? false}
+        offersReceived={offersReceived}
+        isOwner={isOwner}
+        myOfferGiven={myOfferGiven}
+      />
     </HydrationBoundary>
   );
 }
diff --git a/frontend/app/sublets/[id]/edit/page.tsx b/frontend/app/sublets/[id]/edit/page.tsx
new file mode 100644
index 0000000..48af146
--- /dev/null
+++ b/frontend/app/sublets/[id]/edit/page.tsx
@@ -0,0 +1,6 @@
+import { redirect } from "next/navigation";
+
+export default async function EditSubletPage({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  redirect(`/edit/sublet/${id}`);
+}
diff --git a/frontend/app/sublets/[id]/page.tsx b/frontend/app/sublets/[id]/page.tsx
index f0d101e..0ecae7d 100644
--- a/frontend/app/sublets/[id]/page.tsx
+++ b/frontend/app/sublets/[id]/page.tsx
@@ -1,20 +1,33 @@
 import { QueryClient, dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { ListingDetail } from "@/components/listings/detail/ListingDetail";
-import { getListingOrNotFound } from "@/lib/actions";
+import {
+  getCurrentUser,
+  getListingOrNotFound,
+  getMyOfferForListing,
+  getOffersReceivedForListing,
+} from "@/lib/actions";
 import { queryKeys } from "@/lib/queryKeys";
 
 export default async function SubletPage({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
-  const sublet = await getListingOrNotFound(id);
+  const [sublet, currentUser] = await Promise.all([getListingOrNotFound(id), getCurrentUser()]);
+  const isOwner = currentUser?.id === sublet.seller.id;
+  const offersReceivedResponse = isOwner ? await getOffersReceivedForListing(sublet.id) : null;
+  const offersReceived = offersReceivedResponse?.results ?? [];
+  const myOfferGiven = !isOwner ? await getMyOfferForListing(sublet.id) : null;
 
-  // seed the cache with the already-fetched listing (no additional fetch).
-  // We use setQueryData instead of prefetchQuery to preserve the notFound() throw above.
   const queryClient = new QueryClient();
   queryClient.setQueryData(queryKeys.listing(sublet.id), sublet);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <ListingDetail listingId={sublet.id} />
+      <ListingDetail
+        listing={sublet}
+        initialIsFavorited={sublet.is_favorited ?? false}
+        offersReceived={offersReceived}
+        isOwner={isOwner}
+        myOfferGiven={myOfferGiven}
+      />
     </HydrationBoundary>
   );
 }
diff --git a/frontend/components/listings/detail/DeleteListing.tsx b/frontend/components/listings/detail/DeleteListing.tsx
new file mode 100644
index 0000000..168d646
--- /dev/null
+++ b/frontend/components/listings/detail/DeleteListing.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { Button } from "@/components/ui/button";
+import { deleteListing } from "@/lib/actions";
+import type { Item, Sublet } from "@/lib/types";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+
+interface Props {
+  listing: Item | Sublet;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export const DeleteListing = ({ listing, open, onOpenChange }: Props) => {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+  const typeLabel = listing.listing_type === "sublet" ? "Sublet" : "Item";
+
+  const deleteMutation = useMutation({
+    mutationFn: () => deleteListing(listing.id),
+    onSuccess: () => {
+      const listKey = listing.listing_type === "sublet" ? "sublets" : "items";
+      queryClient.invalidateQueries({ queryKey: [listKey] });
+      queryClient.removeQueries({ queryKey: ["listing", listing.id] });
+      router.push(listing.listing_type === "sublet" ? "/sublets" : "/items");
+    },
+    onError: () => {
+      onOpenChange(false);
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Delete {typeLabel}</DialogTitle>
+          <DialogDescription>
+            Are you sure you want to delete this {typeLabel.toLowerCase()}?
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button
+            className="cursor-pointer"
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+          >
+            Cancel
+          </Button>
+          <Button
+            className="cursor-pointer bg-red-500 text-white hover:bg-red-600"
+            onClick={() => deleteMutation.mutate()}
+            disabled={deleteMutation.isPending}
+          >
+            {deleteMutation.isPending ? "Deleting..." : `Delete ${typeLabel}`}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/frontend/components/listings/detail/ListingActions.tsx b/frontend/components/listings/detail/ListingActions.tsx
index 1fc3c9e..ec4a532 100644
--- a/frontend/components/listings/detail/ListingActions.tsx
+++ b/frontend/components/listings/detail/ListingActions.tsx
@@ -1,53 +1,93 @@
 "use client";
 
 import { useState } from "react";
+import Link from "next/link";
 import { DollarSign } from "lucide-react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { MakeOfferModal } from "@/components/listings/offer/MakeOfferModal";
 import { PhoneInputModal } from "@/components/listings/offer/PhoneInputModal";
 import { VerificationCodeModal } from "@/components/listings/offer/VerificationCodeModal";
+import { DeleteListing } from "@/components/listings/detail/DeleteListing";
 import { Button } from "@/components/ui/button";
-import { getPhoneStatus } from "@/lib/actions";
+import { getMyOfferForListing, getPhoneStatus } from "@/lib/actions";
+import type { Item, Offer, Sublet } from "@/lib/types";
 
 interface Props {
-  listingId: number;
+  listing: Item | Sublet;
   listingPrice: number;
   listingOwnerLabel: string;
   priceLabel?: string;
+  isOwner?: boolean;
+  initialMyOffer?: Offer | null;
 }
 
 type ModalState = "none" | "phone-input" | "verification" | "offer";
 
 export const ListingActions = ({
-  listingId,
+  listing,
   listingPrice,
   priceLabel,
   listingOwnerLabel,
+  isOwner = false,
+  initialMyOffer = null,
 }: Props) => {
   const [modalState, setModalState] = useState<ModalState>("none");
   const [pendingPhoneNumber, setPendingPhoneNumber] = useState<string>("");
   const [isChangingPhone, setIsChangingPhone] = useState<boolean>(false);
+  const [isDeleteOpen, setIsDeleteOpen] = useState(false);
 
   const queryClient = useQueryClient();
 
   const { data: phoneStatus } = useQuery({
     queryKey: ["phoneStatus"],
     queryFn: getPhoneStatus,
+    enabled: !isOwner,
   });
 
+  const { data: myOffer, isLoading: isLoadingMyOffer } = useQuery({
+    queryKey: ["myOffer", listing.id],
+    queryFn: () => getMyOfferForListing(listing.id),
+    enabled: !isOwner,
+    initialData: initialMyOffer,
+  });
+
+  if (isOwner) {
+    const typeLabel = listing.listing_type === "sublet" ? "Sublet" : "Item";
+    const editHref =
+      listing.listing_type === "sublet" ? `/edit/sublet/${listing.id}` : `/edit/item/${listing.id}`;
+
+    return (
+      <>
+        <div className="flex items-center justify-end gap-2">
+          <Button className="cursor-pointer" variant="outline" asChild>
+            <Link href={editHref}>Edit Listing</Link>
+          </Button>
+          <Button
+            className="cursor-pointer bg-red-500 text-white hover:bg-red-600"
+            onClick={() => setIsDeleteOpen(true)}
+          >
+            Delete {typeLabel}
+          </Button>
+        </div>
+        <DeleteListing
+          listing={listing}
+          open={isDeleteOpen}
+          onOpenChange={setIsDeleteOpen}
+        />
+      </>
+    );
+  }
+
   const handleMakeOfferClick = () => {
     if (!phoneStatus) return;
 
     if (!phoneStatus.phone_number || !phoneStatus.phone_verified) {
-      // no phone number or not verified - start with phone input
-      // if we already have a pending phone number, go to verification
       if (pendingPhoneNumber) {
         setModalState("verification");
       } else {
         setModalState("phone-input");
       }
     } else {
-      // phone verified - show create offer modal
       setModalState("offer");
     }
   };
@@ -71,13 +111,15 @@ export const ListingActions = ({
 
   return (
     <>
-      <Button
-        onClick={handleMakeOfferClick}
-        className="bg-brand hover:bg-brand-hover h-12 w-full cursor-pointer text-base text-white"
-      >
-        <DollarSign className="mr-2 h-5 w-5" />
-        Make an Offer
-      </Button>
+      {!isLoadingMyOffer && !myOffer && (
+        <Button
+          onClick={handleMakeOfferClick}
+          className="bg-brand hover:bg-brand-hover h-12 w-full cursor-pointer text-base text-white"
+        >
+          <DollarSign className="mr-2 h-5 w-5" />
+          Make an Offer
+        </Button>
+      )}
 
       <PhoneInputModal
         isOpen={modalState === "phone-input"}
@@ -97,7 +139,7 @@ export const ListingActions = ({
       <MakeOfferModal
         isOpen={modalState === "offer"}
         onClose={() => setModalState("none")}
-        listingId={listingId}
+        listingId={listing.id}
         listingPrice={listingPrice}
         listingOwnerLabel={listingOwnerLabel}
         priceLabel={priceLabel}
diff --git a/frontend/components/listings/detail/ListingDetail.tsx b/frontend/components/listings/detail/ListingDetail.tsx
index 358023e..2c8f1ef 100644
--- a/frontend/components/listings/detail/ListingDetail.tsx
+++ b/frontend/components/listings/detail/ListingDetail.tsx
@@ -1,39 +1,64 @@
 "use client";
 
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { addToUsersFavorites, deleteFromUsersFavorites, getListing } from "@/lib/actions";
-import { queryKeys } from "@/lib/queryKeys";
 import { Heart, Share } from "lucide-react";
-import { Item, Sublet } from "@/lib/types";
-import { ListingActions } from "@/components/listings/detail/ListingActions";
+import { Item, Offer, Sublet } from "@/lib/types";
 import { ListingImageGallery } from "@/components/listings/detail/ListingImageGallery";
 import { ListingInfo } from "@/components/listings/detail/ListingInfo";
 import { UserCard } from "@/components/listings/detail/UserCard";
+import { ListingActions } from "@/components/listings/detail/ListingActions";
+import { OffersPanel } from "@/components/listings/offer/OffersPanel";
 import { BackButton } from "@/components/listings/detail/BackButton";
 import { SubletMap } from "@/components/listings/detail/SubletMap";
+import {
+  addToUsersFavorites,
+  deleteFromUsersFavorites,
+  getListing,
+} from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 
 interface Props {
-  listingId: number;
+  listing: Item | Sublet;
+  initialIsFavorited: boolean;
+  offersReceived: Offer[];
+  isOwner: boolean;
+  myOfferGiven?: Offer | null;
 }
 
-export const ListingDetail = ({ listingId }: Props) => {
+export const ListingDetail = ({
+  listing,
+  initialIsFavorited,
+  offersReceived,
+  isOwner,
+  myOfferGiven = null,
+}: Props) => {
   const queryClient = useQueryClient();
-  const queryKey = queryKeys.listing(listingId);
+  const queryKey = queryKeys.listing(listing.id);
 
-  const { data: listing } = useQuery({
+  const listingQuery = useQuery({
     queryKey,
-    queryFn: () => getListing(String(listingId)),
+    queryFn: () => getListing(listing.id.toString()),
+    initialData: {
+      ...listing,
+      is_favorited: listing.is_favorited ?? initialIsFavorited,
+    },
+    staleTime: Infinity,
   });
+  const listingData = listingQuery.data;
 
-  const isFavorited = listing?.is_favorited ?? false;
+  const listingType = listingData.listing_type;
+  const priceLabel = listingType === "sublet" ? "/mo" : undefined;
+  const listingOwnerLabel = listingType === "item" ? "Seller" : "Owner";
+
+  const isFavorited = listingData.is_favorited ?? false;
 
   const toggleFavoriteMutation = useMutation({
     meta: { suppressErrorToast: true }, // since it's noisy to show error toast on top of optimistic update
     mutationFn: async (shouldFavorite: boolean) => {
       if (shouldFavorite) {
-        await addToUsersFavorites(listingId);
+        await addToUsersFavorites(listingData.id);
       } else {
-        await deleteFromUsersFavorites(listingId);
+        await deleteFromUsersFavorites(listingData.id);
       }
     },
     onMutate: async (shouldFavorite: boolean) => {
@@ -55,13 +80,8 @@ export const ListingDetail = ({ listingId }: Props) => {
     toggleFavoriteMutation.mutate(!isFavorited);
   };
 
-  if (!listing) return null;
-
-  const listingType = listing.listing_type;
-  const priceLabel = listingType === "sublet" ? "/mo" : undefined;
-  const listingOwnerLabel = listingType === "item" ? "Seller" : "Owner";
-
-  const subletCoords = listingType === "sublet" ? listing.additional_data : null;
+  const subletCoords =
+    listingData.listing_type === "sublet" ? listingData.additional_data : null;
   const hasLocation = subletCoords?.latitude != null && subletCoords?.longitude != null;
 
   return (
@@ -82,33 +102,41 @@ export const ListingDetail = ({ listingId }: Props) => {
         </div>
       </div>
       <div className="grid grid-cols-1 gap-8 lg:grid-cols-[minmax(0,1fr)_minmax(0,1fr)]">
-        <ListingImageGallery images={listing.images} />
+        <ListingImageGallery images={listingData.images} />
         <div className="space-y-6">
           <ListingInfo
-            title={listing.title}
-            price={listing.price}
-            description={listing.description}
+            title={listingData.title}
+            price={listingData.price}
+            description={listingData.description}
             priceLabel={priceLabel}
-            {...listing.additional_data}
+            {...listingData.additional_data}
           />
-          <UserCard user={listing.seller} label={listingOwnerLabel} />
+          <UserCard user={listingData.seller} label={listingOwnerLabel} />
           {hasLocation && (
             <div className="space-y-3">
               <div>
                 <h2 className="text-lg font-semibold">{"Where you'll be living"}</h2>
                 <p className="text-sm text-gray-500">
-                  Approximate location shown. The exact location will be shared once you connect
-                  with the owner.
+                  Approximate location shown. The exact location will be shared once you connect with
+                  the owner.
                 </p>
               </div>
-              <SubletMap latitude={subletCoords.latitude!} longitude={subletCoords.longitude!} />
+              <SubletMap latitude={subletCoords!.latitude!} longitude={subletCoords!.longitude!} />
             </div>
           )}
           <ListingActions
-            listingId={listing.id}
-            listingPrice={listing.price}
+            listing={listingData}
+            listingPrice={listingData.price}
             priceLabel={priceLabel}
             listingOwnerLabel={listingOwnerLabel}
+            isOwner={isOwner}
+            initialMyOffer={myOfferGiven}
+          />
+          <OffersPanel
+            isOwner={isOwner}
+            offersReceived={offersReceived}
+            myOfferGiven={myOfferGiven}
+            listingId={listingData.id}
           />
         </div>
       </div>
diff --git a/frontend/components/listings/form/ItemForm.tsx b/frontend/components/listings/form/ItemForm.tsx
index bd814f2..5b2203d 100644
--- a/frontend/components/listings/form/ItemForm.tsx
+++ b/frontend/components/listings/form/ItemForm.tsx
@@ -9,18 +9,23 @@ import { FormSelect } from "@/components/common/FormSelect";
 import { BaseListingForm } from "@/components/listings/form/BaseListingForm";
 import { ListingFormShell } from "@/components/listings/form/ListingFormShell";
 import { useImageUpload } from "@/hooks/useImageUpload";
-import { createListing } from "@/lib/actions";
+import { createListing, updateListing } from "@/lib/actions";
 import { CATEGORY_OPTIONS, CONDITION_OPTIONS } from "@/lib/constants";
 import { parsePriceString } from "@/lib/utils";
 import { type CreateItemFormData, createItemSchema } from "@/lib/validations";
-import type { CreateItemPayload } from "@/lib/types";
+import type { CreateItemPayload, Item, UpdateItemPayload } from "@/lib/types";
 
 const DISPLAY_LABEL = "Item";
 const EXAMPLE_TITLE = "e.g., Nike Air Force 1";
 
-export function ItemForm() {
+type ItemFormProps = {
+  initialListing?: Item;
+};
+
+export function ItemForm({ initialListing }: ItemFormProps) {
   const router = useRouter();
   const queryClient = useQueryClient();
+  const isEditMode = Boolean(initialListing);
 
   const {
     control,
@@ -32,12 +37,12 @@ export function ItemForm() {
     mode: "onBlur",
     reValidateMode: "onChange",
     defaultValues: {
-      title: "",
-      price: "",
-      description: "",
+      title: initialListing?.title ?? "",
+      price: initialListing ? String(initialListing.price) : "",
+      description: initialListing?.description ?? "",
       tags: [],
-      condition: undefined,
-      category: undefined,
+      condition: initialListing?.additional_data.condition,
+      category: initialListing?.additional_data.category,
     },
   });
 
@@ -45,30 +50,51 @@ export function ItemForm() {
     maxFiles: 10,
     maxSizeBytes: 10 * 1024 * 1024,
     onError: (message) => toast.error(message),
+    initialUrls: initialListing?.images,
   });
 
   const { mutate, isPending } = useMutation({
-    mutationFn: createListing,
+    mutationFn: (payload: CreateItemPayload | UpdateItemPayload) =>
+      isEditMode && initialListing
+        ? updateListing(initialListing.id, payload as UpdateItemPayload)
+        : createListing(payload as CreateItemPayload),
     onSuccess: (data) => {
-      toast.success(`${DISPLAY_LABEL} created successfully!`);
+      toast.success(`${DISPLAY_LABEL} ${isEditMode ? "updated" : "created"} successfully!`);
+      if (isEditMode) {
+        queryClient.invalidateQueries({ queryKey: ["listing", initialListing?.id] });
+      }
       queryClient.invalidateQueries({ queryKey: ["items"] });
-      reset();
-      imageUpload.clearImages();
+      if (!isEditMode) {
+        reset();
+        imageUpload.clearImages();
+      }
       router.replace(`/items/${data.id}`);
     },
   });
 
   const onSubmit = (data: CreateItemFormData) => {
-    const payload: CreateItemPayload = {
-      title: data.title,
-      description: data.description,
-      price: String(parsePriceString(data.price)),
-      listing_type: "item",
-      additional_data: {
-        condition: data.condition,
-        category: data.category,
-      },
-    };
+    const parsedPrice = parsePriceString(data.price);
+    const payload: CreateItemPayload | UpdateItemPayload = isEditMode
+      ? {
+          title: data.title,
+          description: data.description,
+          price: parsedPrice,
+          listing_type: "item",
+          additional_data: {
+            condition: data.condition,
+            category: data.category,
+          },
+        }
+      : {
+          title: data.title,
+          description: data.description,
+          price: String(parsedPrice),
+          listing_type: "item",
+          additional_data: {
+            condition: data.condition,
+            category: data.category,
+          },
+        };
     mutate(payload);
   };
 
@@ -116,6 +142,8 @@ export function ItemForm() {
       isPending={isPending}
       displayLabel={DISPLAY_LABEL}
       imageUpload={imageUpload}
+      submitLabel={isEditMode ? "Save Changes" : undefined}
+      pendingLabel={isEditMode ? "Saving..." : undefined}
     >
       <BaseListingForm<CreateItemFormData>
         control={control}
diff --git a/frontend/components/listings/form/ListingFormShell.tsx b/frontend/components/listings/form/ListingFormShell.tsx
index 1b53640..174a95c 100644
--- a/frontend/components/listings/form/ListingFormShell.tsx
+++ b/frontend/components/listings/form/ListingFormShell.tsx
@@ -20,6 +20,10 @@ interface ListingFormShellProps {
   imageUpload: ReturnType<typeof useImageUpload>;
   /** The form fields (left column) */
   children: React.ReactNode;
+  /** Optional override for submit button text */
+  submitLabel?: string;
+  /** Optional override for pending button text */
+  pendingLabel?: string;
 }
 
 export function ListingFormShell({
@@ -30,6 +34,8 @@ export function ListingFormShell({
   maxFiles = 10,
   imageUpload,
   children,
+  submitLabel,
+  pendingLabel,
 }: ListingFormShellProps) {
   return (
     <form onSubmit={onSubmit} noValidate>
@@ -52,6 +58,10 @@ export function ListingFormShell({
             onRemove={imageUpload.removeImage}
           />
           <div className="pt-4">
+            {/*
+              Keep the live region message in sync with the button state so screen readers
+              announce the right action in both create and edit modes.
+            */}
             <Button
               type="submit"
               className="h-12 w-full text-base font-medium"
@@ -60,14 +70,14 @@ export function ListingFormShell({
               {isPending ? (
                 <>
                   <Loader2 className="mr-2 h-5 w-5 animate-spin" aria-hidden="true" />
-                  Creating...
+                  {pendingLabel ?? "Creating..."}
                 </>
               ) : (
-                `Create ${displayLabel}`
+                submitLabel ?? `Create ${displayLabel}`
               )}
             </Button>
             <div className="sr-only" aria-live="polite" aria-atomic="true">
-              {isPending && "Creating your listing, please wait..."}
+              {isPending && (pendingLabel ?? "Creating your listing, please wait...")}
             </div>
           </div>
         </div>
diff --git a/frontend/components/listings/form/SubletForm.tsx b/frontend/components/listings/form/SubletForm.tsx
index 34f9412..5e977a3 100644
--- a/frontend/components/listings/form/SubletForm.tsx
+++ b/frontend/components/listings/form/SubletForm.tsx
@@ -13,19 +13,25 @@ import { AddressAutocomplete } from "@/components/listings/address/AddressAutoco
 import { BaseListingForm } from "@/components/listings/form/BaseListingForm";
 import { ListingFormShell } from "@/components/listings/form/ListingFormShell";
 import { useImageUpload } from "@/hooks/useImageUpload";
-import { createListing } from "@/lib/actions";
+import { createListing, updateListing } from "@/lib/actions";
+import { queryKeys } from "@/lib/queryKeys";
 import { BEDS_OPTIONS, BATHS_OPTIONS } from "@/lib/constants";
 import { parsePriceString } from "@/lib/utils";
 import { createSubletSchema } from "@/lib/validations";
-import type { CreateSubletPayload } from "@/lib/types";
+import type { CreateSubletPayload, Sublet, UpdateSubletPayload } from "@/lib/types";
 import type { CreateSubletFormData } from "@/lib/validations";
 
 const DISPLAY_LABEL = "Listing";
 const EXAMPLE_TITLE = "e.g., Spacious 2BR near campus";
 
-export function SubletForm() {
+type SubletFormProps = {
+  initialListing?: Sublet;
+};
+
+export function SubletForm({ initialListing }: SubletFormProps) {
   const router = useRouter();
   const queryClient = useQueryClient();
+  const isEditMode = Boolean(initialListing);
 
   const {
     control,
@@ -37,17 +43,17 @@ export function SubletForm() {
     mode: "onBlur",
     reValidateMode: "onChange",
     defaultValues: {
-      title: "",
-      price: "",
-      description: "",
+      title: initialListing?.title ?? "",
+      price: initialListing ? String(initialListing.price) : "",
+      description: initialListing?.description ?? "",
       tags: [],
-      street_address: "",
-      latitude: 0,
-      longitude: 0,
-      beds: 0,
-      baths: 0,
-      startDate: "",
-      endDate: "",
+      street_address: initialListing?.additional_data.street_address ?? "",
+      latitude: initialListing?.additional_data.latitude ?? 0,
+      longitude: initialListing?.additional_data.longitude ?? 0,
+      beds: initialListing?.additional_data.beds ?? 0,
+      baths: initialListing?.additional_data.baths ?? 0,
+      startDate: initialListing?.additional_data.start_date?.slice(0, 10) ?? "",
+      endDate: initialListing?.additional_data.end_date?.slice(0, 10) ?? "",
     },
   });
 
@@ -55,35 +61,54 @@ export function SubletForm() {
     maxFiles: 10,
     maxSizeBytes: 10 * 1024 * 1024,
     onError: (message) => toast.error(message),
+    initialUrls: initialListing?.images,
   });
 
   const { mutate, isPending } = useMutation({
-    mutationFn: createListing,
+    mutationFn: (payload: CreateSubletPayload | UpdateSubletPayload) =>
+      isEditMode && initialListing
+        ? updateListing(initialListing.id, payload as UpdateSubletPayload)
+        : createListing(payload as CreateSubletPayload),
     onSuccess: (data) => {
-      toast.success(`${DISPLAY_LABEL} created successfully!`);
+      toast.success(`${DISPLAY_LABEL} ${isEditMode ? "updated" : "created"} successfully!`);
+      if (isEditMode && initialListing) {
+        queryClient.invalidateQueries({ queryKey: queryKeys.listing(initialListing.id) });
+      }
       queryClient.invalidateQueries({ queryKey: ["sublets"] });
-      reset();
-      imageUpload.clearImages();
+      if (!isEditMode) {
+        reset();
+        imageUpload.clearImages();
+      }
       router.replace(`/sublets/${data.id}`);
     },
   });
 
   const onSubmit = (data: CreateSubletFormData) => {
-    const payload: CreateSubletPayload = {
-      title: data.title,
-      description: data.description,
-      price: String(parsePriceString(data.price)),
-      listing_type: "sublet",
-      additional_data: {
-        street_address: data.street_address,
-        latitude: data.latitude,
-        longitude: data.longitude,
-        beds: data.beds,
-        baths: data.baths,
-        start_date: data.startDate,
-        end_date: data.endDate,
-      },
+    const parsedPrice = parsePriceString(data.price);
+    const additional_data = {
+      street_address: data.street_address,
+      latitude: data.latitude,
+      longitude: data.longitude,
+      beds: data.beds,
+      baths: data.baths,
+      start_date: data.startDate,
+      end_date: data.endDate,
     };
+    const payload: CreateSubletPayload | UpdateSubletPayload = isEditMode
+      ? {
+          title: data.title,
+          description: data.description ?? "",
+          price: parsedPrice,
+          listing_type: "sublet",
+          additional_data,
+        }
+      : {
+          title: data.title,
+          description: data.description ?? "",
+          price: String(parsedPrice),
+          listing_type: "sublet",
+          additional_data,
+        };
     mutate(payload);
   };
 
@@ -225,6 +250,8 @@ export function SubletForm() {
       isPending={isPending}
       displayLabel={DISPLAY_LABEL}
       imageUpload={imageUpload}
+      submitLabel={isEditMode ? "Save Changes" : undefined}
+      pendingLabel={isEditMode ? "Saving..." : undefined}
     >
       <BaseListingForm<CreateSubletFormData>
         control={control}
diff --git a/frontend/components/listings/offer/EditMyOfferModal.tsx b/frontend/components/listings/offer/EditMyOfferModal.tsx
new file mode 100644
index 0000000..2e24a21
--- /dev/null
+++ b/frontend/components/listings/offer/EditMyOfferModal.tsx
@@ -0,0 +1,173 @@
+"use client";
+
+import { useEffect } from "react";
+import { useForm, Controller } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { toast } from "sonner";
+import { Pencil } from "lucide-react";
+
+import type { Offer } from "@/lib/types";
+import { offerSchema, type OfferFormData } from "@/lib/validations";
+import { updateMyOfferDetails } from "@/lib/actions";
+import { parsePriceString } from "@/lib/utils";
+import { FormDialog } from "@/components/common/FormDialog";
+import { FormField } from "@/components/common/FormField";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { Button } from "@/components/ui/button";
+
+export function EditMyOfferModal({
+  isOpen,
+  onClose,
+  offer,
+  onSaved,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  offer: Offer;
+  onSaved: () => void;
+}) {
+  const queryClient = useQueryClient();
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    formState: { errors, isSubmitting, isValid, touchedFields },
+  } = useForm<OfferFormData>({
+    resolver: zodResolver(offerSchema),
+    mode: "onChange",
+    defaultValues: {
+      offeredPrice: "",
+      message: "",
+    },
+  });
+
+  useEffect(() => {
+    if (isOpen) {
+      reset({
+        offeredPrice: offer.offered_price.toString(),
+        message: offer.message ?? "",
+      });
+    }
+  }, [isOpen, offer, reset]);
+
+  const editMutation = useMutation({
+    mutationFn: async (data: OfferFormData) => {
+      return updateMyOfferDetails(offer.id, {
+        offeredPrice: parsePriceString(data.offeredPrice),
+        message: data.message?.trim() || "",
+      });
+    },
+    onMutate: async (data: OfferFormData) => {
+      await queryClient.cancelQueries({ queryKey: ["myOffer", offer.listing] });
+      const previousOffer = queryClient.getQueryData<Offer | null>(["myOffer", offer.listing]);
+      queryClient.setQueryData<Offer | null>(["myOffer", offer.listing], {
+        ...offer,
+        offered_price: parsePriceString(data.offeredPrice),
+        message: data.message?.trim() || "",
+      });
+      return { previousOffer };
+    },
+    onSuccess: (updatedOffer) => {
+      toast.success("Offer updated!");
+      queryClient.setQueryData(["myOffer", offer.listing], updatedOffer);
+      onSaved();
+    },
+    onError: (_error, _vars, context) => {
+      if (context?.previousOffer !== undefined) {
+        queryClient.setQueryData(["myOffer", offer.listing], context.previousOffer);
+      }
+      toast.error("Failed to update offer.");
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["myOffer", offer.listing] });
+    },
+  });
+
+  return (
+    <FormDialog
+      isOpen={isOpen}
+      onClose={onClose}
+      title="Edit your offer"
+      description="Update the offered price and your message. Offer status is controlled by the listing owner."
+      maxWidth="md"
+    >
+      <form
+        onSubmit={handleSubmit((data) => editMutation.mutate(data))}
+        className="space-y-4"
+      >
+        <div className="flex items-center gap-2 text-sm text-gray-600">
+          <Pencil className="h-4 w-4" />
+          <span>Current status: {offer.status}</span>
+        </div>
+
+        <FormField
+          label="Your offer"
+          error={errors.offeredPrice?.message}
+          touched={touchedFields.offeredPrice}
+        >
+          <Controller
+            name="offeredPrice"
+            control={control}
+            render={({ field }) => (
+              <Input
+                type="number"
+                placeholder="0"
+                value={field.value || ""}
+                onChange={field.onChange}
+                onBlur={field.onBlur}
+                className={
+                  errors.offeredPrice && touchedFields.offeredPrice
+                    ? "border-destructive"
+                    : ""
+                }
+                min="0"
+                step="0.01"
+              />
+            )}
+          />
+        </FormField>
+
+        <Controller
+          name="message"
+          control={control}
+          render={({ field }) => (
+            <FormField
+              label="Message"
+              optional
+              error={errors.message?.message}
+              touched={touchedFields.message}
+              helperText={`${field.value?.length || 0}/500 characters`}
+            >
+              <Textarea
+                placeholder="Add a message for the listing owner..."
+                value={field.value || ""}
+                onChange={field.onChange}
+                onBlur={field.onBlur}
+                rows={4}
+                maxLength={500}
+                className={`resize-none ${
+                  errors.message && touchedFields.message ? "border-destructive" : ""
+                }`}
+              />
+            </FormField>
+          )}
+        />
+
+        <div className="flex items-center justify-end gap-2">
+          <Button type="button" variant="outline" onClick={onClose} disabled={isSubmitting}>
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            disabled={editMutation.isPending || isSubmitting || !isValid}
+          >
+            {editMutation.isPending ? "Saving..." : "Save"}
+          </Button>
+        </div>
+      </form>
+    </FormDialog>
+  );
+}
\ No newline at end of file
diff --git a/frontend/components/listings/offer/MakeOfferModal.tsx b/frontend/components/listings/offer/MakeOfferModal.tsx
index 0a534e0..27dd787 100644
--- a/frontend/components/listings/offer/MakeOfferModal.tsx
+++ b/frontend/components/listings/offer/MakeOfferModal.tsx
@@ -14,6 +14,7 @@ import { Textarea } from "@/components/ui/textarea";
 import { getPhoneStatus, createOffer } from "@/lib/actions";
 import { formatPhoneNumber } from "@/lib/utils";
 import { offerSchema, type OfferFormData } from "@/lib/validations";
+import type { Offer } from "@/lib/types";
 
 interface Props {
   isOpen: boolean;
@@ -59,11 +60,42 @@ export function MakeOfferModal({
 
   const createOfferMutation = useMutation({
     mutationFn: createOffer,
-    onSuccess: () => {
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({ queryKey: ["myOffer", listingId] });
+      const previousOffer = queryClient.getQueryData<Offer | null>(["myOffer", listingId]);
+      const optimisticOffer: Offer = {
+        id: -Date.now(),
+        user: previousOffer?.user ?? {
+          id: 0,
+          username: "you",
+          first_name: "You",
+          last_name: "",
+          email: "",
+          phone_number: null,
+          phone_verified: false,
+        },
+        listing: listingId,
+        offered_price: variables.offeredPrice,
+        message: variables.message ?? "",
+        status: "pending",
+        created_at: new Date().toISOString(),
+      };
+      queryClient.setQueryData(["myOffer", listingId], optimisticOffer);
+      return { previousOffer };
+    },
+    onSuccess: (createdOffer: Offer) => {
       toast.success(`Offer sent! The ${listingOwnerLabel.toLowerCase()} will contact you.`);
-      queryClient.invalidateQueries({ queryKey: ["offers"] });
+      queryClient.setQueryData(["myOffer", listingId], createdOffer);
       onClose();
     },
+    onError: (_error, _vars, context) => {
+      if (context?.previousOffer !== undefined) {
+        queryClient.setQueryData(["myOffer", listingId], context.previousOffer);
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["myOffer", listingId] });
+    },
   });
 
   const handleCreateOffer = (data: OfferFormData) => {
diff --git a/frontend/components/listings/offer/OfferCard.tsx b/frontend/components/listings/offer/OfferCard.tsx
new file mode 100644
index 0000000..1537b9e
--- /dev/null
+++ b/frontend/components/listings/offer/OfferCard.tsx
@@ -0,0 +1,196 @@
+"use client";
+
+import Image from "next/image";
+import { Check, Clock, Pencil, Star, Trash2, X } from "lucide-react";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import type { Offer } from "@/lib/types";
+import { Button } from "@/components/ui/button";
+import { changeOfferStatus } from "@/lib/actions";
+import { formatServerDateTimeToLocal } from "@/lib/utils";
+
+const STATUS_BADGE_RECEIVED: Partial<
+  Record<Offer["status"], { label: string; className: string }>
+> = {
+  accepted: { label: "Accepted", className: "bg-green-100 text-green-700" },
+  rejected: { label: "Rejected", className: "bg-red-100 text-red-700" },
+};
+
+const STATUS_BADGE_MINE: Record<Offer["status"], { label: string; className: string }> = {
+  pending: { label: "Pending", className: "bg-yellow-100 text-yellow-700" },
+  accepted: { label: "Accepted", className: "bg-green-100 text-green-700" },
+  rejected: { label: "Rejected", className: "bg-red-100 text-red-700" },
+};
+
+function useOfferLocalTime(createdAt: string) {
+  return useQuery({
+    queryKey: ["localDateTime", createdAt],
+    queryFn: () => formatServerDateTimeToLocal(createdAt),
+    staleTime: Infinity,
+  });
+}
+
+function OfferCardHeader({
+  offer,
+  badge,
+  localCreatedAt,
+}: {
+  offer: Offer;
+  badge: { label: string; className: string } | undefined;
+  localCreatedAt: { date: string; time: string } | undefined;
+}) {
+  return (
+    <div className="flex items-center justify-between">
+      <span className="text-lg font-semibold">${offer.offered_price.toLocaleString()}</span>
+      <div className="flex items-center gap-2">
+        {badge && (
+          <span className={`rounded-full px-2 py-0.5 text-xs font-medium ${badge.className}`}>
+            {badge.label}
+          </span>
+        )}
+        <div className="flex items-center gap-1 text-xs text-gray-400">
+          <Clock className="h-3 w-3" />
+          <span>{localCreatedAt ? `${localCreatedAt.date} at ${localCreatedAt.time}` : ""}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type ReceivedProps = {
+  offer: Offer;
+  onStatusChange: (id: number, status: Offer["status"]) => void;
+};
+
+function OfferCardReceived({ offer, onStatusChange }: ReceivedProps) {
+  const { data: localCreatedAt } = useOfferLocalTime(offer.created_at);
+  const badge = STATUS_BADGE_RECEIVED[offer.status];
+
+  const mutation = useMutation({
+    mutationFn: (status: Offer["status"]) => changeOfferStatus(offer.id, status),
+    onSuccess: (_data, status) => {
+      onStatusChange(offer.id, status);
+    },
+  });
+
+  return (
+    <div className="rounded-lg border border-gray-200 bg-white p-4">
+      <div className="flex gap-3">
+        <Image
+          src="/images/default-avatar.png"
+          alt={`${offer.user.first_name} ${offer.user.last_name}`}
+          width={40}
+          height={40}
+          className="h-10 w-10 shrink-0 rounded-full"
+        />
+        <div className="min-w-0 flex-1">
+          <OfferCardHeader offer={offer} badge={badge} localCreatedAt={localCreatedAt} />
+          <div className="mt-1 flex items-center gap-2">
+            <span className="text-sm font-medium text-gray-600">
+              {offer.user.first_name} {offer.user.last_name}
+            </span>
+            <div className="flex items-center gap-0.5 text-sm text-gray-500">
+              <Star className="h-3.5 w-3.5 fill-yellow-400 text-yellow-400" />
+              <span>5.0</span>
+            </div>
+          </div>
+          {offer.message && <p className="mt-1.5 text-sm text-gray-500">{offer.message}</p>}
+          {offer.status === "pending" && (
+            <div className="mt-3 flex justify-end gap-2">
+              <Button
+                size="sm"
+                className="cursor-pointer bg-green-600 text-white hover:bg-green-700"
+                onClick={() => mutation.mutate("accepted")}
+                disabled={mutation.isPending}
+              >
+                <Check className="mr-1 h-3.5 w-3.5" />
+                {mutation.isPending && mutation.variables === "accepted" ? "Accepting..." : "Accept"}
+              </Button>
+              <Button
+                size="sm"
+                className="cursor-pointer bg-red-500 text-white hover:bg-red-600"
+                onClick={() => mutation.mutate("rejected")}
+                disabled={mutation.isPending}
+              >
+                <X className="mr-1 h-3.5 w-3.5" />
+                {mutation.isPending && mutation.variables === "rejected" ? "Rejecting..." : "Reject"}
+              </Button>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type MineProps = {
+  offer: Offer;
+  onEdit: () => void;
+  onDelete: () => void;
+};
+
+function OfferCardMine({ offer, onEdit, onDelete }: MineProps) {
+  const { data: localCreatedAt } = useOfferLocalTime(offer.created_at);
+  const badge = STATUS_BADGE_MINE[offer.status];
+
+  return (
+    <div className="rounded-lg border border-gray-200 bg-white p-4">
+      <div className="flex gap-3">
+        <Image
+          src="/images/default-avatar.png"
+          alt={`${offer.user.first_name} ${offer.user.last_name}`}
+          width={40}
+          height={40}
+          className="h-10 w-10 shrink-0 rounded-full"
+        />
+        <div className="min-w-0 flex-1">
+          <OfferCardHeader offer={offer} badge={badge} localCreatedAt={localCreatedAt} />
+          <div className="mt-1 flex items-center gap-2">
+            <Star className="h-3.5 w-3.5 fill-yellow-400 text-yellow-400" />
+            <span className="text-sm text-gray-600">Your message</span>
+          </div>
+          <p className="mt-1.5 text-sm text-gray-500">
+            {offer.message?.trim() ? offer.message : "No message provided."}
+          </p>
+          <div className="mt-3 flex justify-end gap-2">
+            <Button size="sm" className="cursor-pointer" variant="outline" onClick={onEdit}>
+              <Pencil className="mr-1 h-3.5 w-3.5" />
+              Edit
+            </Button>
+            <Button
+              size="sm"
+              className="cursor-pointer bg-red-500 text-white hover:bg-red-600"
+              onClick={onDelete}
+            >
+              <Trash2 className="mr-1 h-3.5 w-3.5" />
+              Withdraw
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export type OfferCardProps =
+  | {
+      variant: "received";
+      offer: Offer;
+      onStatusChange: (id: number, status: Offer["status"]) => void;
+    }
+  | {
+      variant: "mine";
+      offer: Offer;
+      onEdit: () => void;
+      onDelete: () => void;
+    };
+
+export function OfferCard(props: OfferCardProps) {
+  if (props.variant === "mine") {
+    return (
+      <OfferCardMine offer={props.offer} onEdit={props.onEdit} onDelete={props.onDelete} />
+    );
+  }
+  return (
+    <OfferCardReceived offer={props.offer} onStatusChange={props.onStatusChange} />
+  );
+}
diff --git a/frontend/components/listings/offer/OffersPanel.tsx b/frontend/components/listings/offer/OffersPanel.tsx
new file mode 100644
index 0000000..e8ed552
--- /dev/null
+++ b/frontend/components/listings/offer/OffersPanel.tsx
@@ -0,0 +1,138 @@
+"use client";
+
+import { useState } from "react";
+import { Offer } from "@/lib/types";
+import { OfferCard } from "@/components/listings/offer/OfferCard";
+import { EditMyOfferModal } from "@/components/listings/offer/EditMyOfferModal";
+import { deleteMyOfferForListing, getMyOfferForListing } from "@/lib/actions";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+
+export const OffersPanel = ({
+  isOwner,
+  offersReceived: initialOffersReceived,
+  myOfferGiven,
+  listingId,
+}: {
+  isOwner: boolean;
+  offersReceived: Offer[];
+  myOfferGiven: Offer | null;
+  listingId: number;
+}) => {
+  const [offersReceived, setOffersReceived] = useState(initialOffersReceived);
+  const [isEditOfferOpen, setIsEditOfferOpen] = useState(false);
+  const [isDeleteOfferOpen, setIsDeleteOfferOpen] = useState(false);
+  const queryClient = useQueryClient();
+  const { data: myOffer } = useQuery({
+    queryKey: ["myOffer", listingId],
+    queryFn: () => getMyOfferForListing(listingId),
+    enabled: !isOwner,
+    initialData: myOfferGiven,
+  });
+
+  const handleStatusChange = (id: number, status: Offer["status"]) => {
+    setOffersReceived((prev) => prev.map((offer) => (offer.id === id ? { ...offer, status } : offer)));
+  };
+
+  const deleteMyOfferMutation = useMutation({
+    mutationFn: () => deleteMyOfferForListing(listingId),
+    onMutate: async () => {
+      await queryClient.cancelQueries({ queryKey: ["myOffer", listingId] });
+      const previousOffer = queryClient.getQueryData<Offer | null>(["myOffer", listingId]);
+      queryClient.setQueryData<Offer | null>(["myOffer", listingId], null);
+      return { previousOffer };
+    },
+    onSuccess: () => {
+      setIsDeleteOfferOpen(false);
+    },
+    onError: (_error, _vars, context) => {
+      if (context?.previousOffer !== undefined) {
+        queryClient.setQueryData(["myOffer", listingId], context.previousOffer);
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["myOffer", listingId] });
+    },
+  });
+
+  if (!isOwner) {
+    if (!myOffer) return null;
+
+    return (
+      <>
+        <div className="space-y-3">
+          <h2 className="text-lg font-semibold">Your offer</h2>
+          <OfferCard
+            variant="mine"
+            offer={myOffer}
+            onEdit={() => setIsEditOfferOpen(true)}
+            onDelete={() => setIsDeleteOfferOpen(true)}
+          />
+        </div>
+
+        <EditMyOfferModal
+          isOpen={isEditOfferOpen}
+          onClose={() => setIsEditOfferOpen(false)}
+          offer={myOffer}
+          onSaved={() => {
+            queryClient.invalidateQueries({ queryKey: ["myOffer", listingId] });
+            setIsEditOfferOpen(false);
+          }}
+        />
+
+        <Dialog open={isDeleteOfferOpen} onOpenChange={setIsDeleteOfferOpen}>
+          <DialogContent>
+            <DialogHeader>
+              <DialogTitle>Delete Offer</DialogTitle>
+              <DialogDescription>Are you sure you want to withdraw your offer?</DialogDescription>
+            </DialogHeader>
+            <DialogFooter>
+              <Button
+                className="cursor-pointer"
+                variant="outline"
+                onClick={() => setIsDeleteOfferOpen(false)}
+              >
+                Cancel
+              </Button>
+              <Button
+                className="cursor-pointer bg-red-500 text-white hover:bg-red-600"
+                onClick={() => deleteMyOfferMutation.mutate()}
+                disabled={deleteMyOfferMutation.isPending}
+              >
+                {deleteMyOfferMutation.isPending ? "Withdrawing..." : "Withdraw"}
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      </>
+    );
+  }
+
+  return (
+    <div className="space-y-3">
+      <h2 className="text-lg font-semibold">Offers received</h2>
+      {offersReceived.length === 0 ? (
+        <p className="text-sm text-gray-500">No offers yet.</p>
+      ) : (
+        <div className="space-y-3">
+          {offersReceived.map((offer) => (
+            <OfferCard
+              key={offer.id}
+              variant="received"
+              offer={offer}
+              onStatusChange={handleStatusChange}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/frontend/hooks/useImageUpload.ts b/frontend/hooks/useImageUpload.ts
index 906592c..4e39056 100644
--- a/frontend/hooks/useImageUpload.ts
+++ b/frontend/hooks/useImageUpload.ts
@@ -15,6 +15,7 @@ type UseImageUploadOptions = {
   maxSizeBytes?: number;
   acceptedTypes?: string[];
   onError?: (message: string) => void;
+  initialUrls?: string[];
 };
 
 const DEFAULT_MAX_FILES = 10;
@@ -26,8 +27,18 @@ export function useImageUpload({
   maxSizeBytes = DEFAULT_MAX_SIZE,
   acceptedTypes = DEFAULT_ACCEPTED_TYPES,
   onError,
+  initialUrls = [],
 }: UseImageUploadOptions = {}) {
-  const [images, setImages] = useState<ImageFile[]>([]);
+  const [images, setImages] = useState<ImageFile[]>(() =>
+    initialUrls.map((url) => ({
+      file: new File([], `existing-image-${Math.random().toString(36).slice(2, 8)}.jpg`, {
+        type: "image/jpeg",
+      }),
+      id: Math.random().toString(36).slice(2, 11),
+      preview: url,
+      status: "uploaded",
+    }))
+  );
   const [isDragging, setIsDragging] = useState(false);
   const dragCounter = useRef(0);
 
diff --git a/frontend/lib/actions.ts b/frontend/lib/actions.ts
index 439c970..5b0c16b 100644
--- a/frontend/lib/actions.ts
+++ b/frontend/lib/actions.ts
@@ -10,8 +10,10 @@ import {
   CreateSubletPayload,
   Item,
   Listing,
+  Offer,
   PaginatedResponse,
   Sublet,
+  UpdateListingPayload,
   User,
 } from "@/lib/types";
 
@@ -95,7 +97,6 @@ async function serverFetch<T>(endpoint: string, options: RequestInit = {}): Prom
 
     throw new APIError(errorMessage, response.status);
   }
-
   return response.json();
 }
 
@@ -206,8 +207,8 @@ export async function createOffer({
   listingId: number;
   offeredPrice: number;
   message?: string;
-}) {
-  return await serverFetch(`/market/listings/${listingId}/offers/`, {
+}): Promise<Offer> {
+  return await serverFetch<Offer>(`/market/listings/${listingId}/offers/`, {
     method: "POST",
     body: JSON.stringify({
       offered_price: offeredPrice,
@@ -216,6 +217,51 @@ export async function createOffer({
   });
 }
 
+export async function getOffersMade() {
+  return await serverFetch<PaginatedResponse<Offer>>("/market/offers/made/");
+}
+
+export async function getOffersReceived() {
+  return await serverFetch<PaginatedResponse<Offer>>("/market/offers/received/");
+}
+
+export async function getOffersReceivedForListing(listingId: number) {
+  return await serverFetch<PaginatedResponse<Offer>>(`/market/listings/${listingId}/offers/`);
+}
+
+export async function changeOfferStatus(offerId: number, status: Offer["status"]) {
+  return await serverFetch<Offer>(`/market/offers/${offerId}/status/`, {
+    method: "PATCH",
+    body: JSON.stringify({ status }),
+  });
+}
+
+// ------------------------------------------------------------
+// offers: current user's offer for a listing
+// ------------------------------------------------------------
+export async function getMyOfferForListing(listingId: number): Promise<Offer | null> {
+    return await serverFetch<Offer>(`/market/listings/${listingId}/offers/mine/`);
+}
+
+export async function updateMyOfferDetails(
+  offerId: number,
+  payload: { offeredPrice: number; message?: string }
+): Promise<Offer> {
+  return await serverFetch<Offer>(`/market/offers/${offerId}/details/`, {
+    method: "PATCH",
+    body: JSON.stringify({
+      offered_price: payload.offeredPrice,
+      message: payload.message?.trim() || "",
+    }),
+  });
+}
+
+export async function deleteMyOfferForListing(listingId: number): Promise<{ deleted: boolean }> {
+  return await serverFetch<{ deleted: boolean }>(`/market/listings/${listingId}/offers/`, {
+    method: "DELETE",
+  });
+}
+
 export async function getPhoneStatus() {
   return await serverFetch<{
     phone_number: string | null;
@@ -270,3 +316,19 @@ export async function createListing(payload: CreateListingPayload): Promise<List
     body: JSON.stringify(payload),
   });
 }
+
+export async function updateListing(
+  listingId: number,
+  payload: UpdateListingPayload
+): Promise<Listing> {
+  return await serverFetch<Listing>(`/market/listings/${listingId}/`, {
+    method: "PATCH",
+    body: JSON.stringify(payload),
+  });
+}
+
+export async function deleteListing(listingId: number): Promise<void> {
+  return await serverFetch<void>(`/market/listings/${listingId}/`, {
+    method: "DELETE",
+  });
+}
diff --git a/frontend/lib/types.ts b/frontend/lib/types.ts
index c21cf62..358910d 100644
--- a/frontend/lib/types.ts
+++ b/frontend/lib/types.ts
@@ -14,6 +14,8 @@ export type User = {
   first_name: string;
   last_name: string;
   email: string;
+  phone_number: string | null;
+  phone_verified: boolean;
 };
 
 // ------------------------------------------------------------
@@ -150,6 +152,18 @@ export type Sublet = BaseListing & {
 export type Listing = Item | Sublet;
 export type ListingTypes = "items" | "sublets";
 
+export type OfferStatus = "pending" | "accepted" | "rejected";
+
+export type Offer = {
+  id: number;
+  user: User;
+  listing: number;
+  offered_price: number;
+  message: string | null;
+  status: OfferStatus;
+  created_at: string;
+};
+
 // ------------------------------------------------------------
 // api responses
 // ------------------------------------------------------------
@@ -221,3 +235,25 @@ export type CreateSubletPayload = BaseCreatePayload & {
   listing_type: "sublet";
   additional_data: SubletAdditionalData;
 };
+
+// ------------------------------------------------------------
+// update payload types
+// ------------------------------------------------------------
+type BaseUpdatePayload = {
+  title?: string;
+  description?: string;
+  price?: number;
+  expires_at?: string;
+};
+
+export type UpdateItemPayload = BaseUpdatePayload & {
+  listing_type: "item";
+  additional_data?: Partial<ItemAdditionalData>;
+};
+
+export type UpdateSubletPayload = BaseUpdatePayload & {
+  listing_type: "sublet";
+  additional_data?: Partial<SubletAdditionalData>;
+};
+
+export type UpdateListingPayload = UpdateItemPayload | UpdateSubletPayload;
diff --git a/frontend/lib/utils.ts b/frontend/lib/utils.ts
index af9041d..9dcf5ad 100644
--- a/frontend/lib/utils.ts
+++ b/frontend/lib/utils.ts
@@ -25,6 +25,39 @@ export function formatDate(dateString: string) {
   return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 }
 
+export function formatDateTime(dateString: string) {
+  const date = new Date(dateString);
+  const datePart = date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+    timeZone: "UTC",
+  });
+  const timePart = date.toLocaleTimeString("en-US", {
+    hour: "numeric",
+    minute: "2-digit",
+    hour12: true,
+    timeZone: "UTC",
+  });
+  return { date: datePart, time: timePart };
+}
+
+// Convert an ISO timestamp from the server into the viewer's local machine time.
+export function formatServerDateTimeToLocal(dateString: string) {
+  const date = new Date(dateString);
+  const datePart = date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+  });
+  const timePart = date.toLocaleTimeString("en-US", {
+    hour: "numeric",
+    minute: "2-digit",
+    hour12: true,
+  });
+  return { date: datePart, time: timePart };
+}
+
 // format phone number as (XXX) XXX-XXXX
 export function formatPhoneNumber(value: string): string {
   const digits = value.replace(/\D/g, "");
diff --git a/frontend/lib/validations.ts b/frontend/lib/validations.ts
index e81dc10..1ced42b 100644
--- a/frontend/lib/validations.ts
+++ b/frontend/lib/validations.ts
@@ -147,3 +147,54 @@ export const createSubletSchema = z
   });
 
 export type CreateSubletFormData = z.infer<typeof createSubletSchema>;
+
+// ------------------------------------------------------------
+// edit schemas (same validation as create, without tags/images)
+// ------------------------------------------------------------
+export const editItemSchema = z.object({
+  title: z
+    .string()
+    .trim()
+    .min(1, "Title is required")
+    .max(200, "Title must be less than 200 characters"),
+  description: z
+    .string()
+    .trim()
+    .min(1, "Description is required")
+    .max(5000, "Description must be less than 5000 characters"),
+  price: priceSchema,
+  condition: z.enum(itemConditionValues, "Condition is required"),
+  category: z.enum(itemCategoryValues, "Category is required"),
+});
+
+export type EditItemFormData = z.infer<typeof editItemSchema>;
+
+export const editSubletSchema = z
+  .object({
+    title: z
+      .string()
+      .trim()
+      .min(1, "Title is required")
+      .max(200, "Title must be less than 200 characters"),
+    description: z
+      .string()
+      .trim()
+      .min(1, "Description is required")
+      .max(5000, "Description must be less than 5000 characters"),
+    price: priceSchema,
+    street_address: z.string().trim().min(1, "Street address is required"),
+    beds: z.number().int().min(0, "Beds must be 0 or more"),
+    baths: z.number().int().min(0, "Baths must be 0 or more"),
+    start_date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, "Start date is required"),
+    end_date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, "End date is required"),
+  })
+  .refine(
+    (data) => {
+      const start = Date.parse(data.start_date);
+      const end = Date.parse(data.end_date);
+      return Number.isFinite(start) && Number.isFinite(end) && end > start;
+    },
+    { message: "End date must be after start date", path: ["end_date"] }
+  );
+
+export type EditSubletFormData = z.infer<typeof editSubletSchema>;
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..b66fcf5
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "penn-marketplace",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}