diff --git a/app/Classes/General/Eloquent/Filters/IssuerIn.php b/app/Classes/General/Eloquent/Filters/IssuerIn.php
new file mode 100644
index 00000000..f8958842
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IssuerIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class IssuerIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('issuer', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php
new file mode 100644
index 00000000..ff48ebf4
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Http\Resources\UserResource;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CreateAdminUserLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Account',
+            'message' => 'You have successfully created a new Account'
+        ];
+    }
+
+    /** @var CanCreateUser */
+    private $canCreateUser;
+
+    /** @var CreatesUser */
+    private $createsUser;
+
+
+    /**
+     * CreateUserLogic constructor.
+     * @param CanCreateUser $canCreateUser
+     * @param CreatesUser $createsUser
+     */
+    public function __construct(
+        CanCreateUser $canCreateUser,
+        CreatesUser $createsUser
+    )
+    {
+        $this->canCreateUser = $canCreateUser;
+        $this->createsUser = $createsUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $user_object = new RegistrationObject($request->input('name'), $request->input('email'),
+            $request->input('password'), $request->input('password_confirmation'),
+            RoleTypes::ADMIN, ApprovalStatus::APPROVED);
+
+        $this->canCreateUser->passes($user_object);
+
+        $user = $this->createsUser->execute($user_object);
+
+        return $this->resourceResponse(new UserResource($user));
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php
new file mode 100644
index 00000000..485e9cf3
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Http\Resources\UserResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+
+use App\Classes\Modules\Accounts\Standards\Rules\CanDeleteUser;
+use App\Classes\Modules\Accounts\Services\DeletesUser;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class DeleteUserLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete User',
+            'message' => 'You have successfully deleted the User'
+        ];
+    }
+
+    /** @var CanDeleteUser */
+    private $canDeleteUser;
+
+    /** @var DeletesUser */
+    private $deletesUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+
+    public function __construct(
+        CanDeleteUser $canDeleteUser, 
+        DeletesUser $deletesUser, 
+        FetchesUser $fetchesUser
+    )
+    {
+        $this->canDeleteUser = $canDeleteUser;
+        $this->deletesUser = $deletesUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $user = $this->fetchesUser->execute(['id' => $request->route('id')]);
+            $this->canDeleteUser->passes();
+            $this->deletesUser->execute($user);
+            
+            DB::commit();
+
+            return $this->resourceResponse(new UserResource($user));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
new file mode 100644
index 00000000..7dbfca9e
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateUserLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated User Profile',
+            'message' => 'You have successfully updated the User Profile'
+        ];
+    }
+
+    /** @var CanUpdateUser */
+    private $canUpdateUser;
+
+    /** @var UpdatesUser */
+    private $updatesUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * UpdateAddressLogic constructor.
+     * @param CanUpdateUser $canUpdateUser
+     * @param UpdatesUser $updatesUser
+     * @param FetchesUser $fetchesUSer
+     */
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    {
+        $this->canUpdateUser = $canUpdateUser;
+        $this->updatesUser = $updatesUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $object = new UserObject($request->input('name'));
+
+            $this->canUpdateUser->passes($object);
+
+            $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
+
+            $query = $this->updatesUser->execute($query, $object);
+
+            return $this->resourceResponse(new UserResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php
new file mode 100644
index 00000000..55fb5f31
--- /dev/null
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class UserObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $email;
+
+    /** @var string */
+    private $password;
+
+    /** @var string */
+    private $passwordConfirmation;
+
+    /** @var int|null */
+    private $type;
+
+    /** @var int|null */
+    private $status;
+
+    /**
+     * UserObject constructor.
+     * @param string $name
+     * @param string $email
+     * @param string $password
+     * @param string $passwordConfirmation
+     * @param int|null $type
+     * @param int|null $status
+     */
+    public function __construct(string $name, string $email, string $password, string $passwordConfirmation, ?int $type = RoleTypes::USER, ?int $status = ApprovalStatus::PENDING_VERIFICATION)
+    {
+        $this->name = $name;
+        $this->email = $email;
+        $this->password = $password;
+        $this->passwordConfirmation = $passwordConfirmation;
+        $this->type = $type;
+        $this->status = $status;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPasswordConfirmation(): string
+    {
+        return $this->passwordConfirmation;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
index 7b55a39f..fabb88c6 100644
--- a/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
+++ b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
@@ -51,7 +51,6 @@ class AuthenticationProcessor
      * @return array
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function execute(Request $request): array {
diff --git a/app/Classes/Modules/Accounts/Services/DeletesUser.php b/app/Classes/Modules/Accounts/Services/DeletesUser.php
new file mode 100644
index 00000000..534331b0
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/DeletesUser.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\User;
+
+class DeletesUser extends AbstractDeleteRecord
+{
+
+    /**
+     * @param User $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Services/UpdatesUser.php b/app/Classes/Modules/Accounts/Services/UpdatesUser.php
new file mode 100644
index 00000000..ef2e8d1a
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Services/UpdatesUser.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Models\User;
+
+class UpdatesUser extends AbstractUpdateRecord
+{
+
+    /**
+     * @param User $model
+     * @param UserObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $model, UserObject $object) {
+
+        $model->name = $object->getName();
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php
new file mode 100644
index 00000000..2da56844
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\Standards\Validators\UserCreateValidation;
+
+class CanCreateUser extends AbstractRule
+{
+
+    /** @var UserCreateValidation */
+    private $userCreateValidation;
+
+    /**
+     * CanCreateAddress constructor.
+     * @param UserCreateValidation $userCreateValidation
+     */
+    public function __construct(UserCreateValidation $userCreateValidation)
+    {
+        $this->userCreateValidation = $userCreateValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RegistrationObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->userCreateValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param AddressObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php
new file mode 100644
index 00000000..f106bcc7
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+
+class CanDeleteUser extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param UserObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param UserObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanUpdateUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanUpdateUser.php
new file mode 100644
index 00000000..a523ac12
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Rules/CanUpdateUser.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Classes\Modules\Accounts\Standards\Validators\UserUpdateValidation;
+
+class CanUpdateUser extends AbstractRule
+{
+
+    /** @var UserUpdateValidation */
+    private $userUpdateValidation;
+
+    /**
+     * CanUpdateAddress constructor.
+     * @param UserUpdateValidation $userUpdateValidation
+     */
+    public function __construct(UserUpdateValidation $userUpdateValidation)
+    {
+        $this->userUpdateValidation = $userUpdateValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param UserObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->userUpdateValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param AddressObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Validators/UserCreateValidation.php b/app/Classes/Modules/Accounts/Standards/Validators/UserCreateValidation.php
new file mode 100644
index 00000000..99ea60ac
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Validators/UserCreateValidation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+
+class UserCreateValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param UserObject $object
+     * @return array
+     */
+    protected function data($object): array
+    {
+        return [
+            'name' => $object->getName(),
+            'email' => $object->getEmail(),
+            'password' => $object->getPassword(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [
+            'name' => 'required', 
+            'email' => 'required|unique:users',            
+            'password' => 'required',            
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/Standards/Validators/UserUpdateValidation.php b/app/Classes/Modules/Accounts/Standards/Validators/UserUpdateValidation.php
new file mode 100644
index 00000000..9b2f8177
--- /dev/null
+++ b/app/Classes/Modules/Accounts/Standards/Validators/UserUpdateValidation.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+
+class UserUpdateValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param UserObject $object
+     * @return array
+     */
+    protected function data($object): array
+    {
+        return [
+            'name' => $object->getName(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [
+            'name' => 'required',            
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index aa7b4434..805bc7ac 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -6,6 +6,7 @@ namespace App\Classes\Modules\Addresses\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\UpdatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Http\Resources\AddressResource;
@@ -35,17 +36,22 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesAddress */
     private $fetchesAddress;
 
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
+     * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
+        $this->fetchesDistrict = $fetchesDistrict;
     }
 
 
@@ -58,7 +64,9 @@ class UpdateAddressLogic extends AbstractControllerLogic
     {
         try {
 
-            $object = new AddressObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+            $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new AddressObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
 
             $this->canUpdateAddress->passes($object);
 
diff --git a/app/Classes/Modules/Addresses/Services/UpdatesAddress.php b/app/Classes/Modules/Addresses/Services/UpdatesAddress.php
index 76ba4d15..907edc73 100644
--- a/app/Classes/Modules/Addresses/Services/UpdatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/UpdatesAddress.php
@@ -17,15 +17,15 @@ class UpdatesAddress extends AbstractUpdateRecord
      */
     public function execute(Address $model, AddressObject $object) {
 
-        $model->company_id = $object->getCompanyId();
+        //$model->company_id = $object->getCompanyId();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
-        $model->city = $object->getCity();
-        $model->state = $object->getState();
-        $model->post_code = $object->getPostCode();
-        $model->country = $object->getCountry();
-        $model->default = $object->getDefault();
-        $model->billing = $object->getBilling();
+        $model->district_id = $object->getDistrictId();
+        $model->state_id = $object->getStateId();
+        $model->postcode = $object->getPostCode();
+        $model->country_id = $object->getCountryId();
+        //$model->default = $object->getDefault();
+        //$model->billing = $object->getBilling();
 
         return $this->handler($model);
 
diff --git a/app/Classes/Modules/Documents/Standards/Rules/CanListDocuments.php b/app/Classes/Modules/Documents/Standards/Rules/CanListDocuments.php
index d94068b7..f5145df6 100644
--- a/app/Classes/Modules/Documents/Standards/Rules/CanListDocuments.php
+++ b/app/Classes/Modules/Documents/Standards/Rules/CanListDocuments.php
@@ -12,11 +12,13 @@ class CanListDocuments extends AbstractRule
      */
     protected function authorized(): bool
     {
-        // TODO  Set Authorization rules
 
+        /*
+        Disabled temporarily, will check back later
         if (!\Auth::user()->can('view document')) {
             return false;
         }
+        */
 
         return true;
 
diff --git a/app/Classes/Notifications/ResetPasswordEmail.php b/app/Classes/Notifications/ResetPasswordEmail.php
index f7a84ab8..d2228e50 100644
--- a/app/Classes/Notifications/ResetPasswordEmail.php
+++ b/app/Classes/Notifications/ResetPasswordEmail.php
@@ -31,7 +31,7 @@ class ResetPasswordEmail extends AbstractEmail
     {
         return (new MailMessage)
             ->subject('Reset Password')
-            ->view('emails.account.reset_password', ['user' => $this->user, 'attempt' => $this->attempt]);
+            ->view('emails.accounts.reset_password', ['user' => $this->user, 'attempt' => $this->attempt]);
     }
 
 
diff --git a/app/Http/Controllers/Accounts/CreateAdminUserController.php b/app/Http/Controllers/Accounts/CreateAdminUserController.php
new file mode 100644
index 00000000..2c3a9ac7
--- /dev/null
+++ b/app/Http/Controllers/Accounts/CreateAdminUserController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+
+use App\Classes\Modules\Accounts\ControllersLogic\CreateAdminUserLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateAdminUserController
+{
+
+    /**
+     * @param Request $request
+     * @param CreateAdminUserLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateAdminUserLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/DeleteUserController.php b/app/Http/Controllers/Accounts/DeleteUserController.php
new file mode 100644
index 00000000..375cdcbd
--- /dev/null
+++ b/app/Http/Controllers/Accounts/DeleteUserController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\DeleteUserLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteUserController
+{
+    /**
+     * @param Request $request
+     * @param DeleteUserLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteUserLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/GeneratePasswordResetController.php b/app/Http/Controllers/Accounts/GeneratePasswordResetController.php
new file mode 100644
index 00000000..b7e305c7
--- /dev/null
+++ b/app/Http/Controllers/Accounts/GeneratePasswordResetController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\GeneratePasswordResetLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class GeneratePasswordResetController
+{
+
+    /**
+     * @param Request $request
+     * @param ResendEmailVerificationLogic $logic
+     * @return JsonResponse
+     */
+    public function generate(Request $request, GeneratePasswordResetLogic $logic): JsonResponse  {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Accounts/ResetPasswordController.php b/app/Http/Controllers/Accounts/ResetPasswordController.php
new file mode 100644
index 00000000..ab20502f
--- /dev/null
+++ b/app/Http/Controllers/Accounts/ResetPasswordController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\ResetPasswordLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ResetPasswordController
+{
+
+    /**
+     * @param Request $request
+     * @param ResendEmailVerificationLogic $logic
+     * @return JsonResponse
+     */
+    public function reset(Request $request, ResetPasswordLogic $logic): JsonResponse  {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/DeleteBookingController.php b/app/Http/Controllers/Bookings/DeleteBookingController.php
index dfbd8a01..f0bffeb2 100644
--- a/app/Http/Controllers/Bookings/DeleteBookingController.php
+++ b/app/Http/Controllers/Bookings/DeleteBookingController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Bookings;
+namespace App\Http\Controllers\Accounts;
 
-use App\Classes\Modules\Bookings\ControllersLogic\DeleteBookingLogic;
+use App\Classes\Modules\Accounts\ControllersLogic\DeleteBookingLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/database/seeds/AdminUserPermissionsTableSeeder.php b/database/seeds/AdminUserPermissionsTableSeeder.php
index 0ab43f98..132184d7 100644
--- a/database/seeds/AdminUserPermissionsTableSeeder.php
+++ b/database/seeds/AdminUserPermissionsTableSeeder.php
@@ -3,7 +3,7 @@
 use Illuminate\Database\Seeder;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
-
+use App\Classes\ValueObjects\Constants as Constants;
 use App\Models\User;
 
 class AdminUserPermissionsTableSeeder extends Seeder
@@ -19,77 +19,121 @@ class AdminUserPermissionsTableSeeder extends Seeder
         app()['cache']->forget('spatie.permission.cache');
 
         // admin permissions
-        Permission::create(['name' => 'view document', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add document', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit document', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete document', 'guard_name' => 'web']);
+        $permissions = [ 
+            ['name' => 'view document', 'guard_name' => 'web'],
+            ['name' => 'add document', 'guard_name' => 'web'],
+            ['name' => 'edit document', 'guard_name' => 'web'],
+            ['name' => 'delete document', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view standard_segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add standard_segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit standard_segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete standard_segment', 'guard_name' => 'web']);
+            ['name' => 'view standard_segment', 'guard_name' => 'web'],
+            ['name' => 'add standard_segment', 'guard_name' => 'web'],
+            ['name' => 'edit standard_segment', 'guard_name' => 'web'],
+            ['name' => 'delete standard_segment', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view standard_segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add standard_segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit standard_segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete standard_segment_constant', 'guard_name' => 'web']);
+            ['name' => 'view standard_segment_constant', 'guard_name' => 'web'],
+            ['name' => 'add standard_segment_constant', 'guard_name' => 'web'],
+            ['name' => 'edit standard_segment_constant', 'guard_name' => 'web'],
+            ['name' => 'delete standard_segment_constant', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit segment', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete segment', 'guard_name' => 'web']);
+            ['name' => 'view segment', 'guard_name' => 'web'],
+            ['name' => 'add segment', 'guard_name' => 'web'],
+            ['name' => 'edit segment', 'guard_name' => 'web'],
+            ['name' => 'delete segment', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit segment_constant', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete segment_constant', 'guard_name' => 'web']);
+            ['name' => 'view segment_constant', 'guard_name' => 'web'],
+            ['name' => 'add segment_constant', 'guard_name' => 'web'],
+            ['name' => 'edit segment_constant', 'guard_name' => 'web'],
+            ['name' => 'delete segment_constant', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view company_bank', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add company_bank', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit company_bank', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete company_bank', 'guard_name' => 'web']);
+            ['name' => 'view company_bank', 'guard_name' => 'web'],
+            ['name' => 'add company_bank', 'guard_name' => 'web'],
+            ['name' => 'edit company_bank', 'guard_name' => 'web'],
+            ['name' => 'delete company_bank', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view currency', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add currency', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit currency', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete currency', 'guard_name' => 'web']);
+            ['name' => 'view currency', 'guard_name' => 'web'],
+            ['name' => 'add currency', 'guard_name' => 'web'],
+            ['name' => 'edit currency', 'guard_name' => 'web'],
+            ['name' => 'delete currency', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view currency_rate', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add currency_rate', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit currency_rate', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete currency_rate', 'guard_name' => 'web']);
+            ['name' => 'view currency_rate', 'guard_name' => 'web'],
+            ['name' => 'add currency_rate', 'guard_name' => 'web'],
+            ['name' => 'edit currency_rate', 'guard_name' => 'web'],
+            ['name' => 'delete currency_rate', 'guard_name' => 'web'],
 
-        Permission::create(['name' => 'view booking', 'guard_name' => 'web']);
-        Permission::create(['name' => 'add booking', 'guard_name' => 'web']);
-        Permission::create(['name' => 'edit booking', 'guard_name' => 'web']);
-        Permission::create(['name' => 'delete booking', 'guard_name' => 'web']);
+            ['name' => 'view booking', 'guard_name' => 'web'],
+            ['name' => 'add booking', 'guard_name' => 'web'],
+            ['name' => 'edit booking', 'guard_name' => 'web'],
+            ['name' => 'delete booking', 'guard_name' => 'web']
+        ];
+
+        foreach ($permissions as $permission){
+            Permission::updateOrCreate($permission,$permission);
+        }
 
         ///////////////////////////////////////////////////////////////////////
 
-        $shadow_admin_role = Role::create([
-            'name' => 'Shadow Admin', 
-            'guard_name' => 'web',
-            'type' => 1,
-        ]);
+        $shadow_admin_role = Role::updateOrCreate(
+            ['name' => 'Shadow Admin'],
+            [
+                'name' => 'Shadow Admin',
+                'guard_name' => 'web',
+                'type' => 1,
+            ]
+        );
 
         $shadow_admin_role->givePermissionTo(Permission::all());
 
-        $admin = User::find(1);
-        $admin->assignRole($shadow_admin_role);
+        //Assign permission by user role/type not id
+        //$admin = User::find(1);
+        //$admin->assignRole($shadow_admin_role);
 
+        $shadow_admins = User::query()->whereIn('type',[Constants\RoleTypes::SHADOW_ADMIN])->get();
+        foreach ($shadow_admins as $shadow_admin) {
+            $shadow_admin->assignRole($shadow_admin_role);
+        }
         ///////////////////////////////////////////////////////////////////////
 
-        $ultimate_admin_role = Role::create([
-            'name' => 'Ultimate Admin', 
-            'guard_name' => 'web',
-            'type' => 1,
-        ]);
+        $ultimate_admin_role = Role::updateOrCreate(
+            ['name' => 'Ultimate Admin'],
+            [
+                'name' => 'Ultimate Admin',
+                'guard_name' => 'web',
+                'type' => 1,
+            ]
+        );
 
         $ultimate_admin_role->givePermissionTo(Permission::all());
 
-        $admin = User::find(2);
-        $admin->assignRole($ultimate_admin_role);
+        $super_admins = User::query()->whereIn('type',[Constants\RoleTypes::SUPER_ADMIN])->get();
+        foreach ($super_admins as $super_admin) {
+            $super_admin->assignRole($ultimate_admin_role);
+        }
 
+        /* Disable normal admin role for now, will comeback later to this
+        $admin_role = Role::updateOrCreate(
+            ['name' => 'Admin'],
+            [
+                'name' => 'Admin',
+                'guard_name' => 'web',
+                'type' => 1,
+            ]
+        );
+
+        //Normal admin limited permissions
+        $admin_permissions = [
+            $permissions[0]['name'],
+            $permissions[1]['name'],
+            $permissions[2]['name'],
+            $permissions[3]['name'],
+        ];
+
+        $admin_role->givePermissionTo(Permission::query()->whereIn('name',$admin_permissions)->get());
+
+        $admins = User::query()->whereIn('type',[Constants\RoleTypes::ADMIN])->get();
+        foreach ($admins as $admin) {
+            $admin->assignRole($admin_role);
+        }
+        */
         ///////////////////////////////////////////////////////////////////////
     }
 }
diff --git a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
index 6fa4ea8b..ddf52cde 100644
--- a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
@@ -6,27 +6,41 @@
                     <small class="bold fs-10 text-danger">{{error}}</small>
                 </div>
             </div>
-            <div class="row m-l-0 animate__animated animate__fadeInUpBig">
-                <div class="col b-t b-b b-grey animate__animated" :class="[{'animate__shake': $v.parameters.email.$error}]"  :style="[$v.parameters.email.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
+            <div class="row m-l-0" v-show="!$store.getters.isShowing('forgetPasswordSuccess')">
+                <div class="col animate__animated">
                     <div class="row align-items-center">
                         <div class="col no-padding bg-white ">
-                            <div class="input-group transparent">
-                                <span class="input-group-addon no-border">
-                                    <i class="fa fa-envelope-o fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
-                                </span>
-                                <input v-model="parameters.email" placeholder="Email Address" class="form-control no-border bg-white p-t-35 p-b-35 p-l-0 p-r-0">
-                                <validation-error-component :validator="$v.parameters.email" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
+                                <label class="text-primary">Email Address</label>
+                                <div class="controls">
+                                    <input type="text" class="form-control fs-12" v-model="parameters.email">
+                                </div>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-l-0" v-show="$store.getters.isShowing('forgetPasswordSuccess')">
+                <div class="col animate__animated">
+                    <div class="row align-items-center">
+                        <div class="col no-padding bg-white ">
+                            <div class="row animate__animated animate__fadeInRightBig">
+                                <div class="col">
+                                    <small class="muted font-lato all-caps">Your password has been changed successfully</small>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row m-t-30 align-items-center">
-                <div class="col-auto animate__animated animate__fadeInLeftBig animate__slower">
-                    <div class="b-t b-b b-r b-grey all-caps muted p-t-15 p-b-15 p-l-30 p-r-20 font-lato pointer fs-12" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: false})" style="letter-spacing: 2px;"><i class="fa fa-angle-left" style="padding-right: 18px;"></i>Back to login</div>
+
+            <div class="row m-t-5 align-items-center">
+                <div class="col-auto ml-auto p-r-0" v-show="!$store.getters.isShowing('forgetPasswordSuccess')">
+                    <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submit(route('api.account.authentication.password.forget'), 'post', section, false , false)">Request Reset Link</div>
                 </div>
-                <div class="col-auto ml-auto p-r-0 animate__animated animate__fadeInRightBig animate__slow">
-                    <div class="bg-success all-caps text-white p-t-15 p-b-15 p-l-50 p-r-20 bold font-lato pointer fs-12" style="letter-spacing: 4px;" @click="submit(route('api.account.authentication.password.forget'), 'post', section, false , false)">Request Reset Link</div>
+                <div class="col-auto m-t-15">
+                    <div class="b-t b-b b-r b-grey all-caps muted p-t-15 p-b-15 p-l-30 p-r-20 font-lato pointer fs-12" @click="$store.dispatch('returnToLoginAfterSendResetPasswordLink')" style="letter-spacing: 2px;"><i class="fa fa-angle-left" style="padding-right: 18px;"></i>Back to login</div>
                 </div>
             </div>
         </div>
@@ -59,7 +73,8 @@
         methods:{
             successHandler(){
                 this.$store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: true});
-                this.$store.dispatch('passwordResetEmail', {email: this.parameters.email})
+                this.$store.dispatch('passwordResetEmail', {email: this.parameters.email});
+                this.resetForm();
             },
             errorHandler(error){
                 this.error = error.message;
diff --git a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
index 454038a7..2e174168 100644
--- a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
@@ -18,7 +18,7 @@
                     </validation-wrapper-component>
                     <div class="row m-t-15 align-items-center justify-content-center">
                         <div class="col-auto">
-                            <p class="muted fs-11 font-arial m-b-0 pointer">Forgot password?</p>
+                            <p class="muted fs-11 font-arial m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'forgetPassword', status: true})">Forgot password?</p>
                         </div>
                         <div class="col text-right">
                             <div class="btn btn-sm p-l-30 p-r-30 btn-primary bold v-align-middle b-rad-none all-caps" @click="submitForm">Sign In</div>
diff --git a/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue b/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue
new file mode 100644
index 00000000..33947d06
--- /dev/null
+++ b/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue
@@ -0,0 +1,93 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-r-0 m-l-0 m-b-20 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                <div class="col p-l-50">
+                    <small class="bold fs-10 text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row m-l-0 m-b-10 animate__animated animate__fadeInUpBig">
+                <div class="col b-t b-b b-grey animate__animated" :class="[{'animate__shake': $v.parameters.password.$error}]"  :style="[$v.parameters.password.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
+                    <div class="row align-items-center">
+                        <div class="col no-padding bg-white ">
+                            <div class="input-group transparent">
+                                <span class="input-group-addon no-border">
+                                    <i class="fa fa-envelope-o fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
+                                </span>
+                                <input v-model="parameters.password" placeholder="Password" type="password" class="form-control no-border bg-white p-t-35 p-b-35 p-l-0 p-r-0">
+                                <validation-error-component :validator="$v.parameters.password" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-l-0 m-b-10 animate__animated animate__fadeInUpBig">
+                <div class="col b-t b-b b-grey animate__animated" :class="[{'animate__shake': $v.parameters.confirmPassword.$error}]"  :style="[$v.parameters.confirmPassword.$error ? {'border-bottom': 'solid 2px red !important'} : {}]">
+                    <div class="row align-items-center">
+                        <div class="col no-padding bg-white ">
+                            <div class="input-group transparent">
+                                <span class="input-group-addon no-border">
+                                    <i class="fa fa-envelope-o fa-fw p-l-15 p-t-20" style="padding-right: 18px;"></i>
+                                </span>
+                                <input v-model="parameters.confirmPassword" placeholder="Confirm Password" type="password" class="form-control no-border bg-white p-t-35 p-b-35 p-l-0 p-r-0">
+                                <validation-error-component :validator="$v.parameters.confirmPassword" class="absolute fs-12" style=" top: 10px; right: 15px; z-index: 99;"></validation-error-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-t-30 align-items-center">
+                <div class="col-auto ml-auto p-r-0 animate__animated animate__fadeInRightBig animate__slow">
+                    <div class="bg-success all-caps text-white p-t-15 p-b-15 p-l-50 p-r-20 bold font-lato pointer fs-12" style="letter-spacing: 4px;" @click="submit(route('api.account.authentication.password.reset'), 'post', section, false , false)">Reset Password</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+
+    import { required } from "vuelidate/lib/validators";
+    import request from '../../../general/mixins/request'
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            },
+            token:{
+                type: String,
+                required: true
+            }
+        },
+        data() {
+            return {
+                error: '',
+                parameters: {
+                    email: '',
+                    confirmPassword:'',
+                    token:this.token,
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                password:{required},
+                confirmPassword: {required},
+                token: {required}
+            }
+        },
+        methods:{
+            successHandler(response){
+                this.$store.dispatch('toggleSection', {name: 'resetPasswordSuccess', status: true});
+                this.$store.dispatch('passwordReset', response)
+            },
+            errorHandler(error){
+                this.error = error.message;
+            }
+        },
+        mixins: [request]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/elements/AddressComponent.vue b/resources/assets/vue/components/address/elements/AddressComponent.vue
index 589213f2..df0062e6 100644
--- a/resources/assets/vue/components/address/elements/AddressComponent.vue
+++ b/resources/assets/vue/components/address/elements/AddressComponent.vue
@@ -12,7 +12,7 @@
 				<div class="col">
                     <div class="row">
                         <div class="col">
-                            <span class="fs-10 muted">{{address.street_one}} {{address.street_two}} {{address.city}} {{address.state}} {{address.post_code}} {{address.country}}</span>
+                            <span class="fs-10 muted">{{address.street_one}} {{address.street_two}} {{address.city}} {{address.state.name}} {{address.post_code}} {{address.country.name}}</span>
                         </div>
                     </div>
 				</div>
@@ -20,7 +20,7 @@
 					<div class="row h-100">
 						<div class="col">
 							<div class="row no-margin">
-                                <div class="col-auto text-right p-t-10 p-b-10 bg-master-lightest m-r-5 ml-auto">
+                                <div class="col-auto text-right p-t-10 p-b-10 bg-master-lightest m-r-5 ml-auto"  @click="deleteAddress(address.id)">
                                     <a class="requestModal pointer" data-type="delete">
                                         <div data-toggle="tooltip" title="" data-placement="bottom" class="row link align-items-center justify-content-center" data-original-title="Delete">
                                             <div class="col">
@@ -29,7 +29,7 @@
                                         </div>
                                     </a>
                                 </div>
-                                <div class="col-auto text-right p-t-10 p-b-10 bg-master-lightest">
+                                <div class="col-auto text-right p-t-10 p-b-10 bg-master-lightest" @click="updateAddress(address.id)">
                                     <a class="pointer">
                                         <div data-toggle="tooltip" title="" data-placement="bottom" class="row link align-items-center justify-content-center" data-original-title="Delete">
                                             <div class="col">
@@ -45,29 +45,33 @@
 			</div>
 		</div>
         <div class="col-4 m-l-15 d-flex align-items-center">
-            <div class="row align-items-center" :class="[{'requestModal': !address.default}, {'pointer': !address.default}, {'link': !address.default}]" data-type="setDefault">
-                <div class="col-auto text-right p-t-5 p-b-5" :class="[{'bg-warning-lighter': address.default}, {'bg-master-light': !address.default}]">
-                    <div data-toggle="tooltip" class="row align-items-center justify-content-center" :class="{'link': !address.default}">
+            <div class="row align-items-center" :class="[{'requestModal': !address.billing}, {'pointer': !address.billing}, {'link': !address.billing}]" data-type="setDefault" @click="!address.billing ? setDefaultAddress() : null">
+                <div class="col-auto text-right p-t-5 p-b-5" :class="[{'bg-warning-lighter': address.billing}, {'bg-master-light': !address.billing}]">
+                    <div data-toggle="tooltip" class="row align-items-center justify-content-center" :class="{'link': !address.billing}">
                         <div class="col">
-                            <i class="fa fa-star" :class="[{'text-warning': address.default}, {'text-master': !address.default}]"></i>
+                            <i class="fa fa-star" :class="[{'text-warning': address.billing}, {'text-master': !address.billing}]"></i>
                         </div>
                     </div>
                 </div>
                 <div class="col bg-white p-t-5 p-b-5">
-                    <small class="fs-12 all-caps bold" :class="[{'text-warning': address.default}, {'text-master': !address.default}]">Default Address</small>
+                    <small class="fs-12 all-caps bold" :class="[{'text-warning': address.billing}, {'text-master': !address.billing}]">Default Address</small>
                 </div>
             </div>
         </div>
+
+
 	</div>
 </template>
 
 <script>
+    import FormHandler from '../../../general/mixins/formHandler';
+
     export default {
         props: {
             'data': {
                 type: Object,
                 required: true
-            }
+            },
         },
         data() {
             return {
@@ -79,6 +83,20 @@
                 this.address = this.data;
             }
         },
-
+        methods: {
+            setDefaultAddress(){
+                this.submit(route('api.address.default',this.address.id), 'put', this.section, true, true);
+            },
+            updateAddress(id){
+                this.$root.$emit('updateAddressForm', this.address, true);
+            },
+            deleteAddress(id){
+                this.$root.$emit('deleteAddressConfirm', id);
+            },
+            successHandler(){
+                this.$store.dispatch('reloadList', {'name': "addresslist"});
+            }
+        },
+        mixins: [FormHandler]
     }
 </script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/elements/AddressModalComponent.vue b/resources/assets/vue/components/address/elements/AddressModalComponent.vue
new file mode 100644
index 00000000..0304eb2f
--- /dev/null
+++ b/resources/assets/vue/components/address/elements/AddressModalComponent.vue
@@ -0,0 +1,54 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col p-t-5 p-b-5">
+                    <div class="col text-center">
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <h5 class="all-caps">Delete address</h5>
+                                <div class="fs-11">Are you sure you want to delete? This action is undoable.</div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col p-r-5">
+                                <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                            </div>
+                            <div class="col p-l-5">
+                                <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="deleteAddress()">Delete</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        props: {
+            'address_id' : {
+                type: Number,
+                required:true,
+            },
+        },
+        data(){
+            return {
+                parameters:null,
+                isLoading: false,
+            }
+        },
+        methods: {
+            deleteAddress(){
+                this.submit(route('api.address.delete',this.address_id), 'delete', this.section, true, true);
+            },
+            successHandler(){
+                this.$store.dispatch('reloadList', {'name': "addresslist"});
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/address/forms/AddressFormComponent.vue b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
index 809165a1..a201f4e5 100644
--- a/resources/assets/vue/components/address/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
@@ -39,7 +39,8 @@
                 <div class="col">
                     <div class="row">
                         <div class="col text-right">
-                            <button type="button" class="btn btn-sm btn-success b-rad-none" @click="submitForm()">Create Billing Address</button>
+                            <button type="button" class="btn btn-sm btn-success b-rad-none" @click="submitForm()">{{(this.type==3)?"Update":"Create"}} Billing Address</button>
+                            <button v-show="this.type==3" type="button" class="btn btn-sm bg-master-lighter b-rad-none m-l-5" @click="closeForm()">Cancel</button>
                         </div>
                     </div>
                 </div>
@@ -56,20 +57,36 @@
                 required: true
             },
             type: {
+                //Npte: type 1 = create, type 2 = update set default, type 3 = update address
                 type: Number,
                 default: 1
             },
+            addressData: {
+                type: Object,
+                default: {},
+                required:false
+            },
         },
         watch: {
             'id': function() {
                 this.parameters.company_id = this.id;
+            },
+            'addressData': function() {
+                this.resetForm();
+                this.parameters = {
+                    company_id: this.id,
+                    street_one:  this.addressData.street_one,
+                    street_two: this.addressData.street_two,
+                    district_id: this.addressData.district.id,
+                    post_code: this.addressData.post_code,
+                }
             }
         },
         data() {
 			return {
                 parameters : {
                     company_id: this.id,
-                    street_one: '',
+                    street_one:  '',
                     street_two: '',
                     district_id: '',
                     post_code: '',
@@ -87,11 +104,23 @@
         },
         methods:{
             submitForm(){
-                this.submit((this.route('api.address.create')), 'post', 'bookingDetailSection', true, true)
+                if(this.type==3){
+                    this.submit((this.route('api.address.update',this.addressData.id)), 'put', 'bookingDetailSection', true, true)
+                }else {
+                    this.submit((this.route('api.address.create')), 'post', 'bookingDetailSection', true, true)
+                }
+            },
+            closeForm(){
+                this.$root.$emit('updateAddressForm', {}, false);
             },
             successHandler(response){
-                this.type !== 2 ? this.$emit('updateDefaultAddress', response.payload.data) : this.$emit('createdAddress', response.payload.data);
-                this.resetForm();
+                if(this.type==3){
+                    this.closeForm();
+                    this.$store.dispatch('reloadList', {'name': "addresslist"});
+                }else {
+                    this.type !== 2 ? this.$emit('updateDefaultAddress', response.payload.data) : this.$emit('createdAddress', response.payload.data);
+                    this.resetForm();
+                }
             }
         }
     }
diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
index 30bf75c4..66624778 100644
--- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -51,7 +51,7 @@
                             <div class="row m-b-10">
                                 <div class="col">
                                     <validation-wrapper-component :validator="$v.parameters.bank_branch">
-                                        <label class="muted">Bank Branch</label>
+                                        <label class="muted">Bank Branch / 所在地</label>
                                         <input type="text" class="form-control" v-model="parameters.bank_branch">
                                     </validation-wrapper-component>
                                 </div>
diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
index 71d4cc4d..2d3b9df6 100644
--- a/resources/assets/vue/components/bookings/elements/BookingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
@@ -23,7 +23,7 @@
         <div class="col" v-if="$store.getters.isAdmin">
             <div class="font-heading fs-10 muted all-caps">Marking</div>
             <div class="font-heading fs-12">
-                {{this.item.company.reference}}
+                <a :href="route('customer.profile', item.company.id)">{{this.item.company.reference}}</a>
             </div>
         </div>
         <div class="col-auto">
diff --git a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
index d8aaa0d1..19b6961b 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
@@ -63,7 +63,7 @@
                                         {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
-                                <div class="col-auto text-right">
+                                <div v-if="!no_action" class="col-auto text-right">
                                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectPayment">
                                         <i class="fa fa-times fa-fw"></i>
                                     </button>
@@ -132,6 +132,9 @@
     import componentHandler from '../../../general/mixins/componentHandler';
     import staticFormHandler from '../../../general/mixins/staticFormHandler'
     export default {
+        props: {
+            no_action: Boolean
+        },
         methods: {
             approvePayment(status){
                 this.isLoading = true;
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index f08e0e4c..c3bdc966 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -11,7 +11,7 @@
                                         <div class="col-8 p-r-0">
                                             <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
                                                 <div class="row">
-                                                    <div class="col p-t-5 p-b-5">
+                                                    <div class="col p-t-5 p-b-5 fs-9">
                                                         {{selectedSupplier.name}}
                                                     </div>
                                                     <div class="col-auto b-l b-success">
diff --git a/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue b/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue
index 3fc57ff1..4d02b219 100644
--- a/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue
@@ -1,13 +1,6 @@
 <template>
     <div class="row align-items-center m-b-10 parentContainer">
-        <div class="container p-0 m-0" @click="backToCompanyList()">
-            <i class="fa fa-arrow-left fs-11 align-middle"></i>
-            <span class="fs-11 m-0 align-middle pl-2 text-uppercase">Back to list</span>
-        </div>
-        <div class="row w-100 m-0 p-0">
-            <div class="col-auto p-0 pt-2 m-b-10" :style="minWidth">
-                <div class="h5 m-0">{{this.company_details.name ? this.company_details.name : ""}}</div>
-            </div>
+        <div class="row w-100 m-0 p-0" v-show="!displayAddressForm">
             <div class="col-12 p-0">
                 <label class="muted" :style="minWidth">Reference</label>
                 <label>{{this.company_details.reference ? this.company_details.reference : ""}}</label>
@@ -16,6 +9,10 @@
                 <label class="muted" :style="minWidth">Business Type</label>
                 <label>{{this.company_details.business_type ? getBusinessTypeDesc(this.company_details.business_type) : ""}}</label>
             </div>
+            <div class="col-12 p-0">
+                <label class="muted" :style="minWidth">Email</label>
+                <label><i class="fa fa-envelope text-primary fs-10"></i>&nbsp;{{this.company_details.employee ? this.company_details.employee.email : ""}}</label>
+            </div>
             <div class="col-12 p-0">
                 <label class="muted" :style="minWidth">Contacts</label>
                 <label><i class="fa fa-envelope text-primary fs-10"></i>&nbsp;{{this.company_details.contact ? this.company_details.contact.email : ""}}</label>
@@ -24,14 +21,47 @@
                 <label class="muted" :style="minWidth">&nbsp;</label>
                 <label><i class="fa fa-phone text-primary fs-10"></i>&nbsp;{{this.company_details.contact ? this.company_details.contact.phone : ""}}</label>
             </div>
-            <div class="col-12 p-0">
-                <label class="muted" :style="minWidth">Total Booking</label>
-                <label>{{this.company_details.bookings ? this.company_details.bookings.length : ""}}</label>
+            <div class="col-12 p-0" v-if="this.company_details.identification && this.company_details.identification.document_type">
+                <label class="muted pull-left" :style="minWidth">Identification</label>
+                <div class="col-4 pull-left p-l-0 p-b-5">
+                    <label>{{ this.company_details.identification.document_type === 'IDENTITY_CARD' ? 'IC' : 'SSM Registration' }}</label>
+                    <div class="row no-margin pull-right">
+                        <div v-for="file in this.company_details.identification.files" v-bind:key="file.id"  class="col-auto no-padding m-r-5">
+                            <document-file-viewer-component :file="file">
+                                <template slot="button">
+                                    <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
+                                        <i class="fa fa-file-image-o fs-10"></i>
+                                    </div>
+                                </template>
+                            </document-file-viewer-component>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="col-12 p-0">
+                <label class="muted m-b-0" :style="minWidth">Address&nbsp;</label>
+            </div>
+            <div class="col-12 b-t b-b b-grey p-t-5 p-b-5 m-t-5 m-b-5 p-l-0 p-r-0">
+                <list-component key="2" section="addresslist" :endpoint="route('api.address.list')" :options="{'company_id':this.company_details.id}" v-if="this.company_details.id">
+                    <template slot="list" slot-scope="{data}">
+                        <address-component :data="data" section="addressListItem"></address-component>
+                    </template>
+                </list-component>
+            </div>
+            <div class="col-12 p-0" style="width: 500px; height:350px">
                 <canvas id="booking-chart"></canvas>
             </div>
         </div>
+
+        <div class="col" v-show="this.displayAddressForm">
+            <div>Address form</div>
+            <address-form-component :id="parseInt(this.company_details.id)" :type="3" :addressData="this.address" v-if="this.company_details.id"></address-form-component>
+        </div>
+
+        <modal-component id="deleteAddressModal">
+            <address-modal-component section="deleteAddressModal" :address_id="this.address_id"></address-modal-component>
+        </modal-component>
+
     </div>
 </template>
 
@@ -46,6 +76,20 @@
                 required:true
             },
         },
+        mounted(){
+            this.$root.$on('deleteAddressConfirm', (id) => {
+                this.address_id=id;
+                $("#deleteAddressModal").closest('.modal').modal('show');
+            });
+            this.$root.$on('updateAddressForm', (address, show) => {
+                if(show) {
+                    this.address = address;
+                    this.displayAddressForm = true;
+                }else{
+                    this.displayAddressForm = false;
+                }
+            });
+        },
         data(){
             return {
                 minWidth:{
@@ -54,10 +98,15 @@
                 minWidth150:{
                     minWidth:'150px',
                 },
+                address_id:0,
+                address:{},
+                displayAddressForm:false
             }
         },
         watch: {
             company_details: function(newVal, oldVal) {
+                this.company_details=newVal;
+
                 if(newVal !== null) {
 
                     let approved  = 0, completed  = 0, rejected  = 0, expired  = 0, pending = 0;
@@ -106,16 +155,16 @@
                         },
                         options: {
                             responsive: true,
-                                plugins: {
-                                legend: {
-                                    position: 'bottom',
-                                },
-                                title: {
-                                    display: true,
-                                        text: 'Booking Activity'
-                                }
+                            maintainAspectRatio: false,
+                            legend: {
+                                position: 'right',
+                            },
+                            title: {
+                                display: true,
+                                text: 'Booking Activity (Total: '+this.company_details.bookings.length+')'
                             }
                         }
+
                     });
                 }
             }
diff --git a/resources/assets/vue/components/companies/elements/CompanyListComponent.vue b/resources/assets/vue/components/companies/elements/CompanyListComponent.vue
index e3da2853..9fe3c96a 100644
--- a/resources/assets/vue/components/companies/elements/CompanyListComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CompanyListComponent.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="row align-items-center m-b-10 parentContainer">
         <div class="row w-100 m-0 p-0 ">
-            <div class="col-8 pull-left mt-2 pr-0">
+            <div class="col pull-left mt-2 pr-0">
                 <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
             </div>
             <div class="col-2 text-center mt-2">
                 <div class="font-heading all-caps fs-11">{{this.item.bookings.length}}</div>
             </div>
-            <div class="col-2 text-right pull-right">
+            <div class="col-3 text-right pull-right">
+                <button type="button" @click="viewCompany()" class="btn btn-xs btn-info fs-11"><i class="fa fa-angle-down"></i></button>
                 <a :href="route('customer.profile', item.id)">
                     <button type="button" class="btn btn-xs btn-primary fs-11">View</button>
                 </a>
diff --git a/resources/assets/vue/components/companies/sections/CompanyQuickViewSectionComponent.vue b/resources/assets/vue/components/companies/sections/CompanyQuickViewSectionComponent.vue
index 5b46d2f2..00853fc5 100644
--- a/resources/assets/vue/components/companies/sections/CompanyQuickViewSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CompanyQuickViewSectionComponent.vue
@@ -2,17 +2,15 @@
     <div class="col-12">
         <div class="b-b b-dashed b-grey p-b-25" v-show="!this.show_details">
             <div class="row align-items-center m-b-5 parentContainer">
-
-                   <div class="col-8">
-                        <div class="font-heading fs-10 muted all-caps">Company</div>
-                    </div>
-                    <div class="col-2 text-center">
-                        <div class="font-heading fs-10 muted all-caps">Booking</div>
-                    </div>
-                    <div class="col-2 text-right pull-right">
-                        <div class="font-heading fs-10 muted all-caps">Action</div>
-                    </div>
-
+                <div class="col">
+                    <div class="font-heading fs-10 muted all-caps">Company</div>
+                </div>
+                <div class="col-2 text-center">
+                    <div class="font-heading fs-10 muted all-caps">Booking</div>
+                </div>
+                <div class="col-3 text-right pull-right">
+                    <div class="font-heading fs-10 muted all-caps">Action</div>
+                </div>
             </div>
             <list-component  key="2" :section="this.section" :endpoint="route('api.company.list')" :options="{'business_type': 2, with_bookings:true}">
                 <template slot="list" slot-scope="{data}">
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 54a6b6d6..1238ac6d 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -53,32 +53,13 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col">
-                                                    <div class="row fs-12 text-center">
-                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="transfers">
-                                                            <div class="row justify-content-center">
-                                                                <div class="col-auto">
-                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                         width="35" height="35"
-                                                                         viewBox="0 0 172 172"
-                                                                         style=" fill:#000000;"><defs><linearGradient x1="131.6875" y1="110.58794" x2="131.6875" y2="150.61556" gradientUnits="userSpaceOnUse" id="color-1_DhXzKyWAbozd_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="86.74444" x2="86" y2="148.45481" gradientUnits="userSpaceOnUse" id="color-2_DhXzKyWAbozd_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="22.41375" x2="86" y2="32.92994" gradientUnits="userSpaceOnUse" id="color-3_DhXzKyWAbozd_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="40.3125" y1="65.12888" x2="40.3125" y2="74.98125" gradientUnits="userSpaceOnUse" id="color-4_DhXzKyWAbozd_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="131.6875" y1="45.40262" x2="131.6875" y2="56.24131" gradientUnits="userSpaceOnUse" id="color-5_DhXzKyWAbozd_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86.00269" y1="16.40988" x2="86.00269" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-6_DhXzKyWAbozd_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="16.40988" x2="86" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-7_DhXzKyWAbozd_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="40.31519" y1="16.40988" x2="40.31519" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-8_DhXzKyWAbozd_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="131.69019" y1="16.40988" x2="131.69019" y2="161.42738" gradientUnits="userSpaceOnUse" id="color-9_DhXzKyWAbozd_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="40.3125" y1="128.94356" x2="40.3125" y2="150.2205" gradientUnits="userSpaceOnUse" id="color-10_DhXzKyWAbozd_gr10"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="48" y="41" transform="scale(2.6875,2.6875)" width="2" height="16" fill="url(#color-1_DhXzKyWAbozd_gr1)"></rect><rect x="31" y="32" transform="scale(2.6875,2.6875)" width="2" height="25" fill="url(#color-2_DhXzKyWAbozd_gr2)"></rect><path d="M83.06525,20.30675l-7.54113,12.15287c-0.73637,1.07231 0.09675,2.47788 1.46738,2.47788h18.01431c1.37331,0 2.20375,-1.40556 1.46738,-2.47788l-7.54112,-12.15287c-1.36525,-1.99144 -4.49887,-1.99144 -5.86681,0z" fill="url(#color-3_DhXzKyWAbozd_gr3)"></path><path d="M37.37775,63.30675l-7.54112,12.15288c-0.73638,1.07231 0.09675,2.47787 1.46737,2.47787h18.01431c1.37331,0 2.20375,-1.40556 1.46737,-2.47787l-7.54113,-12.15288c-1.36525,-1.99144 -4.49887,-1.99144 -5.86681,0z" fill="url(#color-4_DhXzKyWAbozd_gr4)"></path><path d="M128.75275,44.49425l-7.54112,12.15288c-0.73638,1.07231 0.09675,2.47787 1.46737,2.47787h18.01431c1.37331,0 2.20375,-1.40556 1.46738,-2.47788l-7.54112,-12.15288c-1.36525,-1.99144 -4.49888,-1.99144 -5.86681,0z" fill="url(#color-5_DhXzKyWAbozd_gr5)"></path><path d="M76.9915,37.625h6.321v16.125h5.375v-16.125h6.321c1.67162,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04763 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08013,0 -4.00706,0.99438 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88688,1.29537 -0.98631,2.96163 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM85.30125,21.79562c0.215,-0.27413 0.58588,-0.29562 0.69875,-0.29562c0.11556,0 0.51062,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-6_DhXzKyWAbozd_gr6)"></path><path d="M150.5,150.5v-61.8125c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v61.8125h-8.0625v-86c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v86h-8.0625v-43c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-26.875c-2.96431,0 -5.375,2.41069 -5.375,5.375v43h-5.375v5.375h8.0625h32.25h13.4375h32.25h16.125h26.875h10.75v-5.375zM99.4375,64.5v5.375h-26.875v-5.375zM53.75,107.5v5.375h-26.875v-5.375zM26.875,150.5v-32.25h26.875v32.25zM72.5625,150.5v-75.25h26.875v75.25zM145.125,88.6875v5.375h-26.875v-5.375zM118.25,150.5v-51.0625h26.875l0.00269,51.0625z" fill="url(#color-7_DhXzKyWAbozd_gr7)"></path><path d="M31.304,80.625h6.321v16.125h5.375v-16.125h6.321c1.67163,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04762 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08012,0 -4.00706,0.99438 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88687,1.29537 -0.98631,2.96162 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM39.61375,64.79563c0.215,-0.27412 0.58587,-0.29563 0.69875,-0.29563c0.11556,0 0.51062,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-8_DhXzKyWAbozd_gr8)"></path><path d="M122.679,61.8125h6.321v16.125h5.375v-16.125h6.321c1.67163,0 3.182,-0.89494 3.94256,-2.34081c0.72831,-1.38406 0.63156,-3.04762 -0.19081,-4.24356l-7.60831,-12.25769c-1.14487,-1.66356 -3.07181,-2.65794 -5.15194,-2.65794c-2.08013,0 -4.00706,0.99437 -5.15194,2.65794c-0.02419,0.03494 -0.04838,0.06987 -0.06719,0.10481l-7.47394,12.05075c-0.88688,1.29537 -0.98631,2.96162 -0.25531,4.343c0.76056,1.44856 2.27094,2.3435 3.93988,2.3435zM130.98875,45.98313c0.215,-0.27413 0.58587,-0.29563 0.69875,-0.29563c0.11556,0 0.51063,0.02419 0.65306,0.22306l6.53331,10.52694h-14.37006z" fill="url(#color-9_DhXzKyWAbozd_gr9)"></path><rect x="14" y="48" transform="scale(2.6875,2.6875)" width="2" height="8" fill="url(#color-10_DhXzKyWAbozd_gr10)"></rect></g></g></svg>
-                                                                </div>
-                                                            </div>
-                                                            <div class="row">
-                                                                <div class="col">
-                                                                    <div class="fs-12 m-t-5">Credit Profile</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
                                             </div>
                                         </div>
                                         <div class="col">
                                             <div class="row justify-content-end">
                                                 <div class="col-6">
                                                     <div class="row fs-12 text-center">
-                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="transfers">
+                                                        <div class="col p-t-15 p-b-15 bg-master-lighter tabButton" tab-name="profile" @click="refreshCompanyDetails()">
                                                             <div class="row justify-content-center">
                                                                 <div class="col-auto">
                                                                     <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -140,12 +121,26 @@
                                                         <div class="col">
                                                             <div class="row">
                                                                 <div class="col">
-                                                                    <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.address.list')">
+                                                                    <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3,'issuer_in':[this.id]}">
                                                                         <template slot="list" slot-scope="{data}">
-                                                                            <address-component :data="data"></address-component>
+                                                                            <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
                                                                         </template>
                                                                     </list-component>
                                                                 </div>
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row tabsContainer hide tabContent" tab-name="profile">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <company-details-component :company_details="company_details" section="customerProfileSection"></company-details-component>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -170,7 +165,7 @@
     export default {
         props: {
             id: {
-                type: Number,
+                type: String,
                 required: true
             }
         },
@@ -178,6 +173,7 @@
             return {
                 section: 'customerProfileSection',
                 company: null,
+                company_details: {},
                 bookingFilters: {
                     reference: '',
                     type: 0,
@@ -185,7 +181,10 @@
                     created_before: '',
                     created_after: '',
                     status: ''
-                }
+                },
+                address_id:0,
+                address:{},
+                displayAddressForm:false,
             }
         },
         computed: {
@@ -202,17 +201,21 @@
                 })
             }
         },
+
         watch: {
             pendingQueue(inComplete){
                 if(inComplete){
                     this.fetchCompany();
                 }
-            }
+            },
         },
         created(){
             this.$store.dispatch('updateListQueue', {'name': this.section});
         },
         methods: {
+            refreshCompanyDetails(){
+                this.company_details = this.company ;
+            },
             fetchCompany(){
                 this.submit(route('api.company.show', this.id), 'get', this.section, false, false)
             },
diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
index 27cc564f..df33cc3a 100644
--- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
@@ -1,37 +1,45 @@
 <template>
+
     <div class="row">
-        <div class="col-3">
+        <div class="order-last col-md-12 order-md-last col-lg-3 order-lg-first col-xl-3 order-xl-first">
             <div class="row">
                 <div class="col no-padding">
-                    <div class="absolute b-a b-success b-thick padding-5 animate__animated animate__infinite animate__pulse w-100 h-100" v-if="attention" style="top:0; left:0; z-index: -1;">
+                    <div
+                        class="absolute b-a b-success b-thick padding-5 animate__animated animate__infinite animate__pulse w-100 h-100"
+                        v-if="attention" style="top:0; left:0; z-index: -1;">
                         <div class="b-a b-thick b-success h-100"></div>
                     </div>
                     <div class="row">
                         <div class="col">
-                            <booking-form-component :data="company" section="customerProfileSection" v-if="company" v-on:click.native="attention = false"></booking-form-component>
+                            <booking-form-component :data="company" section="customerProfileSection" v-if="company"
+                                                    v-on:click.native="attention = false"></booking-form-component>
                         </div>
                     </div>
                 </div>
             </div>
 
         </div>
-        <div class="col">
-            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        <div class="order-first col-md-12 order-md-first col-lg order-lg-last col-xl order-xl-last">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success"
+                               v-show="isLoading"></loading-component>
             <div class="row" v-if="!isLoading">
                 <div class="col">
                     <div class="row m-l-0 m-r-0" v-show="!company.status || !company.bookings.length">
                         <div class="col">
-                            <onboarding-section-component :data="company" v-on:attention="attention = true"></onboarding-section-component>
+                            <onboarding-section-component :data="company"
+                                                          v-on:attention="attention = true"></onboarding-section-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer" v-show="(company.status === 2 || company.status === 1) && company.bookings.length">
+                    <div class="row tabsContainer"
+                         v-show="(company.status === 2 || company.status === 1) && company.bookings.length">
                         <div class="col">
                             <div class="row m-l-0 m-r-0 d-none d-md-flex">
                                 <div class="col">
                                     <div class="row">
                                         <div class="col m-r-5">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="transfers">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton"
+                                                     tab-name="transfers">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -69,13 +77,170 @@
                                         </div>
                                         <div class="col">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="PO">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton"
+                                                     tab-name="PO">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                                                  width="35" height="35"
                                                                  viewBox="0 0 172 172"
-                                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="15.84013" x2="86" y2="42.59956" gradientUnits="userSpaceOnUse" id="color-1_1GEnKV6fhh62_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-2_1GEnKV6fhh62_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-3_1GEnKV6fhh62_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-4_1GEnKV6fhh62_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-5_1GEnKV6fhh62_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-6_1GEnKV6fhh62_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-7_1GEnKV6fhh62_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-8_1GEnKV6fhh62_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-9_1GEnKV6fhh62_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-10_1GEnKV6fhh62_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="14.46681" x2="86" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-11_1GEnKV6fhh62_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z" fill="url(#color-1_1GEnKV6fhh62_gr1)"></path><rect x="19.043" y="33" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect><rect x="19.043" y="37" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect><rect x="19.043" y="42" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect><rect x="19.043" y="46" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect><rect x="19.043" y="24" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect><rect x="42" y="33" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect><rect x="42" y="42" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect><rect x="42" y="24" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect><rect x="19.043" y="28" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect><path d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-11_1GEnKV6fhh62_gr11)"></path></g></g></svg>
+                                                                 style=" fill:#000000;">
+                                                                <defs>
+                                                                    <linearGradient x1="86" y1="15.84013" x2="86"
+                                                                                    y2="42.59956"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-1_1GEnKV6fhh62_gr1">
+                                                                        <stop offset="0"
+                                                                              stop-color="#4ec9ff"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#2bffe6"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-2_1GEnKV6fhh62_gr2">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-3_1GEnKV6fhh62_gr3">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-4_1GEnKV6fhh62_gr4">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-5_1GEnKV6fhh62_gr5">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-6_1GEnKV6fhh62_gr6">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-7_1GEnKV6fhh62_gr7">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-8_1GEnKV6fhh62_gr8">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-9_1GEnKV6fhh62_gr9">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-10_1GEnKV6fhh62_gr10">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="86" y1="14.46681" x2="86"
+                                                                                    y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-11_1GEnKV6fhh62_gr11">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                </defs>
+                                                                <g fill="none" fill-rule="nonzero" stroke="none"
+                                                                   stroke-width="1" stroke-linecap="butt"
+                                                                   stroke-linejoin="miter" stroke-miterlimit="10"
+                                                                   stroke-dasharray="" stroke-dashoffset="0"
+                                                                   font-family="none" font-weight="none"
+                                                                   font-size="none" text-anchor="none"
+                                                                   style="mix-blend-mode: normal">
+                                                                    <path d="M0,172v-172h172v172z"
+                                                                          fill="none"></path>
+                                                                    <g id="original-icon">
+                                                                        <path
+                                                                            d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z"
+                                                                            fill="url(#color-1_1GEnKV6fhh62_gr1)"></path>
+                                                                        <rect x="19.043" y="33"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect>
+                                                                        <rect x="19.043" y="37"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect>
+                                                                        <rect x="19.043" y="42"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect>
+                                                                        <rect x="19.043" y="46"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect>
+                                                                        <rect x="19.043" y="24"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect>
+                                                                        <rect x="42" y="33"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect>
+                                                                        <rect x="42" y="42"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect>
+                                                                        <rect x="42" y="24"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect>
+                                                                        <rect x="19.043" y="28"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect>
+                                                                        <path
+                                                                            d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z"
+                                                                            fill="url(#color-11_1GEnKV6fhh62_gr11)"></path>
+                                                                    </g>
+                                                                </g>
+                                                            </svg>
                                                         </div>
                                                     </div>
                                                     <div class="row">
@@ -92,13 +257,170 @@
                                     <div class="row justify-content-end">
                                         <div class="col-8">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="complete">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton"
+                                                     tab-name="complete">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                                                  width="35" height="35"
                                                                  viewBox="0 0 172 172"
-                                                                 style=" fill:#000000;"><defs><linearGradient x1="86" y1="15.84013" x2="86" y2="42.59956" gradientUnits="userSpaceOnUse" id="color-1_1GEnKV6fhh62_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-2_1GEnKV6fhh62_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-3_1GEnKV6fhh62_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-4_1GEnKV6fhh62_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-5_1GEnKV6fhh62_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-6_1GEnKV6fhh62_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-7_1GEnKV6fhh62_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-8_1GEnKV6fhh62_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-9_1GEnKV6fhh62_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-10_1GEnKV6fhh62_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="14.46681" x2="86" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-11_1GEnKV6fhh62_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z" fill="url(#color-1_1GEnKV6fhh62_gr1)"></path><rect x="19.043" y="33" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect><rect x="19.043" y="37" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect><rect x="19.043" y="42" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect><rect x="19.043" y="46" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect><rect x="19.043" y="24" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect><rect x="42" y="33" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect><rect x="42" y="42" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect><rect x="42" y="24" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect><rect x="19.043" y="28" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect><path d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-11_1GEnKV6fhh62_gr11)"></path></g></g></svg>
+                                                                 style=" fill:#000000;">
+                                                                <defs>
+                                                                    <linearGradient x1="86" y1="15.84013" x2="86"
+                                                                                    y2="42.59956"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-1_1GEnKV6fhh62_gr1">
+                                                                        <stop offset="0"
+                                                                              stop-color="#4ec9ff"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#2bffe6"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-2_1GEnKV6fhh62_gr2">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-3_1GEnKV6fhh62_gr3">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-4_1GEnKV6fhh62_gr4">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-5_1GEnKV6fhh62_gr5">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="75.30644" y1="14.46681"
+                                                                                    x2="75.30644" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-6_1GEnKV6fhh62_gr6">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-7_1GEnKV6fhh62_gr7">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-8_1GEnKV6fhh62_gr8">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="116.90625" y1="14.46681"
+                                                                                    x2="116.90625" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-9_1GEnKV6fhh62_gr9">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="65.84106" y1="14.46681"
+                                                                                    x2="65.84106" y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-10_1GEnKV6fhh62_gr10">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                    <linearGradient x1="86" y1="14.46681" x2="86"
+                                                                                    y2="157.82344"
+                                                                                    gradientUnits="userSpaceOnUse"
+                                                                                    id="color-11_1GEnKV6fhh62_gr11">
+                                                                        <stop offset="0"
+                                                                              stop-color="#009add"></stop>
+                                                                        <stop offset="1"
+                                                                              stop-color="#00baa4"></stop>
+                                                                    </linearGradient>
+                                                                </defs>
+                                                                <g fill="none" fill-rule="nonzero" stroke="none"
+                                                                   stroke-width="1" stroke-linecap="butt"
+                                                                   stroke-linejoin="miter" stroke-miterlimit="10"
+                                                                   stroke-dasharray="" stroke-dashoffset="0"
+                                                                   font-family="none" font-weight="none"
+                                                                   font-size="none" text-anchor="none"
+                                                                   style="mix-blend-mode: normal">
+                                                                    <path d="M0,172v-172h172v172z"
+                                                                          fill="none"></path>
+                                                                    <g id="original-icon">
+                                                                        <path
+                                                                            d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z"
+                                                                            fill="url(#color-1_1GEnKV6fhh62_gr1)"></path>
+                                                                        <rect x="19.043" y="33"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect>
+                                                                        <rect x="19.043" y="37"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect>
+                                                                        <rect x="19.043" y="42"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect>
+                                                                        <rect x="19.043" y="46"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect>
+                                                                        <rect x="19.043" y="24"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="17.957" height="2"
+                                                                              fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect>
+                                                                        <rect x="42" y="33"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect>
+                                                                        <rect x="42" y="42"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect>
+                                                                        <rect x="42" y="24"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="3" height="2"
+                                                                              fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect>
+                                                                        <rect x="19.043" y="28"
+                                                                              transform="scale(2.6875,2.6875)"
+                                                                              width="10.912" height="2"
+                                                                              fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect>
+                                                                        <path
+                                                                            d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z"
+                                                                            fill="url(#color-11_1GEnKV6fhh62_gr11)"></path>
+                                                                    </g>
+                                                                </g>
+                                                            </svg>
                                                         </div>
                                                     </div>
                                                     <div class="row">
@@ -120,9 +442,12 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <list-component key="2" section="transferSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 2}">
+                                                            <list-component key="2" section="transferSection"
+                                                                            :endpoint="route('api.booking.list')"
+                                                                            :options="{per_page: 10, status: 2}">
                                                                 <template slot="list" slot-scope="{data}">
-                                                                    <booking-component :data="data"></booking-component>
+                                                                    <booking-component
+                                                                        :data="data"></booking-component>
                                                                 </template>
                                                             </list-component>
                                                         </div>
@@ -137,9 +462,12 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <list-component key="2" section="pendingPaymentsSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 2, pending_payment: true}">
+                                                            <list-component key="2" section="pendingPaymentsSection"
+                                                                            :endpoint="route('api.booking.list')"
+                                                                            :options="{per_page: 10, status: 2, pending_payment: true}">
                                                                 <template slot="list" slot-scope="{data}">
-                                                                    <booking-component :data="data"></booking-component>
+                                                                    <booking-component
+                                                                        :data="data"></booking-component>
                                                                 </template>
                                                             </list-component>
                                                         </div>
@@ -154,9 +482,13 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <list-component key="2" section="PendingPurchaseOrdersSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 2, pending_purchase_order: true}">
+                                                            <list-component key="2"
+                                                                            section="PendingPurchaseOrdersSection"
+                                                                            :endpoint="route('api.booking.list')"
+                                                                            :options="{per_page: 10, status: 2, pending_purchase_order: true}">
                                                                 <template slot="list" slot-scope="{data}">
-                                                                    <booking-component :data="data"></booking-component>
+                                                                    <booking-component
+                                                                        :data="data"></booking-component>
                                                                 </template>
                                                             </list-component>
                                                         </div>
@@ -171,9 +503,13 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <list-component key="2" section="completeTransferSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 3}">
+                                                            <list-component key="2"
+                                                                            section="completeTransferSection"
+                                                                            :endpoint="route('api.booking.list')"
+                                                                            :options="{per_page: 10, status: 3}">
                                                                 <template slot="list" slot-scope="{data}">
-                                                                    <booking-component :data="data"></booking-component>
+                                                                    <booking-component
+                                                                        :data="data"></booking-component>
                                                                 </template>
                                                             </list-component>
                                                         </div>
@@ -189,46 +525,47 @@
                 </div>
             </div>
         </div>
-        <div class="col-2 p-l-0 p-r-0">
-            <verification-warning-component v-if="!isLoading && company.bookings.length"  :data="company"></verification-warning-component>
+        <div class="col-2 p-l-0 p-r-0 order-last">
+            <verification-warning-component v-if="!isLoading && company.bookings.length"
+                                            :data="company"></verification-warning-component>
         </div>
     </div>
 </template>
 <script>
-    export default {
-        data(){
-            return {
-                section: 'customerProfileSection',
-                isLoading: true,
-                company: null,
-                attention: false
-            }
-        },
-        computed: {
-            pendingQueue () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            }
-        },
-        watch: {
-            pendingQueue(inComplete){
-                if(inComplete){
-                    this.fetchCompany();
-                }
-            }
-        },
-        created(){
-            this.$store.dispatch('updateListQueue', {'name': this.section});
-        },
-        methods: {
-            fetchCompany(){
-                this.isLoading = true;
-                this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false)
-            },
-            successHandler(response){
-                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
-                this.isLoading = false;
-                this.company = response.payload.data;
+export default {
+    data(){
+        return {
+            section: 'customerProfileSection',
+            isLoading: true,
+            company: null,
+            attention: false
+        }
+    },
+    computed: {
+        pendingQueue () {
+            return this.$store.getters.isInCompleteQueue(this.section);
+        }
+    },
+    watch: {
+        pendingQueue(inComplete){
+            if(inComplete){
+                this.fetchCompany();
             }
         }
+    },
+    created(){
+        this.$store.dispatch('updateListQueue', {'name': this.section});
+    },
+    methods: {
+        fetchCompany(){
+            this.isLoading = true;
+            this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false)
+        },
+        successHandler(response){
+            this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+            this.isLoading = false;
+            this.company = response.payload.data;
+        }
     }
-</script>
\ No newline at end of file
+}
+</script>
diff --git a/resources/assets/vue/components/settings/elements/UserProfileComponent.vue b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
new file mode 100644
index 00000000..d2610144
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
@@ -0,0 +1,64 @@
+<template>
+    <div class="col">
+
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Full Name</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserName"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editFullName">
+                    <i class="fa fa-pencil m-r-10"></i>Edit
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Password</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted">********</div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal"  data-type="resetPassword">
+                    <i class="fa fa-lock m-r-10"></i>Request Password Reset
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Email Address</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
+                    <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
+                </div>
+            </div>
+        </div>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editFullName">
+            <edit-user-profile-fullname-form-component :data="{name: $store.getters.getUserName}" :section="section"></edit-user-profile-fullname-form-component>
+        </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="resetPassword">
+            <reset-user-password-form-component :data="{email: $store.getters.getUserEmail}"  section="resetPassword"></reset-user-password-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+export default {
+  props: {
+    section: {
+      default: "editFullNameSection",
+    },
+  },
+};
+</script>
diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
new file mode 100644
index 00000000..c427ab16
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Full Name</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="fs-12">Full Name</div>
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.user.update', '1'), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    name: ''
+                }
+            }
+        },
+        mixins: [updateProfileFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
new file mode 100644
index 00000000..ca22298d
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Reset Password</h3>
+                            <p>A reset password link will send to your email account</p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.authentication.password.forget', '1'), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import resetPasswordFormValidation from '../../../general/mixins/accounts/validation/resetPasswordFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: ''
+                }
+            }
+        },
+        mixins: [resetPasswordFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/elements/UserComponent.vue b/resources/assets/vue/components/user/elements/UserComponent.vue
index 410e16d9..20b57e6f 100644
--- a/resources/assets/vue/components/user/elements/UserComponent.vue
+++ b/resources/assets/vue/components/user/elements/UserComponent.vue
@@ -1,80 +1,45 @@
 <template>
-    <div class="row m-b-10">
+    <div class="row m-b-15 parentContainer">
         <div class="col">
-            <div class="row no-margin">
-                <div class="col bg-master-lightest">
-                    <div class="row align-items-center justify-content-center fs-11">
-                        <div class="col-auto p-r-10 p-l-10 p-t-15 p-b-15 bg-master-lighter">
-                            <svg v-if="user.role_id === 0" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                 width="25" height="25"
-                                 viewBox="0 0 172 172"
-                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon" fill="#000000"><path d="M83.26211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-6.78594,5.54297 -11.11113,11.10274 -11.11113,11.10274l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,6.02168 0.92383,10.88438 1.38574,12.94199c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.20703 5.34141,5.30781c0.39473,8.33125 4.40918,15.68828 10.51484,20.53418v8.02051c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-4.94668,2.33477 -9.91855,5.14824 -13.79024,8.48242c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976v12.9h111.8v-12.9c0,-4.68633 -2.92266,-8.67559 -6.79434,-12.00976c-3.87168,-3.33418 -8.84355,-6.14766 -13.79024,-8.48242c-7.57539,-3.57773 -15.01641,-5.97969 -18.11543,-6.92031v-8.01211c6.10566,-4.8459 10.12012,-12.20293 10.51484,-20.54258c2.88906,-0.10078 5.34141,-2.38516 5.34141,-5.30781c0,0.31074 0.0252,-0.09238 0.13438,-0.50391c0.10918,-0.41152 0.27715,-0.95742 0.44512,-1.54531c0.34434,-1.16738 0.76426,-2.35996 0.76426,-3.7541c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.39473,-2.26758 2.02402,-11.97617 2.02402,-18.8041c0,-7.72656 -2.88906,-13.26113 -6.78594,-16.69609c-3.50215,-3.07383 -7.61738,-4.3084 -11.2623,-4.56875c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM83.26211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94062,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM101.05,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.45351 -3.09902,-1.21777l-0.46191,-0.42832l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89687c-0.73906,0 -1.20938,-0.50391 -1.20938,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM74.175,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.825,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM73.1,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM68.8,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM43,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
-                            <svg v-if="user.role_id === 1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                 width="25" height="25"
-                                 viewBox="0 0 172 172"
-                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none" stroke="none"></path><g id="original-icon" fill="#000000" stroke="none" opacity="0" visibility="hidden"><path d="M83.26211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-6.78594,5.54297 -11.11113,11.10274 -11.11113,11.10274l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,6.02168 0.92383,10.88438 1.38574,12.94199c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.20703 5.34141,5.30781c0.39473,8.33125 4.40918,15.68828 10.51484,20.53418v8.02051c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-4.94668,2.33477 -9.91855,5.14824 -13.79024,8.48242c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976v12.9h111.8v-12.9c0,-4.68633 -2.92266,-8.67559 -6.79434,-12.00976c-3.87168,-3.33418 -8.84355,-6.14766 -13.79024,-8.48242c-7.57539,-3.57773 -15.01641,-5.97969 -18.11543,-6.92031v-8.01211c6.10566,-4.8459 10.12012,-12.20293 10.51484,-20.54258c2.88906,-0.10078 5.34141,-2.38516 5.34141,-5.30781c0,0.31074 0.0252,-0.09238 0.13438,-0.50391c0.10918,-0.41152 0.27715,-0.95742 0.44512,-1.54531c0.34434,-1.16738 0.76426,-2.35996 0.76426,-3.7541c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.39473,-2.26758 2.02402,-11.97617 2.02402,-18.8041c0,-7.72656 -2.88906,-13.26113 -6.78594,-16.69609c-3.50215,-3.07383 -7.61738,-4.3084 -11.2623,-4.56875c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM83.26211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94062,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM101.05,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.45351 -3.09902,-1.21777l-0.46191,-0.42832l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89687c-0.73906,0 -1.20938,-0.50391 -1.20938,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM74.175,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.825,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM73.1,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM68.8,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM43,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g><g id="subtracted-icon" fill="#000000" stroke="none"><path d="M98.56406,24.10352c2.1584,1.68809 3.1998,3.14941 3.7877,4.08164c3.64492,0.26035 7.76016,1.49492 11.2623,4.56875c3.89688,3.43496 6.78594,8.96953 6.78594,16.69609c0,6.82793 -1.6293,16.53652 -2.02402,18.8041c1.22617,1.1002 2.02402,2.65391 2.02402,4.41758c0,1.39414 -0.41992,2.58672 -0.76426,3.7541c-0.16797,0.58789 -0.33594,1.13379 -0.44512,1.54531c-0.10918,0.41152 -0.13438,0.81465 -0.13438,0.50391c0,2.92266 -2.45234,5.20703 -5.34141,5.30781c-0.39473,8.33965 -4.40918,15.69668 -10.51484,20.54258v8.01211c0.00055,0.00017 0.0011,0.00033 0.00165,0.0005c0.00801,1.55675 0.04506,3.07687 0.10946,4.56118c-0.03736,-0.01176 -0.0744,-0.0234 -0.11111,-0.03493v4.03965l-0.22676,0.46191c0,0 -5.07266,9.78418 -16.97324,9.78418c-11.90059,0 -16.97324,-9.78418 -16.97324,-9.78418l-0.22676,-0.46191v-4.03965c-3.45176,1.0834 -9.77578,3.2166 -16.28457,6.29043c-4.72832,2.23399 -9.43144,4.92988 -12.81601,7.84414c-3.38457,2.91426 -5.29941,5.9125 -5.29941,8.75117v8.6h75.81824c0.68254,1.50998 1.39861,2.9421 2.14059,4.3h-82.25883v-12.9c0,-4.68633 2.92266,-8.67559 6.79434,-12.00976c3.87168,-3.33418 8.84356,-6.14766 13.79024,-8.48242c7.57539,-3.57773 15.01641,-5.97969 18.11543,-6.92031v-8.02051c-6.10566,-4.8459 -10.12012,-12.20293 -10.51484,-20.53418c-2.88906,-0.10078 -5.34141,-2.38516 -5.34141,-5.30781c0,0.31074 -0.0252,-0.09238 -0.13437,-0.50391c-0.10918,-0.41152 -0.27715,-0.95742 -0.44512,-1.54531c-0.34434,-1.16738 -0.76426,-2.35996 -0.76426,-3.7541c0,-1.73008 0.77266,-3.27539 1.97363,-4.36719c-0.46191,-2.05762 -1.38574,-6.92031 -1.38574,-12.94199c0,-4.64434 -1.50332,-7.09668 -2.90586,-8.53281c-1.41094,-1.44453 -2.58672,-1.77207 -2.58672,-1.77207l-3.03184,-0.89023l1.94004,-2.48594c0,0 4.32519,-5.55977 11.11113,-11.10274c6.78594,-5.53457 16.1418,-11.22871 26.54746,-11.22871c7.23105,0 12.20293,2.34316 15.30195,4.75352zM59.43574,33.92129c-4.70312,3.83809 -7.46621,6.93711 -8.95273,8.68398c0.78105,0.46191 0.98262,0.30234 1.88125,1.22617c2.10801,2.1668 4.12363,5.9041 4.12363,11.53105c0,5.18184 0.70547,9.22988 1.14219,11.3043c0.05039,0 0.10078,-0.0168 0.15117,-0.0168c0.18477,0 0.15957,0.05039 0.27715,0.06719c0.0168,-6.83633 3.68691,-11.87539 8.09609,-14.95762c4.42598,-3.09062 9.52383,-4.45957 13.39551,-4.45957c7.07149,0 12.12734,-1.53691 15.39434,-3.03184c3.26699,-1.49492 4.61914,-2.82187 4.61914,-2.82187l0.94062,-0.89863l1.22617,0.41152c0,0 3.16621,1.075 6.18965,4.00606c3.02344,2.93105 6.03008,7.87773 6.03008,15.23476v6.50879c0.11758,-0.0168 0.08399,-0.05879 0.26875,-0.05879c0.0168,0 0.0252,0 0.03359,0c0.41992,-2.45234 1.84766,-11.20351 1.84766,-17.2c0,-6.68516 -2.32637,-10.81719 -5.33301,-13.4627c-2.99824,-2.64551 -6.85312,-3.7373 -9.71699,-3.7373h-1.33535l-0.58789,-1.20098c0,0 -0.79785,-1.66289 -3.2166,-3.55254c-2.41035,-1.88965 -6.33242,-3.84649 -12.64805,-3.84649c-8.80156,0 -17.43516,5.05586 -23.82637,10.27129zM96.7332,48.18184c-3.7877,1.73008 -9.48184,3.41816 -17.1832,3.41816c-2.77148,0 -7.34023,1.17578 -10.93476,3.68691c-3.59453,2.51113 -6.26524,6.11406 -6.26524,11.47226v6.9959l-3.2334,-1.89805c-0.5543,-0.31914 -1.0666,-0.60469 -1.42774,-0.78945c-0.04199,-0.0252 -0.05879,-0.0252 -0.10078,-0.05039c-0.98262,0.10078 -1.68809,0.78945 -1.68809,1.65449c0,0.15957 0.25195,1.41934 0.57949,2.54473c0.16797,0.5543 0.33594,1.11699 0.47871,1.6293c0.14277,0.5123 0.28555,0.87344 0.28555,1.6293c0,0.57109 0.47031,1.075 1.20938,1.075h3.89687v2.93945c0,11.65703 8.40684,21.29004 19.47598,23.26367l0.61309,0.10078l0.46191,0.42832c0.83984,0.76426 1.89805,1.21777 3.09902,1.21777c1.20098,0 2.25918,-0.45351 3.09902,-1.21777l0.46191,-0.42832l0.61309,-0.10078c11.06914,-1.97363 19.47598,-11.60664 19.47598,-23.26367v-2.93945h3.89688c0.73906,0 1.20937,-0.50391 1.20937,-1.075c0,-0.75586 0.14277,-1.11699 0.27715,-1.6293c0.14278,-0.51231 0.31074,-1.075 0.47871,-1.6293c0.32754,-1.12539 0.58789,-2.38516 0.58789,-2.54473v-0.0084c0,-0.85664 -0.70547,-1.54531 -1.68809,-1.64609c-0.04199,0.0252 -0.05879,0.0252 -0.10078,0.05039c-0.36113,0.18476 -0.87344,0.47031 -1.42774,0.78945l-3.2334,1.89805v-13.55508c0,-6.22324 -2.36836,-9.86816 -4.71992,-12.15254c-1.99883,-1.93164 -3.35937,-2.35996 -3.88008,-2.56152c-0.76426,0.62149 -1.50332,1.41094 -4.3168,2.6959zM77.4,74.175c0,1.78047 -1.44453,3.225 -3.225,3.225c-1.78047,0 -3.225,-1.44453 -3.225,-3.225c0,-1.78047 1.44453,-3.225 3.225,-3.225c1.78047,0 3.225,1.44453 3.225,3.225zM101.05,74.175c0,1.78047 -1.44453,3.225 -3.225,3.225c-1.78047,0 -3.225,-1.44453 -3.225,-3.225c0,-1.78047 1.44453,-3.225 3.225,-3.225c1.78047,0 3.225,1.44453 3.225,3.225zM73.1,119.72813c0.26035,0.5207 3.66172,7.12188 12.9,7.12188c9.23828,0 12.63965,-6.60117 12.9,-7.12188v-12.59766c-2.30117,1.20938 -4.78711,2.1332 -7.42422,2.65391c-1.51172,1.20098 -3.38457,2.01563 -5.47578,2.01563c-2.09961,0 -3.98086,-0.81465 -5.50098,-2.02402c-2.62871,-0.5291 -5.10625,-1.45293 -7.39902,-2.65391zM45.15,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM53.75,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM62.35,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM70.95,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM79.55,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM88.15,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM96.75,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM105.35,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15z"></path></g><g fill="#000000" stroke="none"><g id="Layer_1"><path d="M169.85,109.54465c-16.45395,0 -29.02715,-6.063 -29.154,-6.12535c-0.59555,-0.29025 -1.29645,-0.29455 -1.8963,0c-0.12255,0.06235 -12.63985,6.12535 -29.1497,6.12535c-1.1868,0 -2.15,0.9632 -2.15,2.15c0,49.6435 30.3107,59.79795 31.60285,60.20645c0.2107,0.0645 0.42785,0.0989 0.64715,0.0989c0.2193,0 0.43645,-0.0344 0.64715,-0.0989c1.29215,-0.4085 31.60285,-10.56295 31.60285,-60.20645c0,-1.18895 -0.9632,-2.15 -2.15,-2.15zM139.75,167.56455c-4.3,-1.67915 -27.16955,-12.54955 -27.93065,-53.75215c13.98575,-0.4128 24.7465,-4.68915 27.93065,-6.09525c3.18415,1.40825 13.9449,5.68245 27.93065,6.09525c-0.7611,41.2026 -23.63065,52.073 -27.93065,53.75215zM156.9371,122.6145l0.0215,-0.25155c0.10105,-1.1825 1.1352,-2.06615 2.32845,-1.9565c1.1825,0.1032 2.0597,1.14595 1.9565,2.32845l-0.01505,0.1849c-0.0817,1.1309 -1.02555,1.99735 -2.14355,1.99735c-0.0516,0 -0.1032,-0.00215 -0.1548,-0.0043c-1.18465,-0.08385 -2.0769,-1.1137 -1.99305,-2.29835zM155.53745,131.12635c0.2752,-1.1524 1.45985,-1.97155 2.61225,-1.6985c1.15455,0.27305 1.89415,1.32225 1.62325,2.4768c-0.00215,0.0043 -0.03225,0.1333 -0.0344,0.1376c-0.2408,0.989 -1.1395,1.6856 -2.11775,1.6856c-0.16125,0 -0.3225,-0.01935 -0.4859,-0.05805c-1.15025,-0.27735 -1.87265,-1.3889 -1.59745,-2.54345zM149.2358,149.78405c-0.98685,-0.6579 -1.25345,-1.99305 -0.59555,-2.98205l0.12685,-0.1892c0.66435,-0.9847 1.99735,-1.24485 2.9842,-0.5848c0.9847,0.66435 1.247,1.9995 0.5848,2.9842l-0.11825,0.17415c-0.41495,0.62135 -1.0965,0.95675 -1.79095,0.95675c-0.41065,0.00215 -0.82345,-0.11395 -1.1911,-0.35905zM152.77685,139.2813l0.09245,-0.215c0.47515,-1.0879 1.74365,-1.58455 2.83155,-1.10725c1.0879,0.47515 1.58455,1.74365 1.10725,2.83155l-0.0817,0.1849c-0.3483,0.81485 -1.14165,1.3029 -1.97585,1.3029c-0.28165,0 -0.56975,-0.0559 -0.8471,-0.1763c-1.0879,-0.46655 -1.5953,-1.7286 -1.1266,-2.8208zM143.2029,156.4512c-0.84065,-0.84065 -0.84065,-2.19945 0,-3.0401c0.8299,-0.84925 2.2618,-0.9331 3.1089,-0.10105c0.84925,0.83205 0.93095,2.12205 0.10105,2.96915l-0.16985,0.172c-0.41925,0.41925 -0.96965,0.62995 -1.52005,0.62995c-0.5504,0 -1.09865,-0.2107 -1.52005,-0.62995z"></path></g><g id="Layer_1" opacity="0"><path d="M169.85,105.24465c-15.28435,0 -27.1545,-5.63515 -27.27275,-5.69105c-0.87075,-0.4257 -1.85115,-0.6536 -2.8294,-0.6536c-0.98255,0 -1.9651,0.2279 -2.8466,0.6622c-0.10535,0.0516 -11.91315,5.68245 -27.25125,5.68245c-3.5561,0 -6.45,2.8939 -6.45,6.45c0,52.75455 33.1917,63.8593 34.6064,64.3065c0.63855,0.19995 1.28785,0.29885 1.9436,0.29885c0.65575,0 1.30505,-0.0989 1.93285,-0.2967c1.42545,-0.44935 34.61715,-11.5541 34.61715,-64.30865c0,-3.55825 -2.8939,-6.45 -6.45,-6.45z"></path></g></g><path d="M107.5,172v-68.8h64.5v68.8z" id="overlay-drag" fill="#ff0000" stroke="none" opacity="0"></path></g></svg>
-                            <svg v-if="user.role_id === 2" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                 width="25" height="25"
-                                 viewBox="0 0 172 172"
-                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none" stroke="none"></path><g id="original-icon" fill="#000000" stroke="none" opacity="0" visibility="hidden"><path d="M83.26211,19.35c-10.40566,0 -19.76153,5.69414 -26.54746,11.22871c-6.78594,5.54297 -11.11113,11.10274 -11.11113,11.10274l-1.94004,2.48594l3.03184,0.89023c0,0 1.17578,0.32754 2.58672,1.77207c1.40254,1.43613 2.90586,3.88848 2.90586,8.53281c0,6.02168 0.92383,10.88438 1.38574,12.94199c-1.20098,1.0918 -1.97363,2.63711 -1.97363,4.36719c0,1.39414 0.41992,2.58672 0.76426,3.7541c0.16797,0.58789 0.33594,1.13379 0.44512,1.54531c0.10918,0.41152 0.13437,0.81465 0.13437,0.50391c0,2.92266 2.45234,5.20703 5.34141,5.30781c0.39473,8.33125 4.40918,15.68828 10.51484,20.53418v8.02051c-3.09902,0.94062 -10.54004,3.34258 -18.11543,6.92031c-4.94668,2.33477 -9.91855,5.14824 -13.79024,8.48242c-3.87168,3.33418 -6.79434,7.32344 -6.79434,12.00976v12.9h111.8v-12.9c0,-4.68633 -2.92266,-8.67559 -6.79434,-12.00976c-3.87168,-3.33418 -8.84355,-6.14766 -13.79024,-8.48242c-7.57539,-3.57773 -15.01641,-5.97969 -18.11543,-6.92031v-8.01211c6.10566,-4.8459 10.12012,-12.20293 10.51484,-20.54258c2.88906,-0.10078 5.34141,-2.38516 5.34141,-5.30781c0,0.31074 0.0252,-0.09238 0.13438,-0.50391c0.10918,-0.41152 0.27715,-0.95742 0.44512,-1.54531c0.34434,-1.16738 0.76426,-2.35996 0.76426,-3.7541c0,-1.76367 -0.79785,-3.31738 -2.02402,-4.41758c0.39473,-2.26758 2.02402,-11.97617 2.02402,-18.8041c0,-7.72656 -2.88906,-13.26113 -6.78594,-16.69609c-3.50215,-3.07383 -7.61738,-4.3084 -11.2623,-4.56875c-0.58789,-0.93223 -1.6293,-2.39355 -3.7877,-4.08164c-3.09902,-2.41035 -8.0709,-4.75352 -15.30195,-4.75352zM83.26211,23.65c6.31562,0 10.23769,1.95684 12.64805,3.84649c2.41875,1.88965 3.2166,3.55254 3.2166,3.55254l0.58789,1.20098h1.33535c2.86387,0 6.71875,1.0918 9.71699,3.7373c3.00664,2.64551 5.33301,6.77754 5.33301,13.4627c0,5.99649 -1.42773,14.74766 -1.84766,17.2c-0.0084,0 -0.0168,0 -0.03359,0c-0.18476,0 -0.15117,0.04199 -0.26875,0.05879v-6.50879c0,-7.35703 -3.00664,-12.30371 -6.03008,-15.23476c-3.02344,-2.93106 -6.18965,-4.00606 -6.18965,-4.00606l-1.22617,-0.41152l-0.94062,0.89863c0,0 -1.35215,1.32695 -4.61914,2.82187c-3.26699,1.49492 -8.32285,3.03184 -15.39434,3.03184c-3.87168,0 -8.96953,1.36895 -13.39551,4.45957c-4.40918,3.08223 -8.0793,8.12129 -8.09609,14.95762c-0.11758,-0.0168 -0.09238,-0.06719 -0.27715,-0.06719c-0.05039,0 -0.10078,0.0168 -0.15117,0.0168c-0.43672,-2.07441 -1.14219,-6.12246 -1.14219,-11.3043c0,-5.62695 -2.01562,-9.36426 -4.12363,-11.53105c-0.89863,-0.92383 -1.1002,-0.76426 -1.88125,-1.22617c1.48652,-1.74688 4.24961,-4.8459 8.95273,-8.68398c6.39121,-5.21543 15.02481,-10.27129 23.82637,-10.27129zM101.05,45.48594c0.5207,0.20156 1.88125,0.62988 3.88008,2.56152c2.35156,2.28438 4.71992,5.9293 4.71992,12.15254v13.55508l3.2334,-1.89805c0.5543,-0.31914 1.0666,-0.60469 1.42774,-0.78945c0.04199,-0.0252 0.05879,-0.0252 0.10078,-0.05039c0.98262,0.10078 1.68809,0.78945 1.68809,1.64609v0.0084c0,0.15957 -0.26035,1.41934 -0.58789,2.54473c-0.16797,0.5543 -0.33594,1.11699 -0.47871,1.6293c-0.13438,0.5123 -0.27715,0.87344 -0.27715,1.6293c0,0.57109 -0.47031,1.075 -1.20937,1.075h-3.89688v2.93945c0,11.65703 -8.40684,21.29004 -19.47598,23.26367l-0.61309,0.10078l-0.46191,0.42832c-0.83984,0.76426 -1.89805,1.21777 -3.09902,1.21777c-1.20098,0 -2.25918,-0.45351 -3.09902,-1.21777l-0.46191,-0.42832l-0.61309,-0.10078c-11.06914,-1.97363 -19.47598,-11.60664 -19.47598,-23.26367v-2.93945h-3.89687c-0.73906,0 -1.20938,-0.50391 -1.20938,-1.075c0,-0.75586 -0.14277,-1.11699 -0.28555,-1.6293c-0.14278,-0.51231 -0.31074,-1.075 -0.47871,-1.6293c-0.32754,-1.12539 -0.57949,-2.38516 -0.57949,-2.54473c0,-0.86504 0.70547,-1.55371 1.68809,-1.65449c0.04199,0.0252 0.05879,0.0252 0.10078,0.05039c0.36113,0.18476 0.87344,0.47031 1.42774,0.78945l3.2334,1.89805v-6.9959c0,-5.3582 2.6707,-8.96113 6.26524,-11.47226c3.59453,-2.51113 8.16328,-3.68691 10.93476,-3.68691c7.70137,0 13.39551,-1.68809 17.1832,-3.41816c2.81347,-1.28496 3.55254,-2.07441 4.3168,-2.6959zM74.175,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM97.825,70.95c-1.78047,0 -3.225,1.44453 -3.225,3.225c0,1.78047 1.44453,3.225 3.225,3.225c1.78047,0 3.225,-1.44453 3.225,-3.225c0,-1.78047 -1.44453,-3.225 -3.225,-3.225zM73.1,107.12207c2.29277,1.20098 4.77031,2.1248 7.39902,2.65391c1.52012,1.20938 3.40137,2.02402 5.50098,2.02402c2.09121,0 3.96406,-0.81465 5.47578,-2.01562c2.63711,-0.5207 5.12305,-1.44453 7.42422,-2.65391v12.59766c-0.26035,0.5207 -3.66172,7.12188 -12.9,7.12188c-9.23828,0 -12.63965,-6.60117 -12.9,-7.12188zM68.8,116.86426v4.03965l0.22676,0.46191c0,0 5.07266,9.78418 16.97324,9.78418c11.90059,0 16.97324,-9.78418 16.97324,-9.78418l0.22676,-0.46191v-4.03965c3.45176,1.0834 9.77578,3.2166 16.28457,6.29043c4.72832,2.23399 9.43145,4.92988 12.81601,7.84414c3.38457,2.91426 5.29941,5.9125 5.29941,8.75117v8.6h-103.2v-8.6c0,-2.83867 1.91484,-5.83691 5.29941,-8.75117c3.38457,-2.91426 8.0877,-5.61016 12.81601,-7.84414c6.50879,-3.07383 12.83281,-5.20703 16.28457,-6.29043zM43,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g><g id="subtracted-icon" fill="#000000" stroke="none"><path d="M98.56406,24.10352c2.1584,1.68809 3.1998,3.14941 3.7877,4.08164c3.64492,0.26035 7.76016,1.49492 11.2623,4.56875c3.89688,3.43496 6.78594,8.96953 6.78594,16.69609c0,6.82793 -1.6293,16.53652 -2.02402,18.8041c1.22617,1.1002 2.02402,2.65391 2.02402,4.41758c0,1.39414 -0.41992,2.58672 -0.76426,3.7541c-0.16797,0.58789 -0.33594,1.13379 -0.44512,1.54531c-0.10918,0.41152 -0.13438,0.81465 -0.13438,0.50391c0,2.92266 -2.45234,5.20703 -5.34141,5.30781c-0.39473,8.33965 -4.40918,15.69668 -10.51484,20.54258v8.01211c3.09902,0.94062 10.54004,3.34258 18.11543,6.92031c0.0331,0.01562 0.0662,0.03127 0.0993,0.04693c0.59073,2.13484 1.43056,4.17892 2.49614,6.0942c-1.44586,-0.78895 -2.93482,-1.53958 -4.42629,-2.24425c-6.50879,-3.07383 -12.83281,-5.20703 -16.28457,-6.29043v4.03965l-0.22676,0.46191c0,0 -5.07266,9.78418 -16.97324,9.78418c-11.90059,0 -16.97324,-9.78418 -16.97324,-9.78418l-0.22676,-0.46191v-4.03965c-3.45176,1.0834 -9.77578,3.2166 -16.28457,6.29043c-4.72832,2.23399 -9.43144,4.92988 -12.81601,7.84414c-3.38457,2.91426 -5.29941,5.9125 -5.29941,8.75117v8.6l98.9,0v4.3h-103.2v-12.9c0,-4.68633 2.92266,-8.67559 6.79434,-12.00976c3.87168,-3.33418 8.84356,-6.14766 13.79024,-8.48242c7.57539,-3.57773 15.01641,-5.97969 18.11543,-6.92031v-8.02051c-6.10566,-4.8459 -10.12012,-12.20293 -10.51484,-20.53418c-2.88906,-0.10078 -5.34141,-2.38516 -5.34141,-5.30781c0,0.31074 -0.0252,-0.09238 -0.13437,-0.50391c-0.10918,-0.41152 -0.27715,-0.95742 -0.44512,-1.54531c-0.34434,-1.16738 -0.76426,-2.35996 -0.76426,-3.7541c0,-1.73008 0.77266,-3.27539 1.97363,-4.36719c-0.46191,-2.05762 -1.38574,-6.92031 -1.38574,-12.94199c0,-4.64434 -1.50332,-7.09668 -2.90586,-8.53281c-1.41094,-1.44453 -2.58672,-1.77207 -2.58672,-1.77207l-3.03184,-0.89023l1.94004,-2.48594c0,0 4.32519,-5.55977 11.11113,-11.10274c6.78594,-5.53457 16.1418,-11.22871 26.54746,-11.22871c7.23105,0 12.20293,2.34316 15.30195,4.75352zM59.43574,33.92129c-4.70312,3.83809 -7.46621,6.93711 -8.95273,8.68398c0.78105,0.46191 0.98262,0.30234 1.88125,1.22617c2.10801,2.1668 4.12363,5.9041 4.12363,11.53105c0,5.18184 0.70547,9.22988 1.14219,11.3043c0.05039,0 0.10078,-0.0168 0.15117,-0.0168c0.18477,0 0.15957,0.05039 0.27715,0.06719c0.0168,-6.83633 3.68691,-11.87539 8.09609,-14.95762c4.42598,-3.09062 9.52383,-4.45957 13.39551,-4.45957c7.07149,0 12.12734,-1.53691 15.39434,-3.03184c3.26699,-1.49492 4.61914,-2.82187 4.61914,-2.82187l0.94062,-0.89863l1.22617,0.41152c0,0 3.16621,1.075 6.18965,4.00606c3.02344,2.93105 6.03008,7.87773 6.03008,15.23476v6.50879c0.11758,-0.0168 0.08399,-0.05879 0.26875,-0.05879c0.0168,0 0.0252,0 0.03359,0c0.41992,-2.45234 1.84766,-11.20351 1.84766,-17.2c0,-6.68516 -2.32637,-10.81719 -5.33301,-13.4627c-2.99824,-2.64551 -6.85312,-3.7373 -9.71699,-3.7373h-1.33535l-0.58789,-1.20098c0,0 -0.79785,-1.66289 -3.2166,-3.55254c-2.41035,-1.88965 -6.33242,-3.84649 -12.64805,-3.84649c-8.80156,0 -17.43516,5.05586 -23.82637,10.27129zM96.7332,48.18184c-3.7877,1.73008 -9.48184,3.41816 -17.1832,3.41816c-2.77148,0 -7.34023,1.17578 -10.93476,3.68691c-3.59453,2.51113 -6.26524,6.11406 -6.26524,11.47226v6.9959l-3.2334,-1.89805c-0.5543,-0.31914 -1.0666,-0.60469 -1.42774,-0.78945c-0.04199,-0.0252 -0.05879,-0.0252 -0.10078,-0.05039c-0.98262,0.10078 -1.68809,0.78945 -1.68809,1.65449c0,0.15957 0.25195,1.41934 0.57949,2.54473c0.16797,0.5543 0.33594,1.11699 0.47871,1.6293c0.14277,0.5123 0.28555,0.87344 0.28555,1.6293c0,0.57109 0.47031,1.075 1.20938,1.075h3.89687v2.93945c0,11.65703 8.40684,21.29004 19.47598,23.26367l0.61309,0.10078l0.46191,0.42832c0.83984,0.76426 1.89805,1.21777 3.09902,1.21777c1.20098,0 2.25918,-0.45351 3.09902,-1.21777l0.46191,-0.42832l0.61309,-0.10078c11.06914,-1.97363 19.47598,-11.60664 19.47598,-23.26367v-2.93945h3.89688c0.73906,0 1.20937,-0.50391 1.20937,-1.075c0,-0.75586 0.14277,-1.11699 0.27715,-1.6293c0.14278,-0.51231 0.31074,-1.075 0.47871,-1.6293c0.32754,-1.12539 0.58789,-2.38516 0.58789,-2.54473v-0.0084c0,-0.85664 -0.70547,-1.54531 -1.68809,-1.64609c-0.04199,0.0252 -0.05879,0.0252 -0.10078,0.05039c-0.36113,0.18476 -0.87344,0.47031 -1.42774,0.78945l-3.2334,1.89805v-13.55508c0,-6.22324 -2.36836,-9.86816 -4.71992,-12.15254c-1.99883,-1.93164 -3.35937,-2.35996 -3.88008,-2.56152c-0.76426,0.62149 -1.50332,1.41094 -4.3168,2.6959zM77.4,74.175c0,1.78047 -1.44453,3.225 -3.225,3.225c-1.78047,0 -3.225,-1.44453 -3.225,-3.225c0,-1.78047 1.44453,-3.225 3.225,-3.225c1.78047,0 3.225,1.44453 3.225,3.225zM101.05,74.175c0,1.78047 -1.44453,3.225 -3.225,3.225c-1.78047,0 -3.225,-1.44453 -3.225,-3.225c0,-1.78047 1.44453,-3.225 3.225,-3.225c1.78047,0 3.225,1.44453 3.225,3.225zM73.1,119.72813c0.26035,0.5207 3.66172,7.12188 12.9,7.12188c9.23828,0 12.63965,-6.60117 12.9,-7.12188v-12.59766c-2.30117,1.20938 -4.78711,2.1332 -7.42422,2.65391c-1.51172,1.20098 -3.38457,2.01563 -5.47578,2.01563c-2.09961,0 -3.98086,-0.81465 -5.50098,-2.02402c-2.62871,-0.5291 -5.10625,-1.45293 -7.39902,-2.65391zM45.15,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM53.75,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM62.35,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM70.95,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM79.55,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM88.15,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM96.75,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM105.35,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM113.95,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM122.55,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15zM131.15,141.9c0,1.18418 -0.96582,2.15 -2.15,2.15c-1.18418,0 -2.15,-0.96582 -2.15,-2.15c0,-1.18418 0.96582,-2.15 2.15,-2.15c1.18418,0 2.15,0.96582 2.15,2.15z"></path></g><g fill="#000000" stroke="none"><g id="Layer_1"><path d="M148.35,88.15c-13.03975,0 -23.65,10.61025 -23.65,23.65c0,8.9182 5.0181,17.03445 12.9,21.05925v31.43085l7.7099,7.7099h6.0802l7.7099,-7.7099v-6.0802l-3.4099,-3.4099l3.4099,-3.4099v-6.0802l-3.4099,-3.4099l3.4099,-3.4099v-5.63085c7.8819,-4.0248 12.9,-12.1389 12.9,-21.05925c0,-13.03975 -10.61025,-23.65 -23.65,-23.65zM156.09,129.5289l-1.29,0.5633v6.6177l-5.1901,5.1901l5.1901,5.1901v2.5198l-5.1901,5.1901l5.1901,5.1901v2.5198l-5.1901,5.1901h-2.5198l-5.1901,-5.1901v-32.4177l-1.29,-0.5633c-7.052,-3.0831 -11.61,-10.04265 -11.61,-17.7289c0,-10.6683 8.67955,-19.35 19.35,-19.35c10.67045,0 19.35,8.6817 19.35,19.35c0,7.68625 -4.558,14.6458 -11.61,17.7289zM150.5,113.95c0,1.1868 -0.9632,2.15 -2.15,2.15c-1.1868,0 -2.15,-0.9632 -2.15,-2.15c0,-1.1868 0.9632,-2.15 2.15,-2.15c1.1868,0 2.15,0.9632 2.15,2.15zM159.1,111.8c0,1.1868 -0.96105,2.15 -2.15,2.15c-1.18895,0 -2.15,-0.9632 -2.15,-2.15c0,-3.5561 -2.8939,-6.45 -6.45,-6.45c-3.5561,0 -6.45,2.8939 -6.45,6.45c0,1.1868 -0.96105,2.15 -2.15,2.15c-1.18895,0 -2.15,-0.9632 -2.15,-2.15c0,-5.92755 4.82245,-10.75 10.75,-10.75c5.92755,0 10.75,4.82245 10.75,10.75z"></path></g><g id="Layer_1" opacity="0"><path d="M148.35,83.85c-15.4112,0 -27.95,12.5388 -27.95,27.95c0,9.6449 4.8805,18.44055 12.9,23.54895v28.94115c0,1.1395 0.45365,2.23385 1.2599,3.0401l7.7099,7.7099c0.80625,0.80625 1.9006,1.2599 3.0401,1.2599h6.0802c1.1395,0 2.23385,-0.45365 3.0401,-1.2599l7.7099,-7.7099c0.80625,-0.80625 1.2599,-1.9006 1.2599,-3.0401v-6.0802c0,-1.1395 -0.45365,-2.23385 -1.2599,-3.0401l-0.3698,-0.3698l0.3698,-0.3698c0.80625,-0.80625 1.2599,-1.9006 1.2599,-3.0401v-6.0802c0,-1.1395 -0.45365,-2.23385 -1.2599,-3.0401l-0.3698,-0.3698l0.3698,-0.3698c0.80625,-0.80625 1.2599,-1.9006 1.2599,-3.0401v-3.14115c8.0195,-5.10625 12.9,-13.90405 12.9,-23.54895c0,-15.4112 -12.5388,-27.95 -27.95,-27.95z"></path></g></g><path d="M124.7,172v-83.85h47.3v83.85z" id="overlay-drag" fill="#ff0000" stroke="none" opacity="0"></path></g></svg>
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                       <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style="fill: rgb(0, 0, 0);"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal;"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
-                            <div class="row">
-                                <div class="col bold"><span class="text-capitalize">{{this.user.full_name}}</span></div>
-                            </div>
-                            <div class="row">
-                                <div class="col muted">{{this.user.email}}</div>
-                            </div>
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
                         </div>
-                        <div class="col-auto text-right">
-                            <div class="row no-margin">
-                                <div class="col-auto no-padding">
-                                    <div class="p-t-5 p-b-5 p-r-10 p-l-10 muted h-100 pointer animate__animated animate__slow" ref="button" @click="actions = !actions" :class="[{'bg-white': actions}, {'flipInX': actions}, {' bg-master-lighter': !actions}]"><i class="fa fa-ellipsis-h lh-16 fs-10"></i></div>
-                                </div>
-                                <div class="absolute animate__animated animate__flipInX animate__fast" v-closable="{ exclude: ['button'], handler: 'onClose'}" :class="[{'hide': !actions}]" style="width: 130px; top: 100%; right: 15px; z-index: 1;">
-                                    <div class="row text-left no-margin bg-white" style=" border-radius: 10px 0 10px 10px; ">
-                                        <div class="col p-r-10 p-l-10">
-                                            <div class="row no-margin">
-                                                <div class="col no-padding b-b b-grey p-t-5 p-b-5 pointer hover-primary">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <small class="fs-8 all-caps">View Profile</small>
-                                                        </div>
-                                                        <div class="col-auto p-l-0">
-                                                            <i class="fa fa-long-arrow-right"></i>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="row no-margin">
-                                                <div class="col no-padding b-b b-grey p-t-5 p-b-5 pointer">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <small class="fs-8 all-caps">Reset Password</small>
-                                                        </div>
-                                                        <div class="col-auto p-l-0">
-                                                            <i class="fa fa-unlock-alt"></i>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="row no-margin align-items-center justify-content-center">
-                                                <div class="col no-padding p-t-5 p-b-5 pointer">
-                                                    <div class="row align-items-center justify-content-center">
-                                                        <div class="col">
-                                                            <small class="fs-8 all-caps">Block User</small>
-                                                        </div>
-                                                        <div class="col-auto p-l-0">
-                                                            <i class="fa fa-ban"></i>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.email}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                                <i class="fa fa-times"></i>
+                            </button>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">
+                                <delete-user-form-component :data="item" section="suppliersSection" class="text-center"></delete-user-form-component>
+                            </modal-component>
                         </div>
                     </div>
                 </div>
@@ -82,24 +47,15 @@
         </div>
     </div>
 </template>
+
 <script>
+    import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        props: ['data'],
-        data() {
+        data(){
             return {
-                user: this.data,
-                actions: false
+                expanded: false,
             }
         },
-        watch: {
-          'data': function() {
-              this.user = this.data;
-          }
-        },
-        methods: {
-            onClose() {
-                this.actions = false;
-            }
-        }
+        mixins: [componentHandler]
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
new file mode 100644
index 00000000..cb8af386
--- /dev/null
+++ b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete this admin account?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.account.user.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue
new file mode 100644
index 00000000..656495d4
--- /dev/null
+++ b/resources/assets/vue/components/user/form/UserFormComponent.vue
@@ -0,0 +1,117 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Add Admin Account</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label class="muted">Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.email">
+                                <label class="muted">Email</label>
+                                <input type="text" class="form-control" v-model="parameters.email">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password">
+                                <label class="muted">Password</label>
+                                <input type="password" class="form-control" v-model="parameters.password">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                <label class="muted">Password Confirmation</label>
+                                <input type="password" class="form-control" v-model="parameters.password_confirmation">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Admin</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import { required, sameAs, minLength , email} from "vuelidate/lib/validators";
+    export default {
+        props : {
+            closable: {
+                type: Boolean,
+                default: true
+            },
+        },
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    email: '',
+                    password: '',
+                    password_confirmation: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                email: {
+                    required,
+                    email
+                },
+                password: {
+                    required,
+                    minLength: minLength(6)
+                },
+                password_confirmation: {
+                    required,
+                    sameAsPassword: sameAs('password')
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(route('api.account.user.admin.create'), 'post', this.section, true, false);
+            },
+            successHandler(response){
+                this.closeModal();
+                this.$emit('createdAdmin', response.payload.data);
+                this.formHandler();
+                this.resetForm();
+            },
+            errorHandler(error){
+                this.formHandler(error.message);
+            }
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/resetPasswordHandler.js b/resources/assets/vue/general/mixins/accounts/resetPasswordHandler.js
new file mode 100644
index 00000000..f0e0789c
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/resetPasswordHandler.js
@@ -0,0 +1,17 @@
+import errorMessageHandler from "../errorMessageHandler";
+import formHandler from "../formHandler";
+
+export default {
+    methods: {
+        successHandler(response){
+            this.closeModal();
+            this.formHandler('');
+        },
+        errorHandler(error){
+            console.log("error" ,error);
+            this.formHandler(error.message);
+        }
+    },
+    mixins: [errorMessageHandler, formHandler]
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/updateProfileHandler.js b/resources/assets/vue/general/mixins/accounts/updateProfileHandler.js
new file mode 100644
index 00000000..4979dfd4
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/updateProfileHandler.js
@@ -0,0 +1,18 @@
+import errorMessageHandler from "../errorMessageHandler";
+import formHandler from "../formHandler";
+
+export default {
+    methods: {
+        successHandler(response){
+            this.closeModal();
+            this.formHandler('');
+            this.$store.dispatch('updateProfile', {fullname:response.payload.data.name});
+        },
+        errorHandler(error){
+            console.log("error" ,error);
+            this.formHandler(error.message);
+        }
+    },
+    mixins: [errorMessageHandler, formHandler]
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/validation/resetPasswordFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/resetPasswordFormValidation.js
new file mode 100644
index 00000000..a4f17906
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/resetPasswordFormValidation.js
@@ -0,0 +1,10 @@
+import { required } from "vuelidate/lib/validators";
+import resetPasswordHandler from "../resetPasswordHandler";
+export default {
+    validations: {
+        parameters: {
+            email: { required }
+        }
+    },
+    mixins: [resetPasswordHandler]
+};
diff --git a/resources/assets/vue/general/mixins/accounts/validation/updateProfileFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/updateProfileFormValidation.js
new file mode 100644
index 00000000..8be6ce0b
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/updateProfileFormValidation.js
@@ -0,0 +1,10 @@
+import { required } from "vuelidate/lib/validators";
+import updateProfileHandler from "../updateProfileHandler";
+export default {
+    validations: {
+        parameters: {
+            name: { required }
+        }
+    },
+    mixins: [updateProfileHandler]
+};
diff --git a/resources/assets/vue/general/mixins/guards.js b/resources/assets/vue/general/mixins/guards.js
index 3dbf7f8d..18681e5d 100644
--- a/resources/assets/vue/general/mixins/guards.js
+++ b/resources/assets/vue/general/mixins/guards.js
@@ -1,12 +1,16 @@
 export default {
     methods: {
         routesGuard(){
-            (!this.$store.getters.isAuthenticated && this.isProtectedRoute()) ? window.location.href = this.route('login') : '';
-            (this.$store.getters.isAuthenticated && !this.isProtectedRoute()) ? window.location.href = this.route('dashboard') : '';
+            (!this.$store.getters.isAuthenticated && this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('login') : '';
+            (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('dashboard') : '';
         },
         isProtectedRoute(){
             const unprotectedRoutes = [this.route('login'), this.route('account.email.verification')];
             return !unprotectedRoutes.includes(window.location.href);
+        },
+        isWithTokenRoute(){
+            const unprotectedRoutesWithToken = [this.route('account.password.reset')];
+            return !window.location.href.includes(unprotectedRoutesWithToken);
         }
     }
 
diff --git a/resources/assets/vue/vuex/modules/authentication.js b/resources/assets/vue/vuex/modules/authentication.js
index 2fa04b86..f349afa2 100644
--- a/resources/assets/vue/vuex/modules/authentication.js
+++ b/resources/assets/vue/vuex/modules/authentication.js
@@ -2,6 +2,7 @@ import jwt_decode from "jwt-decode";
 export default {
     state: {
         resetPasswordEmail: '',
+        updatedFullname:localStorage.getItem('updated-fullname') || '',
         authentication: {
             access_token: localStorage.getItem('user-token') || ''
         }
@@ -12,7 +13,7 @@ export default {
 
         isSuperAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1,
         isAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1 || getters.getDecodedAccessToken.user.type === 2,
-        getUserName: (state, getters) => getters.getDecodedAccessToken.user.name,
+        getUserName: (state, getters) => getters.getUpdatedFullname || getters.getDecodedAccessToken.user.name,
         getUserId: (state, getters) => getters.getDecodedAccessToken.user.id,
         getUserEmail: (state, getters) => getters.getDecodedAccessToken.user.email,
         getCompanyId: (state, getters) => getters.getDecodedAccessToken.user.company_id,
@@ -34,7 +35,8 @@ export default {
             }
         },
 
-        getResetPasswordEmail: state => state.resetPasswordEmail
+        getResetPasswordEmail: state => state.resetPasswordEmail,
+        getUpdatedFullname: state => state.updatedFullname
     },
     mutations: {
         SET_AUTHENTICATION(state, {access_token}){
@@ -42,6 +44,9 @@ export default {
         },
         SET_PASSWORD_RESET_EMAIL(state, {email}){
             state.resetPasswordEmail = email;
+        },
+        UPDATE_FULL_NAME(state, {fullname}){
+            state.updatedFullname = fullname;
         }
     },
     actions: {
@@ -65,6 +70,21 @@ export default {
         },
         passwordResetEmail(store, {email}){
             store.commit('SET_PASSWORD_RESET_EMAIL', {email});
+            store.dispatch('toggleLoading', {name: 'forgetPasswordSection', status: true});
+            setTimeout(function(){
+                store.dispatch('toggleLoading', {name: 'forgetPasswordSection', status: false});
+            }, 2000);
+        },
+        passwordReset(store){
+            store.dispatch('toggleLoading', {name: 'resetPasswordSection', status: true});
+        },
+        returnToLoginAfterSendResetPasswordLink(store){
+            store.dispatch('toggleSection', {name: 'forgetPassword', status: false})
+            store.dispatch('toggleSection', {name: 'forgetPasswordSuccess', status: false});
+        },
+        updateProfile(store, {fullname}){
+            localStorage.setItem('updated-fullname', fullname);
+            store.commit('UPDATE_FULL_NAME', {fullname});
         }
     }
 }
\ No newline at end of file
diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php
index 812c56ce..39c81051 100644
--- a/resources/views/pages/accounts/login.blade.php
+++ b/resources/views/pages/accounts/login.blade.php
@@ -5,7 +5,7 @@
         <div class="row" key="1">
             <div class="col no-padding" v-show="!$store.getters.isShowing('registrationForm')">
                 <div class="padding-50 bg-white h-100">
-                    <div class="row">
+                    <div class="row" v-show="!$store.getters.isShowing('forgetPassword')">
                         <div class="col">
                             <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
                             <div class="row" v-show="!$store.getters.isLoading('loginSection')">
@@ -27,6 +27,28 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row" v-show="$store.getters.isShowing('forgetPassword')">
+                        <div class="col">
+                            <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('forgetPasswordSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('forgetPasswordSection')">
+                                <div class="col">
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <div class="inline v-align-middle">
+                                                <div class="font-heading fs-20 all-caps text-primary no-margin lh-28 bold">Forget Password</div>
+                                                <p class="no-margin fs-11 muted light">A reset password link will send to your email account.</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <forget-password-form-component section="forgetPasswordSection"></forget-password-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="col p-l-0 p-r-0 p-t-15 p-b-15">
diff --git a/resources/views/pages/accounts/reset_password.blade.php b/resources/views/pages/accounts/reset_password.blade.php
index 4fae44b7..a16a540b 100644
--- a/resources/views/pages/accounts/reset_password.blade.php
+++ b/resources/views/pages/accounts/reset_password.blade.php
@@ -11,7 +11,7 @@
                 </div>
                 <div class="row w-100">
                     <div class="col">
-                        <div class="row">
+                        <div class="row" v-show="!$store.getters.isShowing('resetPassword')">
                             <div class="col no-padding relative">
                                 <transition-component group enter-class="animate__animated animate__fadeInUpBig animate__faster" leave-class="animate__animated animate__fadeOutRightBig">
                                     <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('resetPasswordSection')"></loading-component>
diff --git a/resources/views/pages/payment_complete.blade.php b/resources/views/pages/payment_complete.blade.php
new file mode 100644
index 00000000..eab96ed5
--- /dev/null
+++ b/resources/views/pages/payment_complete.blade.php
@@ -0,0 +1,25 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col-4 bg-white p-t-15 p-b-15">
+            <div class="row no-margin">
+                <div class="col">
+                    <div class="row m-b-15 p-b-10 b-b b-grey">
+                        <div class="col">
+                            <small class="all-caps muted fs-10">Complete Payments</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                           <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3}">
+                                <template slot="list" slot-scope="{data}">
+                                    <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 3eb33179..215bffad 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-<div class="row d-none" :class="[{'d-flex': $store.getters.isSuperAdmin}]" v-if="$store.getters.isSuperAdmin" >
+<div class="row">
     <div class="col">
         <div class="row">
             <div class="col-8">
@@ -31,21 +31,23 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="row m-b-5">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="team">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000;"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Team</div>
+                                <template v-if="$store.getters.isSuperAdmin">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="team">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Team</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -53,22 +55,22 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row m-b-5">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="currency">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000;"><defs><linearGradient x1="26.77825" y1="66.15819" x2="26.77825" y2="84.23969" gradientUnits="userSpaceOnUse" id="color-1_N77EvGyyBNEK_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="145.03094" y1="83.42806" x2="145.03094" y2="102.73775" gradientUnits="userSpaceOnUse" id="color-2_N77EvGyyBNEK_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="93.02512" y1="19.95738" x2="93.02512" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-3_N77EvGyyBNEK_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="78.88081" y1="19.95738" x2="78.88081" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-4_N77EvGyyBNEK_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="24.75994" x2="86" y2="69.45306" gradientUnits="userSpaceOnUse" id="color-5_N77EvGyyBNEK_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="109.98594" x2="86" y2="143.05294" gradientUnits="userSpaceOnUse" id="color-6_N77EvGyyBNEK_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M22.17725,66.74944l-9.159,15.17363c-1.08306,1.79256 0.20694,4.07694 2.3005,4.07694h22.92169c2.09087,0 3.38087,-2.28437 2.3005,-4.07694l-9.159,-15.17363c-2.09088,-3.46419 -7.11381,-3.46419 -9.20469,0z" fill="url(#color-1_N77EvGyyBNEK_gr1)"></path><path d="M140.42725,104.90388l-9.159,-15.17363c-1.08038,-1.78987 0.20963,-4.07694 2.3005,-4.07694h22.92169c2.09088,0 3.38088,2.28437 2.3005,4.07694l-9.159,15.17363c-2.09087,3.4615 -7.11381,3.4615 -9.20469,0z" fill="url(#color-2_N77EvGyyBNEK_gr2)"></path><path d="M161.16938,85.69631c-0.95138,-1.68506 -2.74394,-2.73319 -4.68162,-2.73319h-8.67525v-23.83813c0,-10.37375 -8.43875,-18.8125 -18.8125,-18.8125h-11.81156c-3.59319,-13.88631 -16.19488,-24.1875 -31.18844,-24.1875c-14.99356,0 -27.59525,10.30119 -31.18844,24.1875h-14.84575c-8.69944,0 -15.77831,7.07888 -15.77831,15.77831h5.375c0,-5.73781 4.6655,-10.40331 10.40331,-10.40331h13.92125c-0.07525,0.88956 -0.13706,1.77913 -0.13706,2.6875c0,17.78319 14.46681,32.25 32.25,32.25c17.78319,0 32.25,-14.46681 32.25,-32.25c0,-0.90837 -0.06181,-1.79794 -0.13706,-2.6875h10.88706c7.40944,0 13.4375,6.02806 13.4375,13.4375v23.83812h-8.86875c-1.935,0 -3.73025,1.04812 -4.68162,2.73319c-0.95138,1.68506 -0.92181,3.7625 0.08062,5.42069l9.159,15.17363c1.47275,2.44025 4.05275,3.89688 6.9015,3.89688c2.85144,0 5.43144,-1.45663 6.9015,-3.89688l9.159,-15.17363c1.00244,-1.65819 1.032,-3.73294 0.08062,-5.42069zM86,75.25c-14.81887,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05612,26.875 -26.875,26.875zM147.32875,103.51444c-0.70681,1.17175 -1.84363,1.29806 -2.3005,1.29806c-0.45419,0 -1.59369,-0.12631 -2.3005,-1.29806l-9.159,-15.17631h22.92169z" fill="url(#color-3_N77EvGyyBNEK_gr3)"></path><path d="M142.4375,115.90919c0,5.73781 -4.6655,10.40331 -10.40331,10.40331h-13.90781c0.07525,-0.89494 0.12363,-1.78987 0.12363,-2.6875c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,0.90838 0.06181,1.79794 0.13706,2.6875h-10.88706c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-24.1875h8.67794c1.935,0 3.73025,-1.04812 4.68163,-2.73319c0.95138,-1.68506 0.92181,-3.7625 -0.08062,-5.418l-9.159,-15.17363c-1.47275,-2.44025 -4.05275,-3.89687 -6.9015,-3.89687c-2.84875,0 -5.42875,1.45663 -6.9015,3.89687l-9.159,15.17363c-1.00244,1.6555 -1.032,3.73294 -0.08062,5.418c0.94869,1.68506 2.74125,2.73319 4.67894,2.73319h8.86875v24.1875c0,10.37375 8.43875,18.8125 18.8125,18.8125h11.81156c3.59319,13.88631 16.19488,24.1875 31.18844,24.1875c14.80812,0 27.57913,-10.04856 31.20994,-24.1875h14.82425c8.69944,0 15.77831,-7.07619 15.77831,-15.77831v-0.34669h-5.375zM15.31875,83.3125l9.159,-15.17363c0.70681,-1.17175 1.84631,-1.29806 2.3005,-1.29806c0.45688,0 1.59369,0.12631 2.3005,1.29806l9.16169,15.17363zM112.43156,128.51625c-2.34081,12.73875 -13.45631,21.98375 -26.43156,21.98375c-14.81887,0 -26.875,-12.05612 -26.875,-26.875c0,-14.81888 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05612 26.875,26.875c0,1.63938 -0.1505,3.28681 -0.44344,4.89125z" fill="url(#color-4_N77EvGyyBNEK_gr4)"></path><path d="M96.75,40.3125v-5.375h-8.0625v-5.375h-5.375v5.375h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h10.75v5.375h-16.125v5.375h8.0625v5.375h5.375v-5.375h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375z" fill="url(#color-5_N77EvGyyBNEK_gr5)"></path><path d="M88.6875,128.0755c0,-0.56975 0.18006,-1.12338 0.516,-1.58563l11.60462,-16.30237h-6.665l-8.14581,11.5025l-8.14044,-11.5025h-6.665l11.60462,16.30238c0.33594,0.46225 0.516,1.01587 0.516,1.58562v3.612h-5.375v5.375h5.375v5.375h5.375v-5.375h5.375v-5.375h-5.375z" fill="url(#color-6_N77EvGyyBNEK_gr6)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Currencies</div>
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="currency">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="26.77825" y1="66.15819" x2="26.77825" y2="84.23969" gradientUnits="userSpaceOnUse" id="color-1_N77EvGyyBNEK_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="145.03094" y1="83.42806" x2="145.03094" y2="102.73775" gradientUnits="userSpaceOnUse" id="color-2_N77EvGyyBNEK_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="93.02512" y1="19.95738" x2="93.02512" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-3_N77EvGyyBNEK_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="78.88081" y1="19.95738" x2="78.88081" y2="154.91825" gradientUnits="userSpaceOnUse" id="color-4_N77EvGyyBNEK_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="24.75994" x2="86" y2="69.45306" gradientUnits="userSpaceOnUse" id="color-5_N77EvGyyBNEK_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="109.98594" x2="86" y2="143.05294" gradientUnits="userSpaceOnUse" id="color-6_N77EvGyyBNEK_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M22.17725,66.74944l-9.159,15.17363c-1.08306,1.79256 0.20694,4.07694 2.3005,4.07694h22.92169c2.09087,0 3.38087,-2.28437 2.3005,-4.07694l-9.159,-15.17363c-2.09088,-3.46419 -7.11381,-3.46419 -9.20469,0z" fill="url(#color-1_N77EvGyyBNEK_gr1)"></path><path d="M140.42725,104.90388l-9.159,-15.17363c-1.08038,-1.78987 0.20963,-4.07694 2.3005,-4.07694h22.92169c2.09088,0 3.38088,2.28437 2.3005,4.07694l-9.159,15.17363c-2.09087,3.4615 -7.11381,3.4615 -9.20469,0z" fill="url(#color-2_N77EvGyyBNEK_gr2)"></path><path d="M161.16938,85.69631c-0.95138,-1.68506 -2.74394,-2.73319 -4.68162,-2.73319h-8.67525v-23.83813c0,-10.37375 -8.43875,-18.8125 -18.8125,-18.8125h-11.81156c-3.59319,-13.88631 -16.19488,-24.1875 -31.18844,-24.1875c-14.99356,0 -27.59525,10.30119 -31.18844,24.1875h-14.84575c-8.69944,0 -15.77831,7.07888 -15.77831,15.77831h5.375c0,-5.73781 4.6655,-10.40331 10.40331,-10.40331h13.92125c-0.07525,0.88956 -0.13706,1.77913 -0.13706,2.6875c0,17.78319 14.46681,32.25 32.25,32.25c17.78319,0 32.25,-14.46681 32.25,-32.25c0,-0.90837 -0.06181,-1.79794 -0.13706,-2.6875h10.88706c7.40944,0 13.4375,6.02806 13.4375,13.4375v23.83812h-8.86875c-1.935,0 -3.73025,1.04812 -4.68162,2.73319c-0.95138,1.68506 -0.92181,3.7625 0.08062,5.42069l9.159,15.17363c1.47275,2.44025 4.05275,3.89688 6.9015,3.89688c2.85144,0 5.43144,-1.45663 6.9015,-3.89688l9.159,-15.17363c1.00244,-1.65819 1.032,-3.73294 0.08062,-5.42069zM86,75.25c-14.81887,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05612,26.875 -26.875,26.875zM147.32875,103.51444c-0.70681,1.17175 -1.84363,1.29806 -2.3005,1.29806c-0.45419,0 -1.59369,-0.12631 -2.3005,-1.29806l-9.159,-15.17631h22.92169z" fill="url(#color-3_N77EvGyyBNEK_gr3)"></path><path d="M142.4375,115.90919c0,5.73781 -4.6655,10.40331 -10.40331,10.40331h-13.90781c0.07525,-0.89494 0.12363,-1.78987 0.12363,-2.6875c0,-17.78319 -14.46681,-32.25 -32.25,-32.25c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,0.90838 0.06181,1.79794 0.13706,2.6875h-10.88706c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-24.1875h8.67794c1.935,0 3.73025,-1.04812 4.68163,-2.73319c0.95138,-1.68506 0.92181,-3.7625 -0.08062,-5.418l-9.159,-15.17363c-1.47275,-2.44025 -4.05275,-3.89687 -6.9015,-3.89687c-2.84875,0 -5.42875,1.45663 -6.9015,3.89687l-9.159,15.17363c-1.00244,1.6555 -1.032,3.73294 -0.08062,5.418c0.94869,1.68506 2.74125,2.73319 4.67894,2.73319h8.86875v24.1875c0,10.37375 8.43875,18.8125 18.8125,18.8125h11.81156c3.59319,13.88631 16.19488,24.1875 31.18844,24.1875c14.80812,0 27.57913,-10.04856 31.20994,-24.1875h14.82425c8.69944,0 15.77831,-7.07619 15.77831,-15.77831v-0.34669h-5.375zM15.31875,83.3125l9.159,-15.17363c0.70681,-1.17175 1.84631,-1.29806 2.3005,-1.29806c0.45688,0 1.59369,0.12631 2.3005,1.29806l9.16169,15.17363zM112.43156,128.51625c-2.34081,12.73875 -13.45631,21.98375 -26.43156,21.98375c-14.81887,0 -26.875,-12.05612 -26.875,-26.875c0,-14.81888 12.05613,-26.875 26.875,-26.875c14.81887,0 26.875,12.05612 26.875,26.875c0,1.63938 -0.1505,3.28681 -0.44344,4.89125z" fill="url(#color-4_N77EvGyyBNEK_gr4)"></path><path d="M96.75,40.3125v-5.375h-8.0625v-5.375h-5.375v5.375h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h10.75v5.375h-16.125v5.375h8.0625v5.375h5.375v-5.375h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375z" fill="url(#color-5_N77EvGyyBNEK_gr5)"></path><path d="M88.6875,128.0755c0,-0.56975 0.18006,-1.12338 0.516,-1.58563l11.60462,-16.30237h-6.665l-8.14581,11.5025l-8.14044,-11.5025h-6.665l11.60462,16.30238c0.33594,0.46225 0.516,1.01587 0.516,1.58562v3.612h-5.375v5.375h5.375v5.375h5.375v-5.375h5.375v-5.375h-5.375z" fill="url(#color-6_N77EvGyyBNEK_gr6)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Currencies</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -76,22 +78,22 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row m-b-5">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="bank">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000; margin-top: -2px; margin-bottom: 2px;"><defs><linearGradient x1="86" y1="35.8405" x2="86" y2="60.92294" gradientUnits="userSpaceOnUse" id="color-1_77151_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="129" y1="126.46031" x2="129" y2="137.97356" gradientUnits="userSpaceOnUse" id="color-2_77151_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="149.15625" y1="18.58944" x2="149.15625" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-3_77151_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="18.58944" x2="111.53125" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-4_77151_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="107.5" y1="18.58944" x2="107.5" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-5_77151_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="18.58944" x2="129" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-6_77151_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="18.58944" x2="86" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-7_77151_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,37.63037c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-1_77151_gr1)"></path><path d="M88.6875,126.3125h80.625v10.75h-80.625z" fill="url(#color-2_77151_gr2)"></path><path d="M139.75,150.5h18.8125v5.375h-18.8125z" fill="url(#color-3_77151_gr3)"></path><path d="M99.4375,142.4375h24.1875v5.375h-24.1875z" fill="url(#color-4_77151_gr4)"></path><path d="M99.4375,153.1875h16.125v5.375h-16.125z" fill="url(#color-5_77151_gr5)"></path><path d="M161.25,112.875h-64.5c-5.92863,0 -10.75,4.82137 -10.75,10.75v37.625c0,5.92863 4.82137,10.75 10.75,10.75h64.5c5.92863,0 10.75,-4.82137 10.75,-10.75v-37.625c0,-5.92863 -4.82137,-10.75 -10.75,-10.75zM166.625,161.25c0,2.96431 -2.41069,5.375 -5.375,5.375h-64.5c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-37.625c0,-2.96431 2.41069,-5.375 5.375,-5.375h64.5c2.96431,0 5.375,2.41069 5.375,5.375z" fill="url(#color-6_77151_gr6)"></path><path d="M153.50463,61.47388c-59.30238,-39.96313 -60.65419,-40.83119 -60.84231,-40.94137c-3.74369,-2.2145 -9.59169,-2.20913 -13.31925,-0.00538c-0.16663,0.09675 -0.67187,0.39506 -60.85306,40.94675c-1.48081,0.99975 -2.365,2.666 -2.365,4.45587v1.25775c0,2.96431 2.41069,5.375 5.375,5.375h2.6875c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v43.49987c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v3.182c-3.12019,1.11531 -5.375,4.06888 -5.375,7.568v8.05713h72.5625v-5.375h-67.1875v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h64.5v-5.375h-61.8125v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h59.125v-5.375h-8.0625v-43h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v32.7445h5.375v-32.25h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-1.25775c0,-1.78987 -0.88419,-3.45612 -2.37037,-4.45587zM45.6875,126.3125h-10.75v-43h10.75zM48.375,77.9375h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875zM75.25,126.3125h-24.1875v-43.4945c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568zM96.75,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM142.4375,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM150.5,67.1875h-129l-0.00269,-1.25775c37.10363,-25.00181 59.76731,-40.25337 60.57894,-40.77475c1.05619,-0.6235 2.44831,-0.9675 3.92375,-0.9675c1.462,0 2.84337,0.33862 3.89419,0.95137c1.16369,0.7525 23.76825,15.96912 60.60581,40.79356z" fill="url(#color-7_77151_gr7)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Company Banks</div>
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="bank">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000; margin-top: -2px; margin-bottom: 2px;"><defs><linearGradient x1="86" y1="35.8405" x2="86" y2="60.92294" gradientUnits="userSpaceOnUse" id="color-1_77151_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="129" y1="126.46031" x2="129" y2="137.97356" gradientUnits="userSpaceOnUse" id="color-2_77151_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="149.15625" y1="18.58944" x2="149.15625" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-3_77151_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="18.58944" x2="111.53125" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-4_77151_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="107.5" y1="18.58944" x2="107.5" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-5_77151_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="129" y1="18.58944" x2="129" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-6_77151_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="18.58944" x2="86" y2="172.31712" gradientUnits="userSpaceOnUse" id="color-7_77151_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,37.63037c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-1_77151_gr1)"></path><path d="M88.6875,126.3125h80.625v10.75h-80.625z" fill="url(#color-2_77151_gr2)"></path><path d="M139.75,150.5h18.8125v5.375h-18.8125z" fill="url(#color-3_77151_gr3)"></path><path d="M99.4375,142.4375h24.1875v5.375h-24.1875z" fill="url(#color-4_77151_gr4)"></path><path d="M99.4375,153.1875h16.125v5.375h-16.125z" fill="url(#color-5_77151_gr5)"></path><path d="M161.25,112.875h-64.5c-5.92863,0 -10.75,4.82137 -10.75,10.75v37.625c0,5.92863 4.82137,10.75 10.75,10.75h64.5c5.92863,0 10.75,-4.82137 10.75,-10.75v-37.625c0,-5.92863 -4.82137,-10.75 -10.75,-10.75zM166.625,161.25c0,2.96431 -2.41069,5.375 -5.375,5.375h-64.5c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-37.625c0,-2.96431 2.41069,-5.375 5.375,-5.375h64.5c2.96431,0 5.375,2.41069 5.375,5.375z" fill="url(#color-6_77151_gr6)"></path><path d="M153.50463,61.47388c-59.30238,-39.96313 -60.65419,-40.83119 -60.84231,-40.94137c-3.74369,-2.2145 -9.59169,-2.20913 -13.31925,-0.00538c-0.16663,0.09675 -0.67187,0.39506 -60.85306,40.94675c-1.48081,0.99975 -2.365,2.666 -2.365,4.45587v1.25775c0,2.96431 2.41069,5.375 5.375,5.375h2.6875c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v43.49987c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v3.182c-3.12019,1.11531 -5.375,4.06888 -5.375,7.568v8.05713h72.5625v-5.375h-67.1875v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h64.5v-5.375h-61.8125v-2.68212c0,-1.4835 1.204,-2.69288 2.6875,-2.69288h59.125v-5.375h-8.0625v-43h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568v32.7445h5.375v-32.25h10.75v32.25h5.375v-32.7445c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h2.6875c2.96431,0 5.375,-2.41069 5.375,-5.375v-1.25775c0,-1.78987 -0.88419,-3.45612 -2.37037,-4.45587zM45.6875,126.3125h-10.75v-43h10.75zM48.375,77.9375h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875zM75.25,126.3125h-24.1875v-43.4945c3.12019,-1.11263 5.375,-4.06888 5.375,-7.568c0,-1.09919 0,-1.978 0,-2.6875h13.4375c0,0.7095 0,1.58831 0,2.6875c0,3.49912 2.25481,6.45538 5.375,7.568zM96.75,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM142.4375,75.25c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-16.125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875c0,-0.62619 0,-1.677 0,-2.6875h21.5c0,1.0105 0,2.06131 0,2.6875zM150.5,67.1875h-129l-0.00269,-1.25775c37.10363,-25.00181 59.76731,-40.25337 60.57894,-40.77475c1.05619,-0.6235 2.44831,-0.9675 3.92375,-0.9675c1.462,0 2.84337,0.33862 3.89419,0.95137c1.16369,0.7525 23.76825,15.96912 60.60581,40.79356z" fill="url(#color-7_77151_gr7)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Company Banks</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -99,22 +101,22 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row m-b-5">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="supplier">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="67.85938" x2="86" y2="98.7495" gradientUnits="userSpaceOnUse" id="color-1_44784_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="13.77344" x2="86" y2="157.88525" gradientUnits="userSpaceOnUse" id="color-2_44784_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M72.5625,83.3125c0,-7.42019 6.01731,-13.4375 13.4375,-13.4375c7.42019,0 13.4375,6.01731 13.4375,13.4375c0,7.42019 -6.01731,13.4375 -13.4375,13.4375c-0.91912,0 -1.81944,-0.09137 -2.6875,-0.26875v-10.48125l-10.75,-2.6875" fill="url(#color-1_44784_gr1)"></path><path d="M134.375,48.375h-5.375c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-1.96725,0 -3.78669,0.56975 -5.375,1.49425v-4.18175c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375c-3.43731,0 -6.54675,1.33569 -8.92519,3.46687c-1.88663,-5.14119 -6.78594,-8.84187 -12.57481,-8.84187c-6.58169,0 -12.04806,4.76494 -13.19294,11.02144c-2.29513,-1.82481 -5.15731,-2.95894 -8.30706,-2.95894c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v10.75h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v53.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h5.59c0.62619,4.33762 2.72781,8.19419 5.78887,11.051c-3.44537,0.91644 -6.00387,4.03125 -6.00387,7.7615v10.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-10.75c0,-3.73025 -2.5585,-6.84506 -6.00119,-7.7615c3.06106,-2.85681 5.16269,-6.71337 5.78887,-11.051h5.58731c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-53.75c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM134.375,53.75c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75h-2.6875c-5.92863,0 -10.75,-4.82138 -10.75,-10.75v-2.6875zM118.25,110.1875v2.6875h-34.77625c-1.634,-3.27875 -3.98825,-6.14094 -6.8585,-8.36619c5.36694,-1.23356 9.38475,-6.05225 9.38475,-11.79006c0,-6.66769 -5.42606,-12.09375 -12.09375,-12.09375h-17.46875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v0.93525c-1.70925,-0.60469 -3.51525,-0.93525 -5.375,-0.93525h-2.6875v-21.5h2.6875c8.89294,0 16.125,-7.23206 16.125,-16.125v-2.6875h64.5v2.6875c0,8.89294 7.23206,16.125 16.125,16.125h2.6875v21.5h-2.6875c-8.89294,0 -16.125,7.23206 -16.125,16.125zM118.25,43c2.96431,0 5.375,2.41069 5.375,5.375h-10.75c0,-2.96431 2.41069,-5.375 5.375,-5.375zM99.4375,26.875c4.44512,0 8.0625,3.61737 8.0625,8.0625v13.4375h-16.125v-13.4375c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625zM69.875,29.5625c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625c4.44513,0 8.0625,3.61737 8.0625,8.0625v18.8125h-16.125v-10.75zM48.375,37.625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h-16.125zM37.625,53.75h10.75v2.6875c0,5.92862 -4.82138,10.75 -10.75,10.75h-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM34.9375,110.1875v-10.75h2.6875c1.91619,0 3.74369,0.52138 5.375,1.46738v11.97012h-5.375c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875zM120.9375,134.375c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-10.75v5.375h10.75v2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h5.375zM110.1875,129h-43h-5.375c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-2.6875v-18.8125c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625h17.46875c3.70606,0 6.71875,3.01269 6.71875,6.71875c0,3.70606 -3.01269,6.71875 -6.71875,6.71875h-14.78125v5.375h2.6875c10.37106,0 18.8125,8.44144 18.8125,18.8125h5.375c0,-1.849 -0.22306,-3.64425 -0.61544,-5.375h37.969c-1.24969,6.12481 -6.67575,10.75 -13.16606,10.75zM134.375,112.875h-10.75v-2.6875c0,-5.92863 4.82137,-10.75 10.75,-10.75h2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-2_44784_gr2)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Suppliers</div>
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="supplier">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="67.85938" x2="86" y2="98.7495" gradientUnits="userSpaceOnUse" id="color-1_44784_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="13.77344" x2="86" y2="157.88525" gradientUnits="userSpaceOnUse" id="color-2_44784_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M72.5625,83.3125c0,-7.42019 6.01731,-13.4375 13.4375,-13.4375c7.42019,0 13.4375,6.01731 13.4375,13.4375c0,7.42019 -6.01731,13.4375 -13.4375,13.4375c-0.91912,0 -1.81944,-0.09137 -2.6875,-0.26875v-10.48125l-10.75,-2.6875" fill="url(#color-1_44784_gr1)"></path><path d="M134.375,48.375h-5.375c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-1.96725,0 -3.78669,0.56975 -5.375,1.49425v-4.18175c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375c-3.43731,0 -6.54675,1.33569 -8.92519,3.46687c-1.88663,-5.14119 -6.78594,-8.84187 -12.57481,-8.84187c-6.58169,0 -12.04806,4.76494 -13.19294,11.02144c-2.29513,-1.82481 -5.15731,-2.95894 -8.30706,-2.95894c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v10.75h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v53.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h5.59c0.62619,4.33762 2.72781,8.19419 5.78887,11.051c-3.44537,0.91644 -6.00387,4.03125 -6.00387,7.7615v10.75c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-10.75c0,-3.73025 -2.5585,-6.84506 -6.00119,-7.7615c3.06106,-2.85681 5.16269,-6.71337 5.78887,-11.051h5.58731c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-53.75c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM134.375,53.75c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75h-2.6875c-5.92863,0 -10.75,-4.82138 -10.75,-10.75v-2.6875zM118.25,110.1875v2.6875h-34.77625c-1.634,-3.27875 -3.98825,-6.14094 -6.8585,-8.36619c5.36694,-1.23356 9.38475,-6.05225 9.38475,-11.79006c0,-6.66769 -5.42606,-12.09375 -12.09375,-12.09375h-17.46875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v0.93525c-1.70925,-0.60469 -3.51525,-0.93525 -5.375,-0.93525h-2.6875v-21.5h2.6875c8.89294,0 16.125,-7.23206 16.125,-16.125v-2.6875h64.5v2.6875c0,8.89294 7.23206,16.125 16.125,16.125h2.6875v21.5h-2.6875c-8.89294,0 -16.125,7.23206 -16.125,16.125zM118.25,43c2.96431,0 5.375,2.41069 5.375,5.375h-10.75c0,-2.96431 2.41069,-5.375 5.375,-5.375zM99.4375,26.875c4.44512,0 8.0625,3.61737 8.0625,8.0625v13.4375h-16.125v-13.4375c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625zM69.875,29.5625c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625c4.44513,0 8.0625,3.61737 8.0625,8.0625v18.8125h-16.125v-10.75zM48.375,37.625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h-16.125zM37.625,53.75h10.75v2.6875c0,5.92862 -4.82138,10.75 -10.75,10.75h-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM34.9375,110.1875v-10.75h2.6875c1.91619,0 3.74369,0.52138 5.375,1.46738v11.97012h-5.375c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875zM120.9375,134.375c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-10.75v5.375h10.75v2.6875c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h5.375zM110.1875,129h-43h-5.375c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-2.6875v-18.8125c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625h17.46875c3.70606,0 6.71875,3.01269 6.71875,6.71875c0,3.70606 -3.01269,6.71875 -6.71875,6.71875h-14.78125v5.375h2.6875c10.37106,0 18.8125,8.44144 18.8125,18.8125h5.375c0,-1.849 -0.22306,-3.64425 -0.61544,-5.375h37.969c-1.24969,6.12481 -6.67575,10.75 -13.16606,10.75zM134.375,112.875h-10.75v-2.6875c0,-5.92863 4.82137,-10.75 10.75,-10.75h2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-2_44784_gr2)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Suppliers</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -122,22 +124,22 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row m-b-5">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="standardSegment">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Service Setup</div>
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="standardSegment">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Service Setup</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -145,22 +147,22 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row">
-                                                    <div class="col bg-master-light tabButton" tab-name="customSegment">
-                                                        <div class="row align-items-center">
-                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
-                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                     width="35" height="35"
-                                                                     viewBox="0 0 172 172"
-                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
-                                                            </div>
-                                                            <div class="col">
-                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col bg-master-light tabButton" tab-name="customSegment">
+                                                            <div class="row align-items-center">
+                                                                <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         viewBox="0 0 172 172"
+                                                                         style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                                                </div>
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -168,7 +170,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                </template>
                             </div>
                         </div>
                     </div>
@@ -187,267 +189,267 @@
                                         <div class="row">
                                             <div class="col">
                                                 <div class="row no-margin ">
-                                                    <div class="col">
-                                                        <div class="row align-items-center m-b-30">
-                                                            <div class="col-3 p-l-0">
-                                                                <div class="font-heading fs-11 bold text-info">Full Name</div>
+                                                    <div class="col parentContainer">
+                                                        <user-profile-component></user-profile-component>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <template v-if="$store.getters.isSuperAdmin">
+                            <div class="row tabsContainer hide tabContent" tab-name="team">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('accountsSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('accountsSection')">
+                                        <div class="col">
+                                            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-10 hint-text">
+                                                        Admin Accounts
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Add Admin Account
+                                                    </button>
+                                                    <modal-form-component section="accountsSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <user-form-component :section="section"></user-form-component>
+                                                        </template>
+                                                    </modal-form-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <list-component section="accountsSection" :endpoint="route('api.account.user.list')" :options="{'type': 2}">
+                                                        <template slot="list" slot-scope="{data}">
+                                                            <user-component :data="data"></user-component>
+                                                        </template>
+                                                    </list-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row tabsContainer hide tabContent" tab-name="currency">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('currenciesSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('currenciesSection')">
+                                        <div class="col">
+                                            <div class="row m-b-20">
+                                                <div class="col p-b-15 b-b b-grey">
+                                                    <div class="font-heading all-caps fs-10 hint-text">
+                                                        System's Active Currencies
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <div class="row m-l-0 m-r-0 m-b-10">
+                                                        <div class="col-auto p-l-0">
+                                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                                Primary Currency
                                                             </div>
-                                                            <div class="col m-r-50">
-                                                                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserName"></div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row m-l-0 m-r-0">
+                                                        <div class="col-3 bg-master-lightest p-t-20 p-b-20">
+                                                            <primary-currency-component></primary-currency-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row m-l-0 m-r-0 m-b-10">
+                                                        <div class="col-auto p-l-0">
+                                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                                Convertible Currency
                                                             </div>
-                                                            <div class="col-auto p-r-0">
-                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
-                                                                    <i class="fa fa-pencil m-r-10"></i>Edit
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="row align-items-center m-b-30">
-                                                            <div class="col-3 p-l-0">
-                                                                <div class="font-heading fs-11 bold text-info">Password</div>
-                                                            </div>
-                                                            <div class="col m-r-50">
-                                                                <div class="font-heading fs-11 muted">********</div>
-                                                            </div>
-                                                            <div class="col-auto p-r-0">
-                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
-                                                                    <i class="fa fa-lock m-r-10"></i>Request Password Reset
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="row align-items-center">
-                                                            <div class="col-3 p-l-0">
-                                                                <div class="font-heading fs-11 bold text-info">Email Address</div>
-                                                            </div>
-                                                            <div class="col m-r-50">
-                                                                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
-                                                            </div>
-                                                            <div class="col-auto p-r-0">
-                                                                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
-                                                                    <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
+                                                        </div>
+                                                    </div>
+                                                    <div class="row m-l-0 m-r-0">
+                                                        <div class="col">
+                                                            <convertible-currencies-component></convertible-currencies-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row tabsContainer hide tabContent" tab-name="bank">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('banksSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('banksSection')">
+                                        <div class="col">
+                                            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-10 hint-text">
+                                                        Company's Bank Accounts
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Add New Bank Account
+                                                    </button>
+                                                    <modal-form-component section="banksSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <bank-account-form-component :section="section"></bank-account-form-component>
+                                                        </template>
+                                                    </modal-form-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <list-component section="banksSection" :endpoint="route('api.bank.list')" :options="{'company_id': 1}">
+                                                        <template slot="list" slot-scope="{data}">
+                                                            <bank-account-component :data="data"></bank-account-component>
+                                                        </template>
+                                                    </list-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row tabsContainer hide tabContent" tab-name="supplier">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                        <div class="col">
+                                            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-10 hint-text">
+                                                        Currency Suppliers
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Create Supplier
+                                                    </button>
+                                                    <modal-form-component section="suppliersSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <supplier-form-component :section="section"></supplier-form-component>
+                                                        </template>
+                                                    </modal-form-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <list-component section="suppliersSection" :endpoint="route('api.company.list')" :options="{'business_type': 3}">
+                                                        <template slot="list" slot-scope="{data}">
+                                                            <supplier-component :data="data"></supplier-component>
+                                                        </template>
+                                                    </list-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row tabsContainer hide tabContent" tab-name="standardSegment">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                        <div class="col">
+                                            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-12 hint-text">
+                                                        Service Configuration
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <div class="row align-items-center parentContainer">
+                                                        <div class="col-auto m-r-50">
+                                                            <div class="row m-b-5">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
                                                                 </div>
                                                             </div>
+                                                            <payment-attempt-component :segment_id="1"></payment-attempt-component>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
+                                            <div class="row m-b-20 parentContainer">
+                                                <div class="col">
+                                                    <div class="row align-items-center m-l-0 m-r-0 m-b-10 p-b-5 b-b b-grey">
+                                                        <div class="col p-l-0">
+                                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                                Exchange Services
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto p-r-0">
+                                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                                <i class="fa fa-plus m-r-5"></i>
+                                                                Create New Service
+                                                            </button>
+                                                            <modal-form-component size="large" section="serviceTypeSection">
+                                                                <template slot="form" slot-scope="{section}">
+                                                                    <service-form-component :section="section"></service-form-component>
+                                                                </template>
+                                                            </modal-form-component>
+                                                        </div>
+                                                    </div>
+                                                    <list-component section="serviceTypeSection" :endpoint="route('api.service_type.list')">
+                                                        <template slot="list" slot-scope="{data}">
+                                                            <service-component :data="data"></service-component>
+                                                        </template>
+                                                    </list-component>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row tabsContainer hide tabContent" tab-name="currency">
-                            <div class="col">
-                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('currenciesSection')"></loading-component>
-                                <div class="row" v-show="!$store.getters.isLoading('currenciesSection')">
-                                    <div class="col">
-                                        <div class="row m-b-20">
-                                            <div class="col p-b-15 b-b b-grey">
-                                                <div class="font-heading all-caps fs-10 hint-text">
-                                                    System's Active Currencies
+                            <div class="row tabsContainer hide tabContent" tab-name="customSegment">
+                                <div class="col">
+                                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('segmentsSection')"></loading-component>
+                                    <div class="row" v-show="!$store.getters.isLoading('segmentsSection')">
+                                        <div class="col">
+                                            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-10 hint-text">
+                                                        Custom Segments
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Create Segment
+                                                    </button>
+                                                    <modal-form-component section="segmentsSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <segment-form-component :section="section"></segment-form-component>
+                                                        </template>
+                                                    </modal-form-component>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="row m-b-20">
-                                            <div class="col">
-                                                <div class="row m-l-0 m-r-0 m-b-10">
-                                                    <div class="col-auto p-l-0">
-                                                        <div class="font-heading all-caps fs-10 hint-text muted">
-                                                            Primary Currency
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="row m-l-0 m-r-0">
-                                                    <div class="col-3 bg-master-lightest p-t-20 p-b-20">
-                                                        <primary-currency-component></primary-currency-component>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="row m-l-0 m-r-0 m-b-10">
-                                                    <div class="col-auto p-l-0">
-                                                        <div class="font-heading all-caps fs-10 hint-text muted">
-                                                            Convertible Currency
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="row m-l-0 m-r-0">
-                                                    <div class="col">
-                                                        <convertible-currencies-component></convertible-currencies-component>
-                                                    </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <list-component section="segmentsSection" :endpoint="route('api.segment.list')" :options="{'type': 2}">
+                                                        <template slot="list" slot-scope="{data}">
+                                                            <segment-component :data="data"></segment-component>
+                                                        </template>
+                                                    </list-component>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row tabsContainer hide tabContent" tab-name="bank">
-                            <div class="col">
-                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('banksSection')"></loading-component>
-                                <div class="row" v-show="!$store.getters.isLoading('banksSection')">
-                                    <div class="col">
-                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
-                                            <div class="col">
-                                                <div class="font-heading all-caps fs-10 hint-text">
-                                                    Company's Bank Accounts
-                                                </div>
-                                            </div>
-                                            <div class="col-auto">
-                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
-                                                    <i class="fa fa-plus m-r-5"></i>
-                                                    Add New Bank Account
-                                                </button>
-                                                <modal-form-component section="banksSection">
-                                                    <template slot="form" slot-scope="{section}">
-                                                        <bank-account-form-component :section="section"></bank-account-form-component>
-                                                    </template>
-                                                </modal-form-component>
-                                            </div>
-                                        </div>
-                                        <div class="row m-b-20">
-                                            <div class="col">
-                                                <list-component section="banksSection" :endpoint="route('api.bank.list')" :options="{'company_id': 1}">
-                                                    <template slot="list" slot-scope="{data}">
-                                                        <bank-account-component :data="data"></bank-account-component>
-                                                    </template>
-                                                </list-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row tabsContainer hide tabContent" tab-name="supplier">
-                            <div class="col">
-                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
-                                <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
-                                    <div class="col">
-                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
-                                            <div class="col">
-                                                <div class="font-heading all-caps fs-10 hint-text">
-                                                    Currency Suppliers
-                                                </div>
-                                            </div>
-                                            <div class="col-auto">
-                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
-                                                    <i class="fa fa-plus m-r-5"></i>
-                                                    Create Supplier
-                                                </button>
-                                                <modal-form-component section="suppliersSection">
-                                                    <template slot="form" slot-scope="{section}">
-                                                        <supplier-form-component :section="section"></supplier-form-component>
-                                                    </template>
-                                                </modal-form-component>
-                                            </div>
-                                        </div>
-                                        <div class="row m-b-20">
-                                            <div class="col">
-                                                <list-component section="suppliersSection" :endpoint="route('api.company.list')" :options="{'business_type': 3}">
-                                                    <template slot="list" slot-scope="{data}">
-                                                        <supplier-component :data="data"></supplier-component>
-                                                    </template>
-                                                </list-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row tabsContainer hide tabContent" tab-name="standardSegment">
-                            <div class="col">
-                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
-                                <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
-                                    <div class="col">
-                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
-                                            <div class="col">
-                                                <div class="font-heading all-caps fs-12 hint-text">
-                                                    Service Configuration
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row m-b-20">
-                                            <div class="col">
-                                                <div class="row align-items-center parentContainer">
-                                                    <div class="col-auto m-r-50">
-                                                        <div class="row m-b-5">
-                                                            <div class="col">
-                                                                <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
-                                                            </div>
-                                                        </div>
-                                                        <payment-attempt-component :segment_id="1"></payment-attempt-component>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row m-b-20 parentContainer">
-                                            <div class="col">
-                                                <div class="row align-items-center m-l-0 m-r-0 m-b-10 p-b-5 b-b b-grey">
-                                                    <div class="col p-l-0">
-                                                        <div class="font-heading all-caps fs-10 hint-text muted">
-                                                            Exchange Services
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-auto p-r-0">
-                                                        <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
-                                                            <i class="fa fa-plus m-r-5"></i>
-                                                            Create New Service
-                                                        </button>
-                                                        <modal-form-component size="large" section="serviceTypeSection">
-                                                            <template slot="form" slot-scope="{section}">
-                                                                <service-form-component :section="section"></service-form-component>
-                                                            </template>
-                                                        </modal-form-component>
-                                                    </div>
-                                                </div>
-                                                <list-component section="serviceTypeSection" :endpoint="route('api.service_type.list')">
-                                                    <template slot="list" slot-scope="{data}">
-                                                        <service-component :data="data"></service-component>
-                                                    </template>
-                                                </list-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row tabsContainer hide tabContent" tab-name="customSegment">
-                            <div class="col">
-                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('segmentsSection')"></loading-component>
-                                <div class="row" v-show="!$store.getters.isLoading('segmentsSection')">
-                                    <div class="col">
-                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
-                                            <div class="col">
-                                                <div class="font-heading all-caps fs-10 hint-text">
-                                                    Custom Segments
-                                                </div>
-                                            </div>
-                                            <div class="col-auto">
-                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
-                                                    <i class="fa fa-plus m-r-5"></i>
-                                                    Create Segment
-                                                </button>
-                                                <modal-form-component section="segmentsSection">
-                                                    <template slot="form" slot-scope="{section}">
-                                                        <segment-form-component :section="section"></segment-form-component>
-                                                    </template>
-                                                </modal-form-component>
-                                            </div>
-                                        </div>
-                                        <div class="row m-b-20">
-                                            <div class="col">
-                                                <list-component section="segmentsSection" :endpoint="route('api.segment.list')" :options="{'type': 2}">
-                                                    <template slot="list" slot-scope="{data}">
-                                                        <segment-component :data="data"></segment-component>
-                                                    </template>
-                                                </list-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                        </template>                        
                     </div>
                 </div>
             </div>
@@ -457,7 +459,7 @@
                         <div class="row tabsContainer">
                             <div class="col">
                                 <div class="row m-l-0 m-r-0 d-none d-md-flex">
-                                    <div class="col">
+                                    <div class="col" v-if="$store.getters.isAdmin">
                                         <div class="row justify-content-end">
                                             <div class="col">
                                                 <div class="row fs-12 text-center">
@@ -504,7 +506,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="row no-margin">
+                                <div class="row no-margin" v-if="$store.getters.isAdmin">
                                     <div class="col bg-white padding-25">
                                         <div class="row tabsContainer tabContent" tab-name="customer-list">
                                             <company-quick-view-section-component></company-quick-view-section-component>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 0771e3ae..d62a4f40 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -26,6 +26,11 @@
                                     <div class="col-auto p-r-20">
                                         <a href="{{route('dashboard')}}"><div class="text-white all-caps fs-12">Dashboard</div></a>
                                     </div>
+                                    <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
+                                        <a href="{{route('payment.complete')}}">
+                                            <div class="text-white all-caps fs-12">Payments & Billing</div>
+                                        </a>
+                                    </div>
                                     <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
                                         <a href="{{route('booking.complete')}}">
                                             <div class="text-white all-caps fs-12">Completed Transfers</div>
@@ -64,7 +69,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-auto m-r-5" v-if="$store.getters.isAdmin">
+                            <div class="col-auto m-r-5">
                                 <a href="{{route('settings')}}">
                                     <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
                                         <div class="col p-r-10 p-l-10">
diff --git a/routes/account.php b/routes/account.php
index 5ce39d98..5b4d45f9 100644
--- a/routes/account.php
+++ b/routes/account.php
@@ -18,8 +18,8 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
          });
 
          Route::group(['prefix' => 'password', 'as' => 'password.'], function () {
-//             Route::post('/forget', 'GeneratePasswordResetController@generate')->name('forget');
-//             Route::post('/reset', 'ResetPasswordController@reset')->name('reset');
+            Route::post('/forget', 'GeneratePasswordResetController@generate')->name('forget');
+            Route::post('/reset', 'ResetPasswordController@reset')->name('reset');
          });
 
     });
@@ -37,5 +37,9 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
     Route::group(['prefix' => 'user', 'as' => 'user.'], function () {
         Route::post('/show', 'FetchUserController@fetch')->name('show');
         Route::get('/list', 'ListUsersController@list')->name('list');
+        Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
+        
+        Route::post('/admin/create', 'CreateAdminUserController@create')->name('admin.create');
+        Route::delete('/delete/{id}', 'DeleteUserController@delete')->name('delete');
     });
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 1fc91505..d91c4e18 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,6 +21,10 @@ Route::get('/account/email/verification/{token}', function ($token) {
     return view('pages.accounts.email_verified', ['token' => $token]);
 })->name('account.email.verification');
 
+Route::get('/account/password/reset/{token}', function ($token) {
+    return view('pages.accounts.reset_password', ['token' => $token]);
+})->name('account.password.reset');
+
 Route::get('/dashboard', function () {
     return view('pages.dashboards.index');
 })->name('dashboard');
@@ -38,6 +42,10 @@ Route::get('/customer/{id}', function ($id) {
     return view('pages.customers', ['id' => $id]);
 })->name('customer.profile');
 
+Route::get('/payment/complete', function () {
+    return view('pages.payment_complete');
+})->name('payment.complete');
+
 Route::get('/booking/complete', function () {
     return view('pages.booking_complete');
 })->name('booking.complete');