diff --git a/powerdnsadmin/templates/admin_setting_authentication.html b/powerdnsadmin/templates/admin_setting_authentication.html
index a3060fd..56f4dd0 100644
--- a/powerdnsadmin/templates/admin_setting_authentication.html
+++ b/powerdnsadmin/templates/admin_setting_authentication.html
@@ -77,6 +77,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">Basic Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <div class="form-group">
                                                                 <input type="checkbox" id="local_db_enabled"
@@ -94,22 +95,37 @@
                                                                 <label for="signup_enabled">Allow users to sign
                                                                     up</label>
                                                             </div>
-                                                            <button type="submit" class="btn btn-primary">Save</button>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
+
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <p>Fill in all the fields in the left form.</p>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->
 
@@ -132,6 +148,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">LDAP Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <fieldset>
                                                                 <div class="form-group">
@@ -386,20 +403,27 @@
                                                                     </div>
                                                                 </div>
                                                             </fieldset>
-                                                            <div class="form-group">
-                                                                <button type="submit" class="btn btn-flat btn-primary">
-                                                                    Save
-                                                                </button>
-                                                            </div>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
+
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <dl class="dl-horizontal">
                                                             <dt>Enable LDAP Authentication</dt>
@@ -553,9 +577,13 @@
                                                             </dd>
                                                         </dl>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->
 
@@ -570,6 +598,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">Google OAuth Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <fieldset>
                                                                 <div class="form-group">
@@ -644,29 +673,40 @@
                                                                     <span class="help-block with-errors"></span>
                                                                 </div>
                                                             </fieldset>
-                                                            <div class="card-footer">
-                                                                <button type="submit"
-                                                                        class="btn btn-primary float-right">Save
-                                                                </button>
-                                                            </div>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
+
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <p>Fill in all the fields in the left form.</p>
                                                         <p>Make sure you add PDA redirection URI (e.g
                                                             http://localhost:9191/google/authorized) to your Google App
                                                             Credentials Restriction.</p>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->
 
@@ -680,6 +720,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">GitHub OAuth Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <fieldset>
                                                                 <div class="form-group">
@@ -755,26 +796,37 @@
                                                                     <span class="help-block with-errors"></span>
                                                                 </div>
                                                             </fieldset>
-                                                            <div class="form-group">
-                                                                <button type="submit" class="btn btn-flat btn-primary">
-                                                                    Save
-                                                                </button>
-                                                            </div>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
+
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <p>Fill in all the fields in the left form.</p>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->
 
@@ -788,6 +840,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">Microsoft OAuth Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <fieldset>
                                                                 <div class="form-group">
@@ -976,7 +1029,7 @@
                                                                     <span class="help-block with-errors"></span>
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="azure_group_accounts_name_re">Azure
+                                                                    <label for="azure_group_accounts_description_re">Azure
                                                                         group name
                                                                         description regex</label>
                                                                     <input type="text" class="form-control"
@@ -988,20 +1041,27 @@
                                                                     <span class="help-block with-errors"></span>
                                                                 </div>
                                                             </fieldset>
-                                                            <div class="form-group">
-                                                                <button type="submit" class="btn btn-flat btn-primary">
-                                                                    Save
-                                                                </button>
-                                                            </div>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
+
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <p>Fill in all the fields in the left form.</p>
                                                         <p>You first need to define an Application Registration in your
@@ -1060,9 +1120,13 @@
                                                             to the
                                                             Account</p>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->
 
@@ -1076,6 +1140,7 @@
                                                         <div class="card-header">
                                                             <h3 class="card-title">OpenID Connect OAuth Settings</h3>
                                                         </div>
+                                                        <!-- /.card-header -->
                                                         <div class="card-body">
                                                             <fieldset>
                                                                 <div class="form-group">
@@ -1225,26 +1290,36 @@
                                                                     <span class="help-block with-errors"></span>
                                                                 </div>
                                                             </fieldset>
-                                                            <div class="form-group">
-                                                                <button type="submit" class="btn btn-flat btn-primary">
-                                                                    Save
-                                                                </button>
-                                                            </div>
                                                         </div>
+                                                        <!-- /.card-body -->
+                                                        <div class="card-footer">
+                                                            <button type="submit" class="btn btn-primary"
+                                                                    title="Save Settings">
+                                                                <i class="fa-solid fa-save"></i>&nbsp;Save Settings
+                                                            </button>
+                                                        </div>
+                                                        <!-- /.card-footer -->
                                                     </div>
+                                                    <!-- /.card -->
                                                 </form>
                                             </div>
+                                            <!-- /.col -->
                                             <div class="col-12 col-sm-6 col-lg-8">
                                                 <div class="card">
                                                     <div class="card-header">
                                                         <h3 class="card-title">Settings Help</h3>
                                                     </div>
+                                                    <!-- /.card-header -->
                                                     <div class="card-body">
                                                         <p>Fill in all the fields in the left form.</p>
                                                     </div>
+                                                    <!-- /.card-body -->
                                                 </div>
+                                                <!-- /.card -->
                                             </div>
+                                            <!-- /.col -->
                                         </div>
+                                        <!-- /.row -->
                                     </div>
                                     <!-- /.tab-pane -->