diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 4a26038c..964ba500 100644
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -134,7 +134,7 @@
     <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
     <script src="/static/assets/js/shared/misc.js"></script>
     <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
 
     <script>
 
diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 166ac7d0..34a306da 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -32,7 +32,7 @@
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
                       <h4 class="card-title"><i class="fas fa-users"></i> Users</h4>
                       <span class="too_small" title="{{ translate('dashboard', 'cannotSee', data['lang']) }}", data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}", data-placement="top"></span>
-                  
+
                   <div><a class="nav-link" href="/panel/add_user"><i class="fas fa-plus-circle"></i> &nbsp; Add New User</a></div>
                 </div>
                 <div class="card-body">
@@ -155,13 +155,13 @@
 
 {% block js %}
 <script>
-$(document).ready(function(){ 
+$(document).ready(function(){
   $('[data-toggle="popover"]').popover();
     if($(window).width() < 1000){
     $('.too_small').popover("show");
     $('.too_small2').popover("show");
   }
-  
+
 });
  $(window).ready(function(){
         $('body').click(function(){
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index d8c9a6f9..bc3cdc8a 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -62,27 +62,27 @@
                       <input type="hidden" name="id" value="{{ data['user']['user_id'] }}">
                       <input type="hidden" name="subpage" value="config">
 
-                      
+
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
                           <h4 class="card-title"><i class="fas fa-user"></i> User Settings</h4>
                         </div>
-                        <div class="card-body">                          
+                        <div class="card-body">
                           <div class="form-group">
-                            <label for="username">User Name <small class="text-muted ml-1"> - What you wish to call this user</small> </label>
+                            <label class="form-label" for="username">User Name <small class="text-muted ml-1"> - What you wish to call this user</small> </label>
                             <input type="text" class="form-control" name="username" id="username" value="{{ data['user']['username']  }}" placeholder="User Name" >
                           </div>
                           <div class="form-group">
-                            <label for="password0">Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
+                            <label class="form-label" for="password0">Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
                             <input type="password" class="form-control" name="password0" id="password0" value="" placeholder="Password" >
                           </div>
                           <div class="form-group">
-                            <label for="password1">Repeat Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
+                            <label class="form-label" for="password1">Repeat Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
                             <input type="password" class="form-control" name="password1" id="password1" value="" placeholder="Repeat Password" >
                           </div>
                           <div class="form-group">
-                          <label for="language">User Language:</label>
-                            <select id="language" name="language" form="user_form">
+                            <label class="form-label" for="language">User Language:</label>
+                            <select class="form-select" id="language" name="language" form="user_form">
                             {% for lang in data['languages'] %}
                               <option value="{{lang}}">{{lang}}</option>
                             {% end %}
@@ -90,8 +90,7 @@
                           </div>
                         </div>
                       </div>
-                      
-                      
+
                       {% if len(data['servers_all']) > 0 %}
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
@@ -113,9 +112,9 @@
                                     <td>{{ role.role_name }}</td>
                                     <td>
                                       {% if role.role_id in data['user']['roles'] %}
-                                        <input type="checkbox" class="" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" checked="" value="1">
+                                        <input type="checkbox" class="form-check-input"  id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" checked="" value="1">
                                       {% else %}
-                                        <input type="checkbox" class="" id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" value="1">
+                                        <input type="checkbox" class="form-check-input"  id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership" value="1">
                                       {% end %}
 
                                     </td>
@@ -128,13 +127,13 @@
                         </div>
                       </div>
 
-                      <!-- Put Permissions Crafty part here -->  
-                      
+                      <!-- Put Permissions Crafty part here -->
+
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
                           <h4 class="card-title"><i class="fas fa-user-lock"></i> Crafty Permissions <small class="text-muted ml-1"> - permissions this user has on Crafty Controller </small></h4>
                         </div>
-                        <div class="card-body">                          
+                        <div class="card-body">
                           <div class="form-group">
                             <div class="table-responsive">
                               <table class="table table-hover">
@@ -151,9 +150,9 @@
                                     <td>{{ permission.name }}</td>
                                     <td>
                                       {% if permission in data['permissions_list'] %}
-                                        <input type="checkbox" class="" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" checked="" value="1">
+                                        <input type="checkbox" class="form-check-input"  id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" checked="" value="1">
                                       {% else %}
-                                        <input type="checkbox" class="" id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" value="1">
+                                        <input type="checkbox" class="form-check-input"  id="permission_{{ permission.name }}" name="permission_{{ permission.name }}" value="1">
                                       {% end %}
                                     </td>
                                     <td><input type="text" class="form-control" name="quantity_{{ permission.name }}" id="quantity_{{ permission.name }}" value="{{ data['quantity_server'][permission.name] }}"></td>
@@ -193,7 +192,7 @@
                         </label>
 
                       </div>
-                      
+
                       <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{ translate('panelConfig', 'save', data['lang']) }}</button>
                       <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}</button>
                     </form>