diff --git a/cp/resources/views/admin/dashboard/index.twig b/cp/resources/views/admin/dashboard/index.twig
index c8e0b2d..11740e9 100644
--- a/cp/resources/views/admin/dashboard/index.twig
+++ b/cp/resources/views/admin/dashboard/index.twig
@@ -29,7 +29,7 @@
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" /></svg>
                     {{ __('Create new domain') }}
                   </a>
-                  <a href="{{route('createDomain')}}" class="btn btn-primary d-sm-none btn-icon" data-bs-toggle="modal" aria-label="{{ __('Create new domain') }}">
+                  <a href="{{route('createDomain')}}" class="btn btn-primary d-sm-none btn-icon" aria-label="{{ __('Create new domain') }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" /></svg>
                   </a>
                 </div>
diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig
index c1f4c55..8df364f 100644
--- a/cp/resources/views/admin/domains/updateDomain.twig
+++ b/cp/resources/views/admin/domains/updateDomain.twig
@@ -76,7 +76,7 @@
                   <div class="card-body">
                     <div class="row">
                         <!-- Fields for 4 contacts with roles -->
-                        <div class="col">
+                        <div class="col-md-6">
                             <div class="mb-3">
                                 <label for="contactRegistrant" class="form-label required">{{ __('Registrant Contact') }}</label>
                                 <input type="text" class="form-control mb-2" placeholder="{{ __('Registrant Contact') }}" name="contactRegistrant" id="contactRegistrant" value="{{ domainRegistrant.identifier }}" required>
@@ -116,7 +116,7 @@
                         </div>
                                 
                         <!-- Fields for nameservers -->
-                        <div class="col">
+                        <div class="col-md-6">
                             <div id="nameserverFields">
                                 <label class="form-label">{{ __('Nameservers') }}&nbsp;<button type="button" id="addNameserver" class="btn btn-success btn-sm mb-2">+</button>&nbsp;<button type="button" id="removeNameserver" class="btn btn-danger btn-sm mb-2">-</button></label>
                                 {% for host in domainHosts %}
diff --git a/cp/resources/views/admin/registrars/updateRegistrar.twig b/cp/resources/views/admin/registrars/updateRegistrar.twig
index cd1e99f..0f874a4 100644
--- a/cp/resources/views/admin/registrars/updateRegistrar.twig
+++ b/cp/resources/views/admin/registrars/updateRegistrar.twig
@@ -335,9 +335,9 @@
                   </div>
                 </div>
 
-                <div class="row mb-3">
+                <div class="row">
                   <!-- IP Whitelisting Column -->
-                  <div class="col-md-6">
+                  <div class="col-md-6 mb-3">
                     <div class="card h-100">
                         <div class="card-body">
                           <h5 class="card-title">IP Whitelisting <span class="text-red">*</span></h5>
@@ -366,7 +366,7 @@
                   </div>
 
                   <!-- Registrar User Column -->
-                  <div class="col-md-6">
+                  <div class="col-md-6 mb-3">
                     <div class="card h-100">
                       <div class="card-body">
                         <h5 class="card-title">Registrar User</h5>
diff --git a/cp/resources/views/admin/registrars/viewRegistrar.twig b/cp/resources/views/admin/registrars/viewRegistrar.twig
index b76d423..da43b0d 100644
--- a/cp/resources/views/admin/registrars/viewRegistrar.twig
+++ b/cp/resources/views/admin/registrars/viewRegistrar.twig
@@ -82,8 +82,8 @@
                 </div>
               </div>
             </div>
-              <div class="row mb-3">
-                <div class="col-md-6">
+              <div class="row">
+                <div class="col-md-6 mb-3">
                   <div class="card h-100">
                     <div class="card-body">
                       <h5 class="card-title">IP Whitelisting</h5>
@@ -101,7 +101,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="col-md-6">
+                <div class="col-md-6 mb-3">
                   <div class="card h-100">
                     <div class="card-body">
                       <h5 class="card-title">Registrar User</h5>