diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php
index 6eb92133..b25b058d 100644
--- a/client_certificate_add_modal.php
+++ b/client_certificate_add_modal.php
@@ -15,10 +15,12 @@
                         <li class="nav-item">
                             <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-certificate">Certificate</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
                         </li>
-                        
                     </ul>
 
                     <hr>
@@ -47,6 +49,32 @@
                                 </div>
                             </div>
 
+                            
+
+                            <div class="form-group">
+                                <label>Domain</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="domain_id">
+                                        <option value="">- Domain -</option>
+                                        <?php
+                                        $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
+                                        while ($domain_row = mysqli_fetch_array($domains_sql)) {
+                                            $domain_id = intval($domain_row['domain_id']);
+                                            $domain_name = nullable_htmlentities($domain_row['domain_name']);
+                                            echo "<option value=\"$domain_id\">$domain_name</option>";
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+                        
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-certificate">
+
                             <div class="form-group">
                                 <label>Domain <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
@@ -86,30 +114,10 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                                     </div>
-                                    <textarea class="form-control" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
+                                    <textarea class="form-control" rows="8" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
                                 </div>
                             </div>
 
-                            <div class="form-group">
-                                <label>Domain</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="domain_id">
-                                        <option value="">- Domain -</option>
-                                        <?php
-                                        $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
-                                        while ($domain_row = mysqli_fetch_array($domains_sql)) {
-                                            $domain_id = intval($domain_row['domain_id']);
-                                            $domain_name = nullable_htmlentities($domain_row['domain_name']);
-                                            echo "<option value=\"$domain_id\">$domain_name</option>";
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-                        
                         </div>
 
                         <div class="tab-pane fade" id="pills-notes">
diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php
index f6884fcb..19208e19 100644
--- a/client_certificate_edit_modal.php
+++ b/client_certificate_edit_modal.php
@@ -12,83 +12,112 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
-                    <div class="form-group">
-                        <label>Certificate Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                            </div>
-                            <input type="text" class="form-control" id="editCertificateName" name="name" placeholder="Certificate name" value="" required>
-                        </div>
-                    </div>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pillsEditDetails">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsEditCertificate">Certificate</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsEditNotes">Notes</a>
+                        </li>
+                    </ul>
 
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" id="editCertificateDescription" name="description" placeholder="Short Description">
-                        </div>
-                    </div>
+                    <hr>
 
-                    <div class="form-group">
-                        <label>Domain <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
-                            </div>
-                            <input type="text" class="form-control" id="editCertificateDomain" name="domain" placeholder="Domain" value="" required>
-                            <div class="input-group-append">
-                                <button type="button" class="btn btn-secondary" onclick="fetchSSL('edit')"><i class="fas fa-fw fa-sync-alt"></i></button>
-                            </div>
-                        </div>
-                    </div>
+                    <div class="tab-content">
 
-                    <div class="form-group">
-                        <label>Issued By</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                            </div>
-                            <input type="text" class="form-control" id="editCertificateIssuedBy" name="issued_by" placeholder="Issued By" value="">
-                        </div>
-                    </div>
+                        <div class="tab-pane fade show active" id="pillsEditDetails">
 
-                    <div class="form-group">
-                        <label>Expire Date</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                            <div class="form-group">
+                                <label>Certificate Name <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="editCertificateName" name="name" placeholder="Certificate name" value="" required>
+                                </div>
                             </div>
-                            <input type="date" class="form-control" id="editCertificateExpire" name="expire" max="2999-12-31" value="">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label>Public Key </label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="editCertificateDescription" name="description" placeholder="Short Description">
+                                </div>
                             </div>
-                            <textarea class="form-control" id="editCertificatePublicKey" name="public_key"></textarea>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label>Notes</label>
-                        <textarea class="form-control" id="editCertificateNotes" name="notes" rows="3" placeholder="Enter some notes"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Domain</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                            <div class="form-group">
+                                <label>Domain</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <select class="form-control select2" id="editDomainId" name="domain_id">
+                                    </select>
+                                </div>
                             </div>
-                            <select class="form-control select2" id="editDomainId" name="domain_id">
-                            </select>
+
                         </div>
+
+                        <div class="tab-pane fade" id="pillsEditCertificate">
+
+                            <div class="form-group">
+                                <label>Domain <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
+                                    </div>
+                                    <input type="text" class="form-control" id="editCertificateDomain" name="domain" placeholder="Domain" value="" required>
+                                    <div class="input-group-append">
+                                        <button type="button" class="btn btn-secondary" onclick="fetchSSL('edit')"><i class="fas fa-fw fa-sync-alt"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Issued By</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="editCertificateIssuedBy" name="issued_by" placeholder="Issued By" value="">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Expire Date</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                                    </div>
+                                    <input type="date" class="form-control" id="editCertificateExpire" name="expire" max="2999-12-31" value="">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Public Key </label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <textarea class="form-control" rows="8" id="editCertificatePublicKey" name="public_key"></textarea>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pillsEditNotes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" id="editCertificateNotes" name="notes" rows="12" placeholder="Enter some notes"></textarea>
+                            </div>
+
+                        </div>
+
                     </div>
 
                 </div>
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php
index 4f3c371e..57a4a3a1 100644
--- a/client_domain_edit_modal.php
+++ b/client_domain_edit_modal.php
@@ -19,6 +19,9 @@
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-records">Records</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsEditNotes">Notes</a>
+                        </li>
                     </ul>
 
                     <hr>
@@ -79,11 +82,6 @@
                                 </div>
                             </div>
 
-                            <div class="form-group">
-                                <label>Notes</label>
-                                <textarea class="form-control" id="editDomainNotes" name="notes" rows="3" placeholder="Enter some notes"></textarea>
-                            </div>
-
                         </div>
 
                         <div class="tab-pane fade" id="pills-records">
@@ -140,6 +138,12 @@
 
                         </div>
 
+                        <div class="tab-pane fade" id="pillsEditNotes">
+                            <div class="form-group">
+                                <textarea class="form-control" id="editDomainNotes" name="notes" rows="12" placeholder="Enter some notes"></textarea>
+                            </div>
+                        </div>
+
                     </div>
 
                 </div>