diff --git a/Modules/Client/Entities/Client.php b/Modules/Client/Entities/Client.php
index 597f5482d2..8e40bb6a9c 100644
--- a/Modules/Client/Entities/Client.php
+++ b/Modules/Client/Entities/Client.php
@@ -13,6 +13,7 @@
 use Modules\Invoice\Entities\LedgerAccount;
 use Modules\Invoice\Services\InvoiceService;
 use Modules\Project\Entities\Project;
+use Modules\Prospect\Entities\Prospect;
 use Modules\User\Entities\User;
 
 class Client extends Model
@@ -396,6 +397,16 @@ public function hasCustomInvoiceTemplate()
         return false;
     }
 
+    public function prospect()
+    {
+        return $this->belongsTo(Prospect::class);
+    }
+
+    public function getClientsAttribute()
+    {
+        return $this->query()->orderBy('name')->get();
+    }
+
     protected static function booted()
     {
         static::addGlobalScope(new ClientGlobalScope);
diff --git a/Modules/Prospect/Config/config.php b/Modules/Prospect/Config/config.php
index 5b307ee26c..5ff0f7a413 100644
--- a/Modules/Prospect/Config/config.php
+++ b/Modules/Prospect/Config/config.php
@@ -7,4 +7,13 @@
         'existing' => 'Existing',
         'dormant' => 'Dormant',
     ],
+    'status' => [
+        'pending' => 'Pending',
+        'proposal-sent' => 'Proposal Sent',
+        'discussions-ongoing' => 'Discussions Ongoing',
+        'converted' => 'Converted',
+        'rejected' => 'Rejected',
+        'client-unresponsive' => 'Client Unresponsive',
+        'final-decision-pending' => 'Final Decision Pending',
+    ],
 ];
diff --git a/Modules/Prospect/Database/Migrations/2024_10_28_221259_added-client-id-project-name.php b/Modules/Prospect/Database/Migrations/2024_10_28_221259_added-client-id-project-name.php
new file mode 100644
index 0000000000..62320a32a9
--- /dev/null
+++ b/Modules/Prospect/Database/Migrations/2024_10_28_221259_added-client-id-project-name.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddedClientIdProjectName extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('prospects', function (Blueprint $table) {
+            $table->unsignedBigInteger('client_id')->nullable();
+            $table->string('project_name')->nullable();
+            $table->string('organization_name')->nullable()->change();
+
+            $table->foreign('client_id')->references('id')->on('clients');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('prospects', function (Blueprint $table) {
+            $table->dropForeign(['client_id']);
+            $table->dropColumn('client_id');
+            $table->dropColumn('project_name');
+            $table->string('organization_name')->nullable(false)->change();
+        });
+    }
+}
diff --git a/Modules/Prospect/Entities/Prospect.php b/Modules/Prospect/Entities/Prospect.php
index 85d850d0d2..995cadf38f 100644
--- a/Modules/Prospect/Entities/Prospect.php
+++ b/Modules/Prospect/Entities/Prospect.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
+use Modules\Client\Entities\Client;
 use Modules\User\Entities\User;
 
 class Prospect extends Model
@@ -26,4 +27,22 @@ public function getFormattedDate($date)
         return $date ? Carbon::parse($date)->format('M d, Y')
             : '-';
     }
+
+    public function client()
+    {
+        return $this->belongsTo(Client::class, 'client_id');
+    }
+
+    public function getProspectDisplayName()
+    {
+        return $this->organization_name ?? optional($this->client)->name ?? 'N/A';
+    }
+
+    public function formattedAmount($amount)
+    {
+        $formattedAmount = preg_replace('/\B(?=(\d{2})+(?!\d))/', ',', substr($amount, 0, -3)) .
+                    ',' . substr($amount, -3);
+
+        return $formattedAmount;
+    }
 }
diff --git a/Modules/Prospect/Entities/ProspectComment.php b/Modules/Prospect/Entities/ProspectComment.php
index 2dd59ea4e3..21dbcda366 100644
--- a/Modules/Prospect/Entities/ProspectComment.php
+++ b/Modules/Prospect/Entities/ProspectComment.php
@@ -18,6 +18,6 @@ public function prospect()
 
     public function user()
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'user_id');
     }
 }
