diff --git a/admin/backup.php b/admin/backup.php
index 80eba6e6b..f01f129c3 100644
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -185,7 +185,7 @@ if (!empty($_SESSION['backup_master_key_reveal'])) {
         </div>
 
         <?php if ($backup_key !== '') { ?>
-            <div class="input-group col-md-6 px-0">
+            <div class="input-group">
                 <input type="text" class="form-control font-monospace" value="<?= escapeHtml($backup_key) ?>" readonly onclick="this.select();">
                     <button class="btn btn-secondary" type="button" onclick="navigator.clipboard.writeText('<?= escapeHtml($backup_key) ?>');">
                         <i class="fas fa-fw fa-copy"></i>
diff --git a/admin/modals/category/category_add.php b/admin/modals/category/category_add.php
index 4a2663487..19ef50b05 100644
--- a/admin/modals/category/category_add.php
+++ b/admin/modals/category/category_add.php
@@ -48,7 +48,7 @@ $category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" required>
             </div>
         </div>
 
diff --git a/admin/modals/category/category_edit.php b/admin/modals/category/category_edit.php
index 1f9b2e582..32b965643 100644
--- a/admin/modals/category/category_edit.php
+++ b/admin/modals/category/category_edit.php
@@ -37,7 +37,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" value="<?= $category_color ?>" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" value="<?= $category_color ?>" required>
             </div>
         </div>
 
diff --git a/admin/modals/tag/tag_add.php b/admin/modals/tag/tag_add.php
index 17971db61..3364cb26e 100644
--- a/admin/modals/tag/tag_add.php
+++ b/admin/modals/tag/tag_add.php
@@ -67,7 +67,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" required>
             </div>
         </div>
 
diff --git a/admin/modals/tag/tag_edit.php b/admin/modals/tag/tag_edit.php
index df9d2d20e..fd08e0579 100644
--- a/admin/modals/tag/tag_edit.php
+++ b/admin/modals/tag/tag_edit.php
@@ -50,7 +50,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" value="<?= $tag_color ?>" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" value="<?= $tag_color ?>" required>
             </div>
         </div>
 
diff --git a/admin/modals/tax/tax_add.php b/admin/modals/tax/tax_add.php
index 1ce3e9b5e..c1c90eb65 100644
--- a/admin/modals/tax/tax_add.php
+++ b/admin/modals/tax/tax_add.php
@@ -20,7 +20,7 @@ ob_start();
         </div>
         <div class="mb-3">
             <label>Percent <strong class="text-danger">*</strong></label>
-            <input type="number" min="0" step="any" class="form-control col-md-4" name="percent">
+            <input type="number" min="0" step="any" class="form-control w-25" name="percent">
         </div>
     </div>
     <div class="modal-footer">
diff --git a/admin/modals/tax/tax_edit.php b/admin/modals/tax/tax_edit.php
index 205f0da55..ae04af6ee 100644
--- a/admin/modals/tax/tax_edit.php
+++ b/admin/modals/tax/tax_edit.php
@@ -30,7 +30,7 @@ ob_start();
 
         <div class="mb-3">
             <label>Percent <strong class="text-danger">*</strong></label>
-            <input type="number" min="0" step="any" class="form-control col-md-4" name="percent" value="<?= $tax_percent ?>">
+            <input type="number" min="0" step="any" class="form-control w-25" name="percent" value="<?= $tax_percent ?>">
         </div>
 
     </div>
diff --git a/admin/modals/ticket_status/ticket_status_add.php b/admin/modals/ticket_status/ticket_status_add.php
index 6b9676f97..7d0f4746e 100644
--- a/admin/modals/ticket_status/ticket_status_add.php
+++ b/admin/modals/ticket_status/ticket_status_add.php
@@ -23,7 +23,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" required>
             </div>
         </div>
 
diff --git a/admin/modals/ticket_status/ticket_status_edit.php b/admin/modals/ticket_status/ticket_status_edit.php
index a34aad885..e93c94e4b 100644
--- a/admin/modals/ticket_status/ticket_status_edit.php
+++ b/admin/modals/ticket_status/ticket_status_edit.php
@@ -41,7 +41,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" value="<?= $ticket_status_color ?>" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" value="<?= $ticket_status_color ?>" required>
             </div>
         </div>
 
diff --git a/admin/modals/vendor_template/vendor_template_add.php b/admin/modals/vendor_template/vendor_template_add.php
index f0e18b91b..08399f004 100644
--- a/admin/modals/vendor_template/vendor_template_add.php
+++ b/admin/modals/vendor_template/vendor_template_add.php
@@ -75,7 +75,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/admin/modals/vendor_template/vendor_template_edit.php b/admin/modals/vendor_template/vendor_template_edit.php
index 57e1f76e7..b6b6d4049 100644
--- a/admin/modals/vendor_template/vendor_template_edit.php
+++ b/admin/modals/vendor_template/vendor_template_edit.php
@@ -119,7 +119,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4" value="<?= $vendor_phone_country_code ?>">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" placeholder="+" maxlength="4" value="<?= $vendor_phone_country_code ?>">
                                 <input type="tel" class="form-control" name="phone" maxlength="200" value="<?= $vendor_phone ?>">
                             </div>
                         </div>
diff --git a/admin/settings_company.php b/admin/settings_company.php
index 8d44de1fa..16c75144d 100644
--- a/admin/settings_company.php
+++ b/admin/settings_company.php
@@ -108,7 +108,7 @@ $company_initials = escapeHtml(initials($company_name));
                                     <div class="mb-3">
                                         <div class="input-group">
                                                 <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            <input type="tel" class="form-control col-2" name="phone_country_code" value="<?= $company_phone_country_code ?>" placeholder="+" maxlength="4">
+                                            <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" value="<?= $company_phone_country_code ?>" placeholder="+" maxlength="4">
                                             <input type="tel" class="form-control" name="phone" value="<?= $company_phone ?>" placeholder="Phone Number" maxlength="200">
                                         </div>
                                     </div>
diff --git a/agent/accounts.php b/agent/accounts.php
index fcd952fd7..bfac439c5 100644
--- a/agent/accounts.php
+++ b/agent/accounts.php
@@ -31,7 +31,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-3">
             <form autocomplete="off">
                 <div class="input-group">
-                    <input type="search" class="form-control col-md-4" name="q" value="<?php if (isset($q)) { echo stripslashes(escapeHtml($q)); } ?>" placeholder="Search Accounts">
+                    <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(escapeHtml($q)); } ?>" placeholder="Search Accounts">
                         <button class="btn btn-primary"><i class="fa fa-search"></i></button>
                 </div>
             </form>
diff --git a/agent/dashboard.php b/agent/dashboard.php
index ea9f855a8..2f41622dc 100644
--- a/agent/dashboard.php
+++ b/agent/dashboard.php
@@ -46,12 +46,12 @@ $sql_years_select = mysqli_query($mysqli, "
 </style>
 
 <div class="card card-body">
-    <form class="d-flex align-items-center gap-2">
+    <form class="d-flex flex-wrap align-items-center gap-2">
         <input type="hidden" name="enable_financial" value="0">
         <input type="hidden" name="enable_technical" value="0">
 
         <label for="year" class="me-sm-2">Select Year:</label>
-        <select id="year" onchange="this.form.submit()" class="form-select me-sm-3 col-sm-2 mb-3 mb-sm-0" name="year">
+        <select id="year" onchange="this.form.submit()" class="form-select w-auto me-sm-3" name="year">
             <?php while ($row = mysqli_fetch_assoc($sql_years_select)) {
                 $year_select = $row['all_years'];
                 if (empty($year_select)) {
@@ -179,7 +179,7 @@ if ($user_config_dashboard_financial_enable == 1) {
     <div class="row">
         <div class="col-lg-4 col-md-6 col-sm-12">
             <!-- small box -->
-            <a class="small-box bg-primary" href="income.php?dtf=<?= $year ?>-01-01&dtt=<?= $year ?>-12-31">
+            <a class="small-box bg-blue text-white" href="income.php?dtf=<?= $year ?>-01-01&dtt=<?= $year ?>-12-31">
                 <div class="inner">
                     <h3><?= numfmt_format_currency($currency_format, $total_income, "$session_company_currency") ?></h3>
                     <p>Income</p>
@@ -223,7 +223,7 @@ if ($user_config_dashboard_financial_enable == 1) {
 
         <div class="col-lg-6 col-md-6 col-sm-12">
             <!-- small box -->
-            <a class="small-box bg-info" href="reports/recurring_by_client.php">
+            <a class="small-box bg-info text-white" href="reports/recurring_by_client.php">
                 <div class="inner">
                     <h3><?= numfmt_format_currency($currency_format, $recurring_monthly_total, "$session_company_currency") ?></h3>
                     <p>Monthly Recurring Income</p>
@@ -237,7 +237,7 @@ if ($user_config_dashboard_financial_enable == 1) {
 
         <div class="col-lg-6 col-md-6 col-sm-12">
             <!-- small box -->
-            <a class="small-box bg-pink" href="recurring_expenses.php">
+            <a class="small-box bg-pink text-white" href="recurring_expenses.php">
                 <div class="inner">
                     <h3><?= numfmt_format_currency($currency_format, $recurring_expense_monthly_total, "$session_company_currency") ?></h3>
                     <p>Monthly Recurring Expense</p>
diff --git a/agent/income.php b/agent/income.php
index 118019a10..9937b1e69 100644
--- a/agent/income.php
+++ b/agent/income.php
@@ -328,7 +328,7 @@ $summary_total_income = floatval($row['total_income']);
         <div class="row">
             <div class="col-lg-4 col-md-6 col-sm-12">
                 <!-- small box -->
-                <div class="small-box bg-primary">
+                <div class="small-box bg-blue text-white">
                     <div class="inner">
                         <h3><?= numfmt_format_currency($currency_format, $summary_total_payments, $session_company_currency) ?></h3>
                         <p>Invoice Payments</p>
@@ -342,7 +342,7 @@ $summary_total_income = floatval($row['total_income']);
 
             <div class="col-lg-4 col-md-6 col-sm-12">
                 <!-- small box -->
-                <div class="small-box bg-info">
+                <div class="small-box bg-info text-white">
                     <div class="inner">
                         <h3><?= numfmt_format_currency($currency_format, $summary_total_revenues, $session_company_currency) ?></h3>
                         <p>Other Revenue</p>
@@ -463,7 +463,7 @@ $summary_total_income = floatval($row['total_income']);
                     if ($income_type == 'Payment') {
                         $income_edit_modal = "modals/payment/payment_edit.php?id=$income_id";
                         $income_delete_action = "delete_payment=$income_id";
-                        $income_type_badge = "bg-primary";
+                        $income_type_badge = "bg-blue";
                     } else {
                         $income_edit_modal = "modals/revenue/revenue_edit.php?id=$income_id";
                         $income_delete_action = "delete_revenue=$income_id";
diff --git a/agent/modals/calendar/calendar_add.php b/agent/modals/calendar/calendar_add.php
index d9a08d691..fc143c8fa 100644
--- a/agent/modals/calendar/calendar_add.php
+++ b/agent/modals/calendar/calendar_add.php
@@ -27,7 +27,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" required>
             </div>
         </div>
 
diff --git a/agent/modals/calendar/calendar_edit.php b/agent/modals/calendar/calendar_edit.php
index ab873428b..9a332405b 100644
--- a/agent/modals/calendar/calendar_edit.php
+++ b/agent/modals/calendar/calendar_edit.php
@@ -35,7 +35,7 @@ ob_start();
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-                <input type="color" class="form-control col-3" name="color" value="<?= $calendar_color ?>" required>
+                <input type="color" class="form-control form-control-color w-auto flex-grow-0" name="color" value="<?= $calendar_color ?>" required>
             </div>
         </div>
 
diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php
index dc400ac2c..3157b37f9 100644
--- a/agent/modals/client/client_add.php
+++ b/agent/modals/client/client_add.php
@@ -195,7 +195,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="location_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="location_phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="location_phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -213,7 +213,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                <input type="tel" class="form-control col-2" name="location_fax_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="location_fax_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="location_fax" placeholder="Fax Number" maxlength="200">
                             </div>
                         </div>
@@ -246,7 +246,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="contact_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="contact_phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="contact_phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -264,7 +264,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                <input type="tel" class="form-control col-2" name="contact_mobile_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="contact_mobile_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="contact_mobile" placeholder="Mobile Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/contact/contact_add.php b/agent/modals/contact/contact_add.php
index 69e7aabbf..19476e43e 100644
--- a/agent/modals/contact/contact_add.php
+++ b/agent/modals/contact/contact_add.php
@@ -103,7 +103,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -121,7 +121,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                <input type="tel" class="form-control col-2" name="mobile_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="mobile_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="mobile" placeholder="Mobile Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/contact/contact_edit.php b/agent/modals/contact/contact_edit.php
index 590e5f5d9..b7106f050 100644
--- a/agent/modals/contact/contact_edit.php
+++ b/agent/modals/contact/contact_edit.php
@@ -119,7 +119,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" value="<?= "$contact_phone_country_code" ?>" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" value="<?= "$contact_phone_country_code" ?>" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" value="<?= $contact_phone ?>" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -137,7 +137,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                <input type="tel" class="form-control col-2" name="mobile_country_code" value="<?= "$contact_mobile_country_code" ?>" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="mobile_country_code" value="<?= "$contact_mobile_country_code" ?>" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="mobile" value="<?= $contact_mobile ?>" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/location/location_add.php b/agent/modals/location/location_add.php
index 6a9064651..ab50ce223 100644
--- a/agent/modals/location/location_add.php
+++ b/agent/modals/location/location_add.php
@@ -168,7 +168,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -186,7 +186,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                <input type="tel" class="form-control col-2" name="fax_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="fax_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="fax" placeholder="Fax Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/location/location_edit.php b/agent/modals/location/location_edit.php
index 264deaab5..aaa359f47 100644
--- a/agent/modals/location/location_edit.php
+++ b/agent/modals/location/location_edit.php
@@ -195,7 +195,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" value="<?= $location_phone_country_code ?>" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" value="<?= $location_phone_country_code ?>" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" value="<?= $location_phone ?>" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
@@ -213,7 +213,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                <input type="tel" class="form-control col-2" name="fax_country_code" value="<?= $location_fax_country_code ?>" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="fax_country_code" value="<?= $location_fax_country_code ?>" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="fax" value="<?= $location_fax ?>" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/vendor/vendor_add.php b/agent/modals/vendor/vendor_add.php
index 3bf45b042..d0a3b9348 100644
--- a/agent/modals/vendor/vendor_add.php
+++ b/agent/modals/vendor/vendor_add.php
@@ -76,7 +76,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/agent/modals/vendor/vendor_edit.php b/agent/modals/vendor/vendor_edit.php
index 951f1ff50..f75954352 100644
--- a/agent/modals/vendor/vendor_edit.php
+++ b/agent/modals/vendor/vendor_edit.php
@@ -124,7 +124,7 @@ ob_start();
                         <div class="mb-3">
                             <div class="input-group">
                                     <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                <input type="tel" class="form-control col-2" name="phone_country_code" value="<?= $vendor_phone_country_code ?>" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control w-25 flex-grow-0" name="phone_country_code" value="<?= $vendor_phone_country_code ?>" placeholder="+" maxlength="4">
                                 <input type="tel" class="form-control" name="phone" value="<?= $vendor_phone ?>" placeholder="Phone Number" maxlength="200">
                             </div>
                         </div>
diff --git a/guest/guest_view_item.php b/guest/guest_view_item.php
index 97b20f840..ea7fd1bcc 100644
--- a/guest/guest_view_item.php
+++ b/guest/guest_view_item.php
@@ -217,7 +217,7 @@ if ($item_type == "Document") {
     ?>
 
     <h5><?= $credential_name ?></h5>
-    <table class="table col-md-3">
+    <table class="table w-auto">
         <tr>
             <th>URL</th>
             <td><?= $credential_uri ?></td>