diff --git a/app/Classes/Modules/Addresses/ControllersLogic/SetAddressToDefaultLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/SetAddressToDefaultLogic.php
new file mode 100644
index 00000000..2f94809b
--- /dev/null
+++ b/app/Classes/Modules/Addresses/ControllersLogic/SetAddressToDefaultLogic.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+use App\Http\Resources\AddressResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
+use App\Classes\Modules\Addresses\Services\ResetsAddressesDefault;
+use App\Classes\Modules\Addresses\Services\SetsAddressToDefault;
+
+use App\Models\Address;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class SetAddressToDefaultLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Updated Address',
+            'message' => 'You have successfully set the default Address'
+        ];
+    }
+
+    /** @var ResetsAddressesDefault */
+    private $resetsAddressesDefault;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /** @var SetsAddressToDefault*/
+    private $setsAddressToDefault;
+
+    /**
+     * SetAddressToDefaultLogic constructor.
+     * @param ResetsAddressesDefault $resetsAddressesDefault
+     * @param FetchesAddress $fetchesAddress
+     * @param SetsAddressToDefault $setsAddressToDefault
+     */
+    public function __construct(ResetsAddressesDefault $resetsAddressesDefault, FetchesAddress $fetchesAddress, SetsAddressToDefault $setsAddressToDefault)
+    {
+        $this->resetsAddressesDefault = $resetsAddressesDefault;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->setsAddressToDefault = $setsAddressToDefault;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        /** @var Address $address */
+
+        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+
+        $this->resetsAddressesDefault->execute($address);
+
+        return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
+    }
+}
diff --git a/app/Classes/Modules/Addresses/Services/ResetsAddressesDefault.php b/app/Classes/Modules/Addresses/Services/ResetsAddressesDefault.php
new file mode 100644
index 00000000..b9f6346e
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/ResetsAddressesDefault.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Address;
+
+class ResetsAddressesDefault extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Address $address
+     * @return void
+     */
+    public function execute(Address $address)
+    {
+        $address->company->addresses()->update(['billing' => false]);
+    }
+}
diff --git a/app/Classes/Modules/Addresses/Services/SetsAddressToDefault.php b/app/Classes/Modules/Addresses/Services/SetsAddressToDefault.php
new file mode 100644
index 00000000..07d2a2fc
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/SetsAddressToDefault.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Address;
+
+class SetsAddressToDefault extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Address $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Address $model)
+    {
+        $model->billing = true;
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Addresses/SetAddressToDefaultController.php b/app/Http/Controllers/Addresses/SetAddressToDefaultController.php
new file mode 100644
index 00000000..4dc7115f
--- /dev/null
+++ b/app/Http/Controllers/Addresses/SetAddressToDefaultController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Addresses;
+
+use App\Classes\Modules\Addresses\ControllersLogic\SetAddressToDefaultLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SetAddressToDefaultController
+{
+    /**
+     * @param Request $request
+     * @param SetAddressToDefaultLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, SetAddressToDefaultLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 1cc465aa..3893e5dc 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -29,7 +29,7 @@ class CompanyResource extends JsonResource
             'business_type' => (int) $this->business_type,
             'status' => (int) $this->status,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
-            'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->first())),
+            'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
             'employee' => new UserResource($this->employees->first()),
             'identification' => new DocumentResource($this->whenLoaded('documents', $this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first())),
             'bookings' => BookingResource::collection($this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), [])),
diff --git a/resources/assets/vue/components/address/elements/AddressListComponent.vue b/resources/assets/vue/components/address/elements/AddressListComponent.vue
new file mode 100644
index 00000000..b4882ab5
--- /dev/null
+++ b/resources/assets/vue/components/address/elements/AddressListComponent.vue
@@ -0,0 +1,197 @@
+<template>
+    <div class="row zig-zag-top">
+        <div class="col bg-white padding-25">
+            <div class="row p-b-20 b-b b-dashed m-b-20 b-grey">
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="font-heading all-caps bold fs-10">Default Billing Address</div>
+                            <div class="font-heading fs-10">
+                                    {{defaultAddress[0].street_one}} {{defaultAddress[0].street_two}}, {{defaultAddress[0].district.name}}, {{defaultAddress[0].post_code}} {{defaultAddress[0].state.name}}, {{defaultAddress[0].country.name}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row p-b-20 b-b b-dashed b-grey m-b-20">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-10" v-if="billingAddress.length > 0">
+                                <div class="col">
+                                    <div class="row m-l-0 m-r-0 m-b-5">
+                                        <div class="col-auto p-l-0">
+                                            <div class="row align-items-center justify-content-center">
+                                                <div class="col-auto">
+                                                    <div class="fs-10 all-caps">List of Address </div>
+                                                </div>
+                                                <div class="col-auto text-right lh-10 p-r-0 p-l-0 hide">
+                                                    <i class="fa fa-info-circle fs-10 lh-15 hint-text"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-8">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <div class="btn btn-xs btn-default bg-transparent text-master btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="addressDropdownLaunch.status = !addressDropdownLaunch.status">
+                                                        <div class="row">
+                                                            <div class="col p-t-10 p-b-5 ">
+                                                                <div class="row">
+                                                                    <div class="col">
+                                                                        <div class="font-heading bold lh-15">{{selectedAddress.street_one}}, {{selectedAddress.street_two}}</div>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="row">
+                                                                    <div class="col">
+                                                                        <div class="font-heading all-caps fs-10 muted"><b class="m-r-5 text-primary">{{selectedAddress.post_code}}</b> {{selectedAddress.district.name}}</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="col-auto b-l b-grey ">
+                                                                <div class="row h-100 align-items-center">
+                                                                    <div class="col">
+                                                                        <i class="fa text-primary" :class="[{'fa-angle-down': !addressDropdownLaunch.status}, {'fa-angle-up': addressDropdownLaunch.status}]"></i>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="relative w-100">
+                                                        <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !addressDropdownLaunch.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                            <div class="row text-left no-margin bg-white">
+                                                                <div class="col no-padding">
+                                                                    <div class="row no-margin"  v-for="address in billingAddress" v-bind:key="address.id" >
+                                                                        <div class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" :class="[{'bg-master-lightest': address.id === address.id}, {'text-master': address.id === address.id}, {'hover-primary': address.id !== address.id}, {'pointer': address.id !== address.id}]" @click="updateAddress(address)">
+                                                                            <div class="row align-items-center justify-content-center">
+                                                                                <div class="col">
+                                                                                    <div class="row">
+                                                                                        <div class="col">
+                                                                                            <!-- <div class="font-heading bold lh-15 fs-10">{{address.post_code ? address.post_code + ' - ':''}}{{address.post_code}}</div> -->
+                                                                                            <div class="font-heading bold lh-15 fs-10">{{address.street_one}},{{address.street_two}}</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading all-caps fs-10 muted"><b class="m-r-5 text-primary">{{address.post_code}}</b> {{address.district.name}}</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row parentContainer">
+                        <div class="col">
+                            <div class="row" v-show="!createAddress">
+                                <div class="col">
+                                    <button class="btn btn-xs btn-outline-primary b-rad-none" @click="createAddress = !createAddress">
+                                        <i class="fa fa-plus m-r-5"></i>
+                                        Add New Address
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="row" v-show="createAddress">
+                                <div class="col">
+                                    <div>Address form</div>
+                                    <address-form-component :id="company_id" :type="2" v-on:createdAddress="updateAddress($event)" v-on:close="createAddress = !createAddress"></address-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <set-default-billing-address-component :section="section" :data="item" v-if="item.id != null && defaultAddress[0].id != item.id" v-on:updateBillingAddress="updateBillingAddress($event)"></set-default-billing-address-component>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+
+    export default {
+        props: {
+            company_id: {
+                type: Number,
+                default: 1
+            },
+        },
+        data(){
+          return {
+                section: 'addressListSection',
+                isLoading: true,
+                billingAddress: [],
+                createAddress: false,
+                addressDropdownLaunch: {
+                    status: false
+                },
+                selectedAddress: null,
+                item:{
+                    id:null
+                }
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            defaultAddress: function() {
+                let defaultAddress = this.billingAddress.filter(function(item) {
+                    return item.billing == 1;
+                });
+                if(!this.selectedAddress){
+                    this.selectedAddress = defaultAddress[0];
+                }
+                return defaultAddress;
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchBillingAddress();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchBillingAddress(){
+                this.submit(route('api.address.list')+'?filters={%22company_id%22:'+this.company_id+'}', 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.billingAddress = response.payload.data;
+            },
+            errorHandler(){
+                // window.location.href = this.route('dashboard')
+            },
+            updateAddress(address){
+                this.addressDropdownLaunch.status = false;
+                this.selectedAddress = address;
+                this.createAddress = false;
+                this.fetchBillingAddress();
+                this.item.id = address.id;
+            },
+            updateBillingAddress(address){
+                this.id = address;
+                this.$emit('updateDefaultAddress', address);
+            }
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/forms/AddressFormComponent.vue b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
index e3508e01..809165a1 100644
--- a/resources/assets/vue/components/address/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
@@ -54,7 +54,11 @@
             id: {
                 type: Number,
                 required: true
-            }
+            },
+            type: {
+                type: Number,
+                default: 1
+            },
         },
         watch: {
             'id': function() {
@@ -85,8 +89,9 @@
             submitForm(){
                 this.submit((this.route('api.address.create')), 'post', 'bookingDetailSection', true, true)
             },
-            successHandler(){
-                this.updateList()
+            successHandler(response){
+                this.type !== 2 ? this.$emit('updateDefaultAddress', response.payload.data) : this.$emit('createdAddress', response.payload.data);
+                this.resetForm();
             }
         }
     }
diff --git a/resources/assets/vue/components/address/forms/SetDefaultBillingAddressComponent.vue b/resources/assets/vue/components/address/forms/SetDefaultBillingAddressComponent.vue
new file mode 100644
index 00000000..6d5b457e
--- /dev/null
+++ b/resources/assets/vue/components/address/forms/SetDefaultBillingAddressComponent.vue
@@ -0,0 +1,25 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12" data-dismiss="modal">Cancel</button>
+        </div>
+        <div class="col-auto">
+            <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" @click="submitForm()">Set as default</button>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+
+        methods: {
+            submitForm(){
+                this.submit(route('api.address.default', this.item.id), 'put', this.section, true, true);
+                this.$emit('updateBillingAddress', this.item.id);
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 0ed00850..d995c1ee 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row">
+    <div class="row parentContainer">
         <div class="col">
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
             <div class="row" v-show="!isLoading" v-if="booking">
@@ -29,7 +29,7 @@
                             </div>
                             <div class="row" v-if="!booking.company.address">
                                 <div class="col-8">
-                                    <address-form-component :id="booking.company.id"></address-form-component>
+                                    <address-form-component :id="booking.company.id" v-on:updateDefaultAddress="updateDefaultAddress"></address-form-component>
                                 </div>
                             </div>
                             <div class="row b-b b-dashed b-grey p-b-25" v-if="booking.company.address">
@@ -91,6 +91,14 @@
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="row p-b-15">
+                                        <div class="col">
+                                            <div class="btn btn-sm btn-block btn-success b-rad-none shadow-sm pointer requestModal" data-type="addressesList" >Edit</div>
+                                        </div>
+                                    </div>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addressesList" size="large">
+                                        <address-list-component :section="section" :company_id="booking.company.id" v-on:updateDefaultAddress="updateDefaultAddress"></address-list-component>
+                                    </modal-component>
                                     </div>
                                 </div>
                             </div>
@@ -309,6 +317,9 @@
             },
             errorHandler(){
                 window.location.href = this.route('dashboard')
+            },
+            updateDefaultAddress(){
+                this.fetchBooking();
             }
         }
     }
diff --git a/routes/crud.php b/routes/crud.php
index cdc418e2..f01b72f7 100644
--- a/routes/crud.php
+++ b/routes/crud.php
@@ -12,6 +12,8 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
 
     Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
 
+    Route::put('/{id}/default', 'SetAddressToDefaultController@update')->name('default');
+
     Route::delete('/delete/{id}', 'DeleteAddressController@destroy')->name('delete');
 
 });