diff --git a/Modules/Prospect/Http/Controllers/ProspectController.php b/Modules/Prospect/Http/Controllers/ProspectController.php
index 9a7a08b8c1..be6704ddb2 100644
--- a/Modules/Prospect/Http/Controllers/ProspectController.php
+++ b/Modules/Prospect/Http/Controllers/ProspectController.php
@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Modules\Client\Entities\Client;
 use Modules\Client\Entities\Country;
 use Modules\Prospect\Entities\Prospect;
 use Modules\Prospect\Http\Requests\ProspectRequest;
@@ -26,14 +27,10 @@ public function __construct(ProspectService $service)
      */
     public function index()
     {
-        $prospects = Prospect::with('pocUser')->get();
-        $countries = Country::all();
-        $currencySymbols = $countries->pluck('currency_symbol', 'currency');
+        $requestData = request()->all();
+        $data = $this->service->index($requestData);
 
-        return view('prospect::index', [
-            'prospects' => $prospects,
-            'currencySymbols' => $currencySymbols,
-        ]);
+        return view('prospect::index', $data);
     }
 
     /**
@@ -44,11 +41,13 @@ public function create()
     {
         $countries = Country::all();
         $user = new User();
+        $client = new Client();
         $activeUsers = $user->active_users;
 
         return view('prospect::create', [
             'users' => $activeUsers,
             'countries' => $countries,
+            'clients' => $client->clients,
         ]);
     }
 
@@ -70,7 +69,7 @@ public function store(ProspectRequest $request)
      */
     public function show($id)
     {
-        $prospect = Prospect::with(['pocUser', 'comments', 'comments.user'])->find($id);
+        $prospect = Prospect::with(['comments'])->find($id);
         $countries = Country::all();
         $currencySymbols = $countries->pluck('currency_symbol', 'currency');
 
@@ -87,26 +86,28 @@ public function show($id)
      */
     public function edit($id)
     {
-        $prospect = Prospect::with(['pocUser', 'comments'])->find($id);
+        $prospect = Prospect::with(['comments'])->find($id);
         $countries = Country::all();
         $user = new User();
         $activeUsers = $user->active_users;
+        $client = new Client();
 
         return view('prospect::edit', [
             'prospect' => $prospect,
             'users' => $activeUsers,
             'countries' => $countries,
+            'clients' => $client->clients,
         ]);
     }
 
     /**
      * Update the specified resource in storage.
      * @param Request $request
-     * @param int $id
+     * @param Prospect $prospect
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, Prospect $prospect)
     {
-        $data = $this->service->update($request, $id);
+        $data = $this->service->update($request, $prospect);
 
         return $data;
     }
diff --git a/Modules/Prospect/Http/Requests/ProspectRequest.php b/Modules/Prospect/Http/Requests/ProspectRequest.php
index fe1ff644d3..6d5a5ac442 100644
--- a/Modules/Prospect/Http/Requests/ProspectRequest.php
+++ b/Modules/Prospect/Http/Requests/ProspectRequest.php
@@ -14,7 +14,7 @@ class ProspectRequest extends FormRequest
     public function rules()
     {
         return [
-            'org_name' => 'required',
+            'org_name' => 'nullable',
             'poc_user_id' => 'required',
             'proposal_sent_date' => 'nullable|date',
             'domain' => 'nullable',
@@ -26,9 +26,30 @@ public function rules()
             'rfp_link' => 'nullable|url',
             'proposal_link' => 'nullable|url',
             'currency' => 'nullable',
+            'client_id' => 'nullable|exists:clients,id',
+            'project_name' => 'nullable',
         ];
     }
 
+    /**
+     * Configure the validator instance.
+     *
+     * @param  \Illuminate\Validation\Validator  $validator
+     * @return void
+     */
+    public function withValidator($validator)
+    {
+        if ($this->customer_type === 'new') {
+            $validator->addRules([
+                'org_name' => 'required',
+            ]);
+        } elseif ($this->customer_type === 'existing') {
+            $validator->addRules([
+                'client_id' => 'required',
+            ]);
+        }
+    }
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -47,7 +68,8 @@ public function authorize()
     public function messages()
     {
         return [
-            'org_name.required' => 'Organization name is required',
+            'org_name.required' => 'Organization name is required when customer type is new.',
+            'client_id.required' => 'Please select an organization when customer type is existing.',
             'poc_user_id.required' => 'Point of contact user ID is required',
         ];
     }
diff --git a/Modules/Prospect/Resources/assets/js/app.js b/Modules/Prospect/Resources/assets/js/app.js
index e69de29bb2..2c48291b48 100644
--- a/Modules/Prospect/Resources/assets/js/app.js
+++ b/Modules/Prospect/Resources/assets/js/app.js
@@ -0,0 +1,38 @@
+const CUSTOMER_TYPES = {
+    NEW: 'new',
+    EXISTING: 'existing',
+    DORMANT: 'dormant'
+};
+document.addEventListener('DOMContentLoaded', function () {
+    const customerTypeField = document.getElementById('customer_type');
+    const orgNameTextField = document.getElementById('org_name_text_field');
+    const orgNameSelectField = document.getElementById('org_name_select_field');
+    const orgNameTextInput = document.getElementById('org_name');
+    const orgNameSelectInput = document.getElementById('org_name_select');
+
+    function toggleOrgNameField() {
+        if (customerTypeField.value === CUSTOMER_TYPES.NEW) {
+            orgNameTextField.classList.remove('d-none');
+            orgNameSelectField.classList.add('d-none');
+            orgNameTextInput.required = true;
+            orgNameSelectInput.value = '';
+            orgNameSelectInput.required = false;
+        } else if (customerTypeField.value === CUSTOMER_TYPES.EXISTING) {
+            orgNameTextField.classList.add('d-none');
+            orgNameSelectField.classList.remove('d-none');
+            orgNameSelectInput.required = true;
+            orgNameTextInput.required = false;
+            orgNameTextInput.value = null;
+        } else {
+            orgNameTextField.classList.remove('d-none');
+            orgNameSelectField.classList.add('d-none');
+            orgNameTextInput.required = true;
+            orgNameSelectInput.value = '';
+            orgNameSelectInput.required = false;
+        }
+    }
+
+    toggleOrgNameField();
+
+    customerTypeField.addEventListener('change', toggleOrgNameField);
+});
diff --git a/Modules/Prospect/Resources/views/create.blade.php b/Modules/Prospect/Resources/views/create.blade.php
index 9a57422a9d..17716d2e50 100644
--- a/Modules/Prospect/Resources/views/create.blade.php
+++ b/Modules/Prospect/Resources/views/create.blade.php
@@ -16,12 +16,34 @@
                             <input type="hidden" name="create_prospect" value="create_prospect">
                             <div class="form-row">
                                 <div class="form-group col-md-5">
-                                    <label for="name" class="field-required">Organization Name</label>
+                                    <label for="customer_type">{{ __('Customer Type') }}</label>
+                                    <select name="customer_type" id="customer_type" class="form-control">
+                                        <option value="">Select Customer Type</option>
+                                        @foreach (config('prospect.customer-types') as $key => $customer_type)
+                                            <option value="{{ $key }}"
+                                                {{ old('customer_type') == $key ? 'selected' : '' }}>
+                                                {{ $customer_type }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
+                                    <label for="org_name" class="field-required">Organization Name</label>
                                     <input type="text" class="form-control" name="org_name" id="org_name"
-                                        placeholder="Enter Organization Name" required="required"
-                                        value="{{ old('org_name') }}">
+                                        placeholder="Enter Organization Name" value="{{ old('org_name') }}" required>
                                 </div>
-                                <div class="form-group offset-md-1 col-md-5">
+
+                                <div class="form-group offset-md-1 col-md-5 d-none" id="org_name_select_field">
+                                    <label for="client" class="field-required">Organization Name</label>
+                                    <select class="form-control" name="client_id" id="org_name_select" required="required">
+                                        <option value="">Select Organization Name</option>
+                                        @foreach ($clients as $client)
+                                            <option value="{{ $client->id }}">{{ $client->name }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-5">
                                     <label for="client_id" class="field-required">ColoredCow POC</label>
                                     <select name="poc_user_id" id="poc_user_id" class="form-control" required="required">
                                         <option value="">Select POC User</option>
@@ -32,8 +54,13 @@
                                         @endforeach
                                     </select>
                                 </div>
+
+                                <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
+                                    <label for="project_name">Project Name</label>
+                                    <input type="text" class="form-control" name="project_name" id="project_name"
+                                        placeholder="Enter Project Name" value="{{ old('project_name') }}">
+                                </div>
                             </div>
-                            <br>
                             <div class="form-row">
                                 <div class="form-group col-md-5">
                                     <label for="proposal_sent_date">Proposal Sent Date</label>
@@ -46,26 +73,13 @@
                                         placeholder="Enter Domain" value="{{ old('domain') }}">
                                 </div>
                             </div>
-                            <br>
                             <div class="form-row">
                                 <div class="form-group col-md-5">
-                                    <label for="customer_type">{{ __('Customer Type') }}</label>
-                                    <select name="customer_type" id="customer_type" class="form-control">
-                                        <option value="">Select Customer Type</option>
-                                        @foreach (config('prospect.customer-types') as $key => $customer_type)
-                                            <option value="{{ $key }}"
-                                                {{ old('customer_type') == $key ? 'selected' : '' }}>
-                                                {{ $customer_type }}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="form-group offset-md-1 col-md-5">
                                     <label for="budget">{{ __('Budget') }}</label>
                                     <div class="input-group">
                                         <div class="input-group-prepend">
                                             <select name="currency" v-model="currency" id="currency"
                                                 class="input-group-text">
-                                                <option value="">Select Currency</option>
                                                 @foreach ($countries as $country)
                                                     <option value="{{ $country->currency }}">{{ $country->currency }}
                                                     </option>
@@ -76,23 +90,25 @@ class="input-group-text">
                                             value="{{ old('budget') }}">
                                     </div>
                                 </div>
+                                <div class="form-group offset-md-1 col-md-5">
+                                    <label for="proposal_status">{{ __('Proposal Status') }}</label>
+                                    <select name="proposal_status" id="proposal_status" class="form-control">
+                                        <option value="">Select Prospect Status</option>
+                                        @foreach (config('prospect.status') as $key => $status)
+                                            <option value="{{ $key }}"
+                                                {{ old('proposal_status') == $key ? 'selected' : '' }}>
+                                                {{ $status }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
                             </div>
-                            <br>
                             <div class="form-row">
                                 <div class="form-group col-md-5">
-                                    <label for="proposal_status">{{ __('Proposal Status') }}</label>
-                                    <input type="text" class="form-control" name="proposal_status" id="proposal_status"
-                                        placeholder="Enter Proposal Status" value="{{ old('proposal_status') }}">
-                                </div>
-                                <div class="form-group offset-md-1 col-md-5">
                                     <label for="rfp_link">{{ __('RFP Link') }}</label>
                                     <input type="url" class="form-control" name="rfp_link" id="rfp_link"
                                         placeholder="Enter RFP URL" value="{{ old('rfp_link') }}">
                                 </div>
-                            </div>
-                            <br />
-                            <div class="form-row">
-                                <div class="form-group col-md-5">
+                                <div class="form-group offset-md-1 col-md-5">
                                     <label for="proposal_link">{{ __('Proposal Link') }}</label>
                                     <input type="url" class="form-control" name="proposal_link" id="proposal_link"
                                         placeholder="Enter Proposal URL" value="{{ old('proposal_link') }}">
diff --git a/Modules/Prospect/Resources/views/edit.blade.php b/Modules/Prospect/Resources/views/edit.blade.php
index 62b98d02a3..e245f12e25 100644
--- a/Modules/Prospect/Resources/views/edit.blade.php
+++ b/Modules/Prospect/Resources/views/edit.blade.php
@@ -7,11 +7,11 @@
         <ul class="nav nav-pills mb-2" id="pills-tab" role="tablist">
             <li class="nav-item" role="presentation">
                 <a class="nav-link active" id="prospectDetails-tab" data-toggle="pill" href="#prospectDetails" role="tab"
-                    aria-controls="prospectDetails" aria-selected="true">Prospect Details</a>
+                    aria-controls="prospectDetails" aria-selected="true">Details</a>
             </li>
             <li class="nav-item" role="presentation">
                 <a class="nav-link" id="prospectComments-tab" data-toggle="pill" href="#prospectComments" role="tab"
-                    aria-controls="prospectComments" aria-selected="false">Prospect Comments</a>
+                    aria-controls="prospectComments" aria-selected="false">Comments</a>
             </li>
         </ul>
 
diff --git a/Modules/Prospect/Resources/views/index.blade.php b/Modules/Prospect/Resources/views/index.blade.php
index 43358d8b66..02ea2a63d8 100644
--- a/Modules/Prospect/Resources/views/index.blade.php
+++ b/Modules/Prospect/Resources/views/index.blade.php
@@ -2,6 +2,7 @@
 @section('content')
     @includeWhen(session('status'), 'toast', ['message' => session('status')])
     <div class="container">
+        @include('prospect::menu-header')
         @if (session('success'))
             <div class="alert alert-success alert-dismissible fade show" role="alert">
                 {{ session('success') }}
@@ -47,7 +48,7 @@
                             <td class="w-30p">
                                 <div>
                                     <a
-                                        href="{{ route('prospect.show', $prospect->id) }}">{{ $prospect->organization_name ?? '-' }}</a>
+                                        href="{{ route('prospect.show', $prospect->id) }}">{{ $prospect->organization_name ?? ($prospect->client->name ?? '-') }}</a>
                                 </div>
                             </td>
                             <td class="w-15p">
@@ -68,7 +69,7 @@
                             <td class="w-30p">
                                 <span>
                                     {{ isset($prospect->currency) && isset($currencySymbols[$prospect->currency]) ? $currencySymbols[$prospect->currency] : '' }}
-                                    {{ $prospect->budget ? round($prospect->budget, 2) : '-' }}
+                                    {{ $prospect->budget ? $prospect->formattedAmount($prospect->budget) : '-' }}
                                 </span>
                             </td>
                             <td class="w-20p">
@@ -80,4 +81,8 @@
             </table>
         </div>
     </div>
+
+    <div class="d-flex justify-content-center">
+        {{ $prospects->appends(request()->query())->links() }}
+    </div>
 @endsection
diff --git a/Modules/Prospect/Resources/views/menu-header.blade.php b/Modules/Prospect/Resources/views/menu-header.blade.php
new file mode 100644
index 0000000000..00e6b556d8
--- /dev/null
+++ b/Modules/Prospect/Resources/views/menu-header.blade.php
@@ -0,0 +1,27 @@
+<ul class="nav nav-pills mt-3 mb-2">
+    @php
+        $filters = request()->except('page');
+        $currentStatus = request()->input('status') ?? 'open';
+    @endphp
+
+    <li class="nav-item mr-3">
+        <a class="nav-link {{ $currentStatus == 'open' ? 'active' : '' }}"
+            href="{{ route('prospect.index', array_merge($filters, ['status' => 'open'])) }}">
+            Open Prospects
+        </a>
+    </li>
+
+    <li class="nav-item">
+        <a class="nav-link {{ $currentStatus == 'converted' ? 'active' : '' }}"
+            href="{{ route('prospect.index', array_merge($filters, ['status' => 'converted'])) }}">
+            Converted Prospects
+        </a>
+    </li>
+
+    <li class="nav-item">
+        <a class="nav-link {{ $currentStatus == 'rejected' ? 'active' : '' }}"
+            href="{{ route('prospect.index', array_merge($filters, ['status' => 'rejected'])) }}">
+            Rejected Prospects
+        </a>
+    </li>
+</ul>
diff --git a/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php b/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php
index 93ed715021..45969a6fe8 100644
--- a/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php
+++ b/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php
@@ -7,22 +7,52 @@
             <div class="card-body">
                 <input type="hidden" name="create_prospect" value="create_prospect">
                 <div class="form-row">
-                    <div class="form-group form-group col-md-5">
-                        <label for="name">Organization Name</label>
+                    <div class="form-group col-md-5">
+                        <label for="customer_type">{{ __('Customer Type') }}</label>
+                        <select name="customer_type" id="customer_type" class="form-control">
+                            <option value="">Select Customer Type</option>
+                            @foreach (config('prospect.customer-types') as $key => $customer_type)
+                                <option value="{{ $key }}"
+                                    {{ $prospect->customer_type == $key ? 'selected' : '' }}>
+                                    {{ $customer_type }}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
+                        <label for="org_name" class="field-required">Organization Name</label>
                         <input type="text" class="form-control" name="org_name" id="org_name"
-                            placeholder="Enter Organization Name" value="{{ $prospect->organization_name }}">
+                            placeholder="Enter Organization Name" value="{{ $prospect->organization_name }}" required>
                     </div>
-                    <div class="form-group offset-md-1 col-md-5">
+
+                    <div class="form-group offset-md-1 col-md-5 d-none" id="org_name_select_field">
+                        <label for="client" class="field-required">Organization Name</label>
+                        <select class="form-control" name="client_id" id="org_name_select" required="required">
+                            <option value="">Select Organization Name</option>
+                            @foreach ($clients as $client)
+                                <option value="{{ $client->id }}"
+                                    {{ $prospect->client ? ($prospect->client->id == $client->id ? 'selected' : '') : '' }}>
+                                    {{ $client->name }}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-md-5">
                         <label for="client_id">ColoredCow POC</label>
                         <select name="poc_user_id" id="poc_user_id" class="form-control">
                             <option value="">Select POC User</option>
                             @foreach ($users as $user)
                                 <option value="{{ $user->id }}"
-                                    {{ $prospect->poc_user_id == $user->id ? 'selected' : '' }}>
+                                    {{ $prospect->pocUser->id == $user->id ? 'selected' : '' }}>
                                     {{ $user->name }}</option>
                             @endforeach
                         </select>
                     </div>
+                    <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
+                        <label for="project_name">Project Name</label>
+                        <input type="text" class="form-control" name="project_name" id="project_name"
+                            placeholder="Enter Project Name" value="{{ $prospect->project_name }}">
+                    </div>
                 </div>
                 <div class="form-row">
                     <div class="form-group col-md-5">
@@ -38,22 +68,10 @@
                 </div>
                 <div class="form-row">
                     <div class="form-group col-md-5">
-                        <label for="customer_type">{{ __('Customer Type') }}</label>
-                        <select name="customer_type" id="customer_type" class="form-control">
-                            <option value="">Select Customer Type</option>
-                            @foreach (config('prospect.customer-types') as $key => $customer_type)
-                                <option value="{{ $key }}"
-                                    {{ $prospect->customer_type == $key ? 'selected' : '' }}>
-                                    {{ $customer_type }}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    <div class="form-group offset-md-1 col-md-5">
                         <label for="budget">{{ __('Budget') }}</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <select name="currency" v-model="currency" id="currency" class="input-group-text">
-                                    <option value="">Select Currency</option>
                                     @foreach ($countries as $country)
                                         <option value="{{ $country->currency }}"
                                             {{ $prospect->currency == $country->currency ? 'selected' : '' }}>
@@ -65,33 +83,37 @@
                                 id="budget" value="{{ $prospect->budget }}">
                         </div>
                     </div>
+                    <div class="form-group offset-md-1 col-md-5">
+                        <label for="proposal_status">{{ __('Proposal Status') }}</label>
+                        <select name="proposal_status" id="proposal_status" class="form-control">
+                            <option value="">Select Prospect Status</option>
+                            @foreach (config('prospect.status') as $key => $status)
+                                <option value="{{ $key }}"
+                                    {{ $prospect->proposal_status == $key ? 'selected' : '' }}>
+                                    {{ $status }}</option>
+                            @endforeach
+                        </select>
+                    </div>
                 </div>
                 <div class="form-row">
                     <div class="form-group col-md-5">
-                        <label for="proposal_status">{{ __('Proposal Status') }}</label>
-                        <input type="text" class="form-control" name="proposal_status" id="proposal_status"
-                            placeholder="Enter Proposal Status" value="{{ $prospect->proposal_status }}">
-                    </div>
-                    <div class="form-group offset-md-1 col-md-5">
                         <label for="introductory_call">{{ __('Introductory Call') }}</label>
                         <input type="date" class="form-control" name="introductory_call" id="introductory_call"
                             value="{{ $prospect->introductory_call }}">
                     </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-5">
+                    <div class="form-group offset-md-1 col-md-5">
                         <label for="last_followup_date">{{ __('Last Followup Date') }}</label>
                         <input type="date" class="form-control" name="last_followup_date" id="last_followup_date"
                             value="{{ $prospect->last_followup_date }}">
                     </div>
-                    <div class="form-group offset-md-1 col-md-5">
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-md-5">
                         <label for="rfp_link">{{ __('RFP Link') }}</label>
                         <input type="url" class="form-control" name="rfp_link" id="rfp_link"
                             placeholder="Enter RFP URL" value="{{ $prospect->rfp_link }}">
                     </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-group col-md-5">
+                    <div class="form-group offset-md-1 col-md-5">
                         <label for="proposal_link">{{ __('Proposal Link') }}</label>
                         <input type="url" class="form-control" name="proposal_link" id="proposal_link"
                             placeholder="Enter Proposal URL" value="{{ $prospect->proposal_link }}">
diff --git a/Modules/Prospect/Resources/views/subviews/prospect-comments.blade.php b/Modules/Prospect/Resources/views/subviews/prospect-comments.blade.php
index fad786110e..5d1fe04bd1 100644
--- a/Modules/Prospect/Resources/views/subviews/prospect-comments.blade.php
+++ b/Modules/Prospect/Resources/views/subviews/prospect-comments.blade.php
@@ -1,5 +1,5 @@
 <div class="card-header d-flex mt-5" data-toggle="collapse" data-target="#prospect-comments">
-    <h5 class="font-weight-bold">Prospect Comments</h5>
+    <h5 class="font-weight-bold">Prospect Comments ({{ count($prospect->comments) }})</h5>
     <span class ="arrow ml-auto">&#9660;</span>
 </div>
 <div id="prospect-comments" class="collapse card mt-3">
diff --git a/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php b/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php
index 65bc5e44d5..2b79ce2202 100644
--- a/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php
+++ b/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php
@@ -9,7 +9,7 @@
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="org_name" class="font-weight-bold">Organization Name:</label>
-                    <span class="ml-2">{{ $prospect->organization_name ?? 'N/A' }}</span>
+                    <span class="ml-2">{{ $prospect->getProspectDisplayName() }}</span>
                 </div>
             </div>
             <div class="col-md-6">
@@ -21,6 +21,12 @@
         </div>
 
         <div class="form-row">
+            <div class="col-md-6">
+                <div class="form-group col-md-12">
+                    <label for="org_name" class="font-weight-bold">Project Name:</label>
+                    <span class="ml-2">{{ $prospect->project_name ?? 'N/A' }}</span>
+                </div>
+            </div>
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="proposal_sent_date" class="font-weight-bold">Proposal Sent Date:</label>
@@ -28,15 +34,15 @@
                         class="ml-2">{{ $prospect->proposal_sent_date ? $prospect->getFormattedDate($prospect->proposal_sent_date) : 'N/A' }}</span>
                 </div>
             </div>
+        </div>
+
+        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="domain" class="font-weight-bold">Domain:</label>
                     <span class="ml-2">{{ $prospect->domain ?? 'N/A' }}</span>
                 </div>
             </div>
-        </div>
-
-        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="customer_type" class="font-weight-bold">Customer Type:</label>
@@ -44,18 +50,18 @@ class="ml-2">{{ $prospect->proposal_sent_date ? $prospect->getFormattedDate($pro
                         class="ml-2">{{ config('prospect.customer-types')[$prospect->customer_type] ?? 'N/A' }}</span>
                 </div>
             </div>
+        </div>
+
+        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="budget" class="font-weight-bold">Budget:</label>
                     <span class="ml-2">
                         {{ isset($prospect->currency) && isset($currencySymbols[$prospect->currency]) ? $currencySymbols[$prospect->currency] : '' }}
-                        {{ $prospect->budget ? round($prospect->budget, 2) : 'N/A' }}
+                        {{ $prospect->budget ? $prospect->formattedAmount($prospect->budget) : 'N/A' }}
                     </span>
                 </div>
             </div>
-        </div>
-
-        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="last_followup_date" class="font-weight-bold">Last Followup Date:</label>
@@ -63,6 +69,9 @@ class="ml-2">{{ config('prospect.customer-types')[$prospect->customer_type] ?? '
                         class="ml-2">{{ $prospect->last_followup_date ? $prospect->getFormattedDate($prospect->last_followup_date) : 'N/A' }}</span>
                 </div>
             </div>
+        </div>
+
+        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="introductory_call" class="font-weight-bold">Introductory Date:</label>
@@ -70,15 +79,15 @@ class="ml-2">{{ $prospect->last_followup_date ? $prospect->getFormattedDate($pro
                         class="ml-2">{{ $prospect->introductory_call ? $prospect->getFormattedDate($prospect->introductory_call) : 'N/A' }}</span>
                 </div>
             </div>
-        </div>
-
-        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="proposal_status" class="font-weight-bold">Proposal Status:</label>
-                    <span class="ml-2">{{ $prospect->proposal_status ?? 'N/A' }}</span>
+                    <span class="ml-2">{{ config('prospect.status')[$prospect->proposal_status] ?? 'N/A' }}</span>
                 </div>
             </div>
+        </div>
+
+        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="proposal_url" class="font-weight-bold">Proposal Link:</label>
@@ -90,9 +99,6 @@ class="fa fa-external-link"></i></a>
                     @endif
                 </div>
             </div>
-        </div>
-
-        <div class="form-row">
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="rfp_url" class="font-weight-bold">RFP Link:</label>
diff --git a/Modules/Prospect/Resources/views/subviews/show.blade.php b/Modules/Prospect/Resources/views/subviews/show.blade.php
index 9e83091b0a..bc1ab0fa65 100644
--- a/Modules/Prospect/Resources/views/subviews/show.blade.php
+++ b/Modules/Prospect/Resources/views/subviews/show.blade.php
@@ -4,7 +4,7 @@
     <div class="container">
         <br>
         <div class="d-flex justify-content-between mb-5">
-            <h4 class="font-weight-bold">Prospect Name: {{ $prospect->organization_name }}</h4>
+            <h4 class="font-weight-bold">Prospect Name: {{ $prospect->getProspectDisplayName() }}</h4>
             <a href="{{ route('prospect.edit', $prospect->id) }}" class="btn btn-primary">Edit</a>
         </div>
         @include('prospect::subviews.prospect-details')
diff --git a/Modules/Prospect/Services/ProspectService.php b/Modules/Prospect/Services/ProspectService.php
index 19b86e93b4..ba56196d1b 100644
--- a/Modules/Prospect/Services/ProspectService.php
+++ b/Modules/Prospect/Services/ProspectService.php
@@ -2,11 +2,20 @@
 
 namespace Modules\Prospect\Services;
 
+use Modules\Client\Entities\Country;
 use Modules\Prospect\Entities\Prospect;
 use Modules\Prospect\Entities\ProspectComment;
 
 class ProspectService
 {
+    public function index(array $requestData = [])
+    {
+        return [
+            'prospects' => $this->getFilteredProspects($requestData),
+            'currencySymbols' => $this->getCurrencySymbols(),
+        ];
+    }
+
     public function store($validated)
     {
         $prospect = new Prospect();
@@ -15,10 +24,9 @@ public function store($validated)
         return redirect()->route('prospect.index')->with('status', 'Prospect created successfully!');
     }
 
-    public function update($request, $id)
+    public function update($request, $prospect)
     {
         $budget = $request->budget ?? null;
-        $prospect = Prospect::find($id);
         $prospect->organization_name = $request->org_name;
         $prospect->poc_user_id = $request->poc_user_id;
         $prospect->proposal_sent_date = $request->proposal_sent_date;
@@ -31,6 +39,8 @@ public function update($request, $id)
         $prospect->rfp_link = $request->rfp_link;
         $prospect->proposal_link = $request->proposal_link;
         $prospect->currency = $budget ? $request->currency : null;
+        $prospect->client_id = $request->client_id ?? null;
+        $prospect->project_name = $request->project_name;
         $prospect->save();
 
         return redirect()->route('prospect.show', $prospect->id)->with('status', 'Prospect updated successfully!');
@@ -47,6 +57,29 @@ public function commentUpdate($validated, $id)
         return $prospectComment;
     }
 
+    private function getFilteredProspects(array $requestData = [])
+    {
+        $filter = $requestData['status'] ?? 'open';
+
+        return Prospect::query()->when(
+            $filter === 'open',
+            fn ($query) => $query->where(function ($query) {
+                $query->whereNotIn('proposal_status', ['rejected', 'converted'])
+                    ->orWhereNull('proposal_status')
+                    ->orWhere('proposal_status', '');
+            }),
+            fn ($query) => $query->where('proposal_status', $filter)
+        )
+        ->orderBy('created_at', 'desc')
+        ->paginate(config('constants.pagination_size'))
+        ->appends($requestData);
+    }
+
+    private function getCurrencySymbols()
+    {
+        return Country::pluck('currency_symbol', 'currency');
+    }
+
     private function saveProspectData($prospect, $validated)
     {
         $budget = $validated['budget'] ?? null;
@@ -61,7 +94,9 @@ private function saveProspectData($prospect, $validated)
         $prospect->last_followup_date = $validated['last_followup_date'] ?? null;
         $prospect->rfp_link = $validated['rfp_link'] ?? null;
         $prospect->proposal_link = $validated['proposal_link'] ?? null;
+        $prospect->client_id = $validated['client_id'] ?? null;
         $prospect->currency = $budget ? $validated['currency'] : null;
+        $prospect->project_name = $validated['project_name'] ?? null;
         $prospect->save();
     }
 }