diff --git a/resources/views/app/search/search.blade.php b/resources/views/app/search/search.blade.php
index 35f67343..97a65b2f 100644
--- a/resources/views/app/search/search.blade.php
+++ b/resources/views/app/search/search.blade.php
@@ -11,7 +11,7 @@
             <form action="{{ route('do-search') }}" method="POST">
                 @csrf
 
-                <div class="mb-3">
+                <div class="mb-4">
                     <div class="input-group">
                         <input type="text" name="query" id="query" autofocus
                             class="form-control form-control-lg{{ $errors->has('query') ? ' is-invalid' : '' }}"
@@ -91,9 +91,9 @@
                     </div>
 
                 </div>
-                <div class="row mt-3">
+                <div class="row mt-4">
 
-                    <div class="col-md mb-2 mb-md-0">
+                    <div class="col-md mb-3 mb-md-0">
                         <label for="only_lists" class="d-none" aria-hidden="true">
                             @lang('search.filter_by_list')
                         </label>
@@ -101,7 +101,7 @@
                             placeholder="@lang('search.filter_by_list')" value="{{ $query_settings['only_lists'] }}">
                     </div>
 
-                    <div class="col-md mb-2 mb-md-0">
+                    <div class="col-md mb-3 mb-md-0">
                         <label for="only_tags" class="d-none" aria-hidden="true">
                             @lang('search.filter_by_tag')
                         </label>
@@ -129,7 +129,7 @@
             </form>
 
         </div>
-        <div class="card-table mt-3">
+        <div class="card-table mt-4">
 
             @if($results->isEmpty())
                 <div class="alert alert-info m-3">
diff --git a/resources/views/app/settings/partials/system/general-settings.blade.php b/resources/views/app/settings/partials/system/general-settings.blade.php
index 77393cc8..e8dc01fd 100644
--- a/resources/views/app/settings/partials/system/general-settings.blade.php
+++ b/resources/views/app/settings/partials/system/general-settings.blade.php
@@ -10,8 +10,8 @@
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="system_page_title">
+                    <div class="mb-4">
+                        <label class="form-label" for="system_page_title">
                             @lang('settings.sys_page_title')
                         </label>
                         <input type="text" id="system_page_title" name="system_page_title" class="form-control"
@@ -26,8 +26,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="system_guest_access">
+                    <div class="mb-4">
+                        <label class="form-label" for="system_guest_access">
                             @lang('settings.sys_guest_access')
                         </label>
                         <select id="system_guest_access" name="system_guest_access"
@@ -54,8 +54,10 @@
 
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
-                    <div class="mb-3">
-                        <label for="system_custom_header_content">@lang('settings.sys_custom_header_content')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="system_custom_header_content">
+                            @lang('settings.sys_custom_header_content')
+                        </label>
 
                         <textarea name="system_custom_header_content" id="system_custom_header_content" rows="4"
                             class="form-control{{ $errors->has('system_custom_header_content') ? ' is-invalid' : '' }}"
diff --git a/resources/views/app/settings/partials/system/guest-settings.blade.php b/resources/views/app/settings/partials/system/guest-settings.blade.php
index 22618905..4d924c33 100644
--- a/resources/views/app/settings/partials/system/guest-settings.blade.php
+++ b/resources/views/app/settings/partials/system/guest-settings.blade.php
@@ -12,8 +12,8 @@
             <div class="row mt-4">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="guest_listitem_count">
+                    <div class="mb-4">
+                        <label class="form-label" for="guest_listitem_count">
                             @lang('settings.listitem_count')
                         </label>
                         <select id="guest_listitem_count" name="guest_listitem_count"
@@ -35,8 +35,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="guest_link_display_mode">
+                    <div class="mb-4">
+                        <label class="form-label" for="guest_link_display_mode">
                             @lang('settings.display_mode')
                         </label>
                         <select id="guest_link_display_mode" name="guest_link_display_mode"
@@ -73,8 +73,8 @@
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="guest_links_new_tab">
+                    <div class="mb-4">
+                        <label class="form-label" for="guest_links_new_tab">
                             @lang('settings.links_new_tab')
                         </label>
                         <select id="guest_links_new_tab" name="guest_links_new_tab"
diff --git a/resources/views/app/settings/partials/user/account-settings.blade.php b/resources/views/app/settings/partials/user/account-settings.blade.php
index d873a606..49e83caf 100644
--- a/resources/views/app/settings/partials/user/account-settings.blade.php
+++ b/resources/views/app/settings/partials/user/account-settings.blade.php
@@ -7,8 +7,8 @@
         <form action="{{ route('save-settings-account') }}" method="POST">
             @csrf
 
-            <div class="mb-3">
-                <label for="username">
+            <div class="mb-4">
+                <label class="form-label" for="username">
                     @lang('user.username')
                 </label>
                 <input type="text" name="name" id="name" required
@@ -21,8 +21,8 @@
                 @endif
             </div>
 
-            <div class="mb-3">
-                <label for="email">
+            <div class="mb-4">
+                <label class="form-label" for="email">
                     @lang('user.email')
                 </label>
                 <input type="text" name="email" id="email" required
diff --git a/resources/views/app/settings/partials/user/app-settings.blade.php b/resources/views/app/settings/partials/user/app-settings.blade.php
index 2502ee19..0c6aa31e 100644
--- a/resources/views/app/settings/partials/user/app-settings.blade.php
+++ b/resources/views/app/settings/partials/user/app-settings.blade.php
@@ -10,8 +10,8 @@
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="locale">
+                    <div class="mb-4">
+                        <label class="form-label" for="locale">
                             @lang('settings.language')
                         </label>
                         <select id="locale" name="locale"
@@ -33,8 +33,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="timezone">
+                    <div class="mb-4">
+                        <label class="form-label" for="timezone">
                             @lang('settings.timezone')
                         </label>
                         <select id="timezone" name="timezone"
@@ -59,8 +59,8 @@
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="date_format">
+                    <div class="mb-4">
+                        <label class="form-label" for="date_format">
                             @lang('settings.date_format')
                         </label>
                         <select id="date_format" name="date_format"
@@ -82,8 +82,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="time_format">
+                    <div class="mb-4">
+                        <label class="form-label" for="time_format">
                             @lang('settings.time_format')
                         </label>
                         <select id="time_format" name="time_format"
@@ -108,8 +108,8 @@
             <div class="row mt-4">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="listitem_count">
+                    <div class="mb-4">
+                        <label class="form-label" for="listitem_count">
                             @lang('settings.listitem_count')
                         </label>
                         <select id="listitem_count" name="listitem_count"
@@ -131,8 +131,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="link_display_mode">
+                    <div class="mb-4">
+                        <label class="form-label" for="link_display_mode">
                             @lang('settings.display_mode')
                         </label>
                         <select id="link_display_mode" name="link_display_mode"
@@ -169,8 +169,8 @@
             <div class="row">
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="links_new_tab">
+                    <div class="mb-4">
+                        <label class="form-label" for="links_new_tab">
                             @lang('settings.links_new_tab')
                         </label>
                         <select id="links_new_tab" name="links_new_tab"
@@ -192,8 +192,8 @@
                 </div>
                 <div class="col-12 col-sm-8 col-md-6">
 
-                    <div class="mb-3">
-                        <label for="links_new_tab">
+                    <div class="mb-4">
+                        <label class="form-label" for="links_new_tab">
                             @lang('settings.markdown_for_text')
                         </label>
                         <select id="markdown_for_text" name="markdown_for_text"
diff --git a/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php b/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php
index d32dc548..26e71e01 100644
--- a/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php
+++ b/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php
@@ -8,8 +8,8 @@
     <div class="row">
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="archive_backups_enabled">
+            <div class="mb-4">
+                <label class="form-label" for="archive_backups_enabled">
                     @lang('settings.archive_backups_enabled')
                 </label>
                 <select id="archive_backups_enabled" name="archive_backups_enabled"
@@ -34,8 +34,8 @@
         </div>
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="archive_private_backups_enabled">
+            <div class="mb-4">
+                <label class="form-label" for="archive_private_backups_enabled">
                     @lang('settings.archive_private_backups_enabled')
                 </label>
                 <select id="archive_private_backups_enabled"
diff --git a/resources/views/app/settings/partials/user/app-settings/privacy.blade.php b/resources/views/app/settings/partials/user/app-settings/privacy.blade.php
index f45b0b6c..2cb06217 100644
--- a/resources/views/app/settings/partials/user/app-settings/privacy.blade.php
+++ b/resources/views/app/settings/partials/user/app-settings/privacy.blade.php
@@ -1,13 +1,13 @@
 <div class="mb-3 my-5">
-    <h5>
+    <h5 class="mb-3">
         @lang('settings.privacy')
     </h5>
 
     <div class="row">
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="links_private_default">
+            <div class="mb-4">
+                <label class="form-label" for="links_private_default">
                     @lang('settings.links_private_default')
                 </label>
                 <select id="links_private_default" name="links_private_default"
@@ -32,8 +32,8 @@
         </div>
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="notes_private_default">
+            <div class="mb-4">
+                <label class="form-label" for="notes_private_default">
                     @lang('settings.notes_private_default')
                 </label>
                 <select id="notes_private_default" name="notes_private_default"
@@ -61,8 +61,8 @@
     <div class="row">
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="lists_private_default">
+            <div class="mb-4">
+                <label class="form-label" for="lists_private_default">
                     @lang('settings.lists_private_default')
                 </label>
                 <select id="lists_private_default" name="lists_private_default"
@@ -87,8 +87,8 @@
         </div>
         <div class="col-12 col-sm-8 col-md-6">
 
-            <div class="mb-3">
-                <label for="tags_private_default">
+            <div class="mb-4">
+                <label class="form-label" for="tags_private_default">
                     @lang('settings.tags_private_default')
                 </label>
                 <select id="tags_private_default" name="tags_private_default"
diff --git a/resources/views/app/settings/partials/user/app-settings/sharing.blade.php b/resources/views/app/settings/partials/user/app-settings/sharing.blade.php
index 7ae750fe..0bfb6ab6 100644
--- a/resources/views/app/settings/partials/user/app-settings/sharing.blade.php
+++ b/resources/views/app/settings/partials/user/app-settings/sharing.blade.php
@@ -4,7 +4,7 @@
         @lang('settings.sharing')
     </h5>
 
-    <p>@lang('settings.sharing_help')</p>
+    <p class="mt-3 small">@lang('settings.sharing_help')</p>
 
     <div class="sharing-settings">
 
diff --git a/resources/views/app/settings/partials/user/change-pw.blade.php b/resources/views/app/settings/partials/user/change-pw.blade.php
index 27e9c620..d5bd0dff 100644
--- a/resources/views/app/settings/partials/user/change-pw.blade.php
+++ b/resources/views/app/settings/partials/user/change-pw.blade.php
@@ -8,24 +8,24 @@
             <form action="{{ route('change-user-password') }}" method="POST">
                 @csrf
 
-                <div class="mb-3">
-                    <label for="old_password">
+                <div class="mb-4">
+                    <label class="form-label" for="current_password">
                         @lang('settings.old_password')
                     </label>
                     <input type="password" name="current_password" id="current_password" required
                         class="form-control{{ $errors->has('current_password') ? ' is-invalid' : '' }}">
                 </div>
 
-                <div class="mb-3">
-                    <label for="new_password">
+                <div class="mb-4">
+                    <label class="form-label" for="password">
                         @lang('settings.new_password')
                     </label>
                     <input type="password" name="password" id="password" required
                         class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}">
                 </div>
 
-                <div class="mb-3">
-                    <label for="new_password_confirmation">
+                <div class="mb-4">
+                    <label class="form-label" for="password_confirmation">
                         @lang('settings.new_password2')
                     </label>
                     <input type="password" name="password_confirmation" id="password_confirmation" required
diff --git a/resources/views/auth/login-form.blade.php b/resources/views/auth/login-form.blade.php
index 3abada9b..9d161400 100644
--- a/resources/views/auth/login-form.blade.php
+++ b/resources/views/auth/login-form.blade.php
@@ -6,7 +6,7 @@
         <form method="POST" action="{{ route('login') }}" aria-label="@lang('linkace.login')">
             @csrf
 
-            <div class="mb-3">
+            <div class="mb-4">
                 <div class="input-group mb-3">
                     <div class="input-group-text">
                         <x-icon.envelope/>
@@ -24,7 +24,7 @@
                 @endif
             </div>
 
-            <div class="mb-3">
+            <div class="mb-4">
                 <div class="input-group mb-3">
                     <div class="input-group-text">
                         <x-icon.lock/>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 65a70263..1dbba33c 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -21,8 +21,8 @@
                         aria-label="@lang('linkace.reset_password')">
                         @csrf
 
-                        <div class="mb-3">
-                            <label for="email">@lang('linkace.email')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="email">@lang('linkace.email')</label>
                             <div class="control">
                                 <input name="email" id="email"
                                     class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}"
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index a76d4699..04bf2de6 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -17,8 +17,8 @@
 
                         <input type="hidden" name="token" value="{{ request()->route('token') }}">
 
-                        <div class="mb-3">
-                            <label for="email">@lang('linkace.email')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="email">@lang('linkace.email')</label>
                             <div class="control">
                                 <input name="email" id="email"
                                     class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}"
@@ -33,8 +33,8 @@
                             @endif
                         </div>
 
-                        <div class="mb-3">
-                            <label for="password">@lang('linkace.password')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="password">@lang('linkace.password')</label>
                             <div class="control">
                                 <input name="password" id="password"
                                     class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
@@ -48,8 +48,8 @@
                             @endif
                         </div>
 
-                        <div class="mb-3">
-                            <label for="password-confirm">@lang('linkace.password_confirm')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="password-confirm">@lang('linkace.password_confirm')</label>
                             <div class="control">
                                 <input name="password_confirmation" id="password-confirm"
                                     class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}"
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index 42ec0fd3..96fa49b6 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -16,7 +16,7 @@
                     <form method="POST" action="{{ url('/two-factor-challenge') }}">
                         @csrf
 
-                        <div class="mb-3">
+                        <div class="mb-4">
                             <div class="input-group mb-3">
                                 <div class="input-group-text">
                                     <x-icon.shield/>
@@ -34,7 +34,7 @@
                             @endif
                         </div>
 
-                        <div class="mb-4">
+                        <div class="mb-5">
                             <button type="submit" class="btn btn-primary">
                                 @lang('linkace.login')
                             </button>
@@ -47,7 +47,7 @@
                         </button>
 
                         <div class="collapse mt-3" id="recovery-code">
-                            <div class="mb-3">
+                            <div class="mb-4">
                                 <div class="input-group mb-3">
                                     <div class="input-group-text">
                                         <x-icon.shield/>
diff --git a/resources/views/models/links/edit.blade.php b/resources/views/models/links/edit.blade.php
index 0d9ff99d..76a7b0c9 100644
--- a/resources/views/models/links/edit.blade.php
+++ b/resources/views/models/links/edit.blade.php
@@ -14,8 +14,8 @@
 
                 <input type="hidden" name="link_id" value="{{ $link->id }}">
 
-                <div class="mb-3">
-                    <label class="label" for="url">@lang('link.url')</label>
+                <div class="mb-4">
+                    <label class="form-label" for="url">@lang('link.url')</label>
                     <input name="url" id="url" type="url" data-ignore-id="{{ $link->id }}"
                         class="form-control form-control-lg{{ $errors->has('url') ? ' is-invalid' : '' }}"
                         placeholder="@lang('placeholder.link_url')" value="{{ old('url') ?: $link->url }}"
@@ -34,8 +34,8 @@
                 <div class="row">
                     <div class="col-12 col-sm-6 col-md-7">
 
-                        <div class="mb-3">
-                            <label class="label" for="title">@lang('link.title')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="title">@lang('link.title')</label>
                             <input name="title" id="title"
                                 class="form-control{{ $errors->has('title') ? ' is-invalid' : '' }}"
                                 type="text" placeholder="@lang('placeholder.link_url')"
@@ -47,8 +47,8 @@
                             @endif
                         </div>
 
-                        <div class="mb-3">
-                            <label for="description">@lang('link.description')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="description">@lang('link.description')</label>
                             <textarea name="description" id="description" rows="4" class="form-control"
                             >{{ old('description') ?: $link->description }}</textarea>
 
@@ -62,8 +62,8 @@
                     </div>
                     <div class="col-12 col-sm-6 col-md-5">
 
-                        <div class="mb-3">
-                            <label for="lists">@lang('list.lists')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="lists">@lang('list.lists')</label>
                             <input name="lists" id="lists" type="text" placeholder="@lang('placeholder.list_select')"
                                 class="tags-select" value="{{ old('lists', $link->listsForInput()) }}"
                                 data-allow-creation="true" data-tag-type="lists">
@@ -75,8 +75,8 @@
                             @endif
                         </div>
 
-                        <div class="mb-3">
-                            <label for="tags">@lang('tag.tags')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="tags">@lang('tag.tags')</label>
                             <input name="tags" id="tags" type="text" placeholder="@lang('placeholder.tags_select')"
                                 class="tags-select" value="{{ old('tags', $link->tagsForInput()) }}"
                                 data-allow-creation="true" data-tag-type="tags">
@@ -88,8 +88,8 @@
                             @endif
                         </div>
 
-                        <div class="mb-3">
-                            <label for="is_private">@lang('linkace.is_private')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
                             <select id="is_private" name="is_private"
                                 class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
                                 <option value="0" @if($link->is_private === false) selected @endif>
diff --git a/resources/views/models/links/partials/create-form.blade.php b/resources/views/models/links/partials/create-form.blade.php
index 1c035dd6..ca27563e 100644
--- a/resources/views/models/links/partials/create-form.blade.php
+++ b/resources/views/models/links/partials/create-form.blade.php
@@ -7,8 +7,8 @@
         <form action="{{ route('links.store') }}" method="POST">
             @csrf
 
-            <div class="mb-3">
-                <label class="label" for="url">@lang('link.url')</label>
+            <div class="mb-4">
+                <label class="form-label" for="url">@lang('link.url')</label>
                 <input name="url" id="url" type="url"
                     class="form-control form-control-lg{{ $errors->has('url') || $existing_link ? ' is-invalid' : '' }}"
                     placeholder="@lang('placeholder.link_url')" value="{{ old('url') ?: $bookmark_url ?? '' }}"
@@ -29,8 +29,8 @@
             <div class="row">
                 <div class="col-12 col-sm-6 col-md-7">
 
-                    <div class="mb-3">
-                        <label class="label" for="title">@lang('link.title')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="title">@lang('link.title')</label>
                         <input name="title" id="title"
                             class="form-control{{ $errors->has('title') ? ' is-invalid' : '' }}"
                             type="text" placeholder="@lang('placeholder.link_title')"
@@ -42,8 +42,8 @@
                         @endif
                     </div>
 
-                    <div class="mb-3">
-                        <label for="description">@lang('link.description')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="description">@lang('link.description')</label>
                         <textarea name="description" id="description" rows="4" class="form-control"
                         >{{ old('description') ?: $bookmark_description ?? '' }}</textarea>
 
@@ -57,8 +57,8 @@
                 </div>
                 <div class="col-12 col-sm-6 col-md-5">
 
-                    <div class="mb-3">
-                        <label for="lists">@lang('list.lists')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="lists">@lang('list.lists')</label>
                         <input name="lists" id="lists" type="text" placeholder="@lang('placeholder.list_select')"
                             class="tags-select" value="{{ old('lists', $bookmark_lists ?? null) }}" data-tag-type="lists">
 
@@ -69,8 +69,8 @@
                         @endif
                     </div>
 
-                    <div class="mb-3">
-                        <label for="tags">@lang('tag.tags')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="tags">@lang('tag.tags')</label>
                         <input name="tags" id="tags" type="text" placeholder="@lang('placeholder.tags_select')"
                             class="tags-select" value="{{ old('tags', $bookmark_tags ?? null) }}" data-tag-type="tags">
 
@@ -86,8 +86,8 @@
                         </div>
                     </div>
 
-                    <div class="mb-3">
-                        <label for="is_private">@lang('linkace.is_private')</label>
+                    <div class="mb-4">
+                        <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
                         <select id="is_private" name="is_private"
                             class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
                             <option value="0">
diff --git a/resources/views/models/lists/create.blade.php b/resources/views/models/lists/create.blade.php
index bac53d5c..efb2a4cf 100644
--- a/resources/views/models/lists/create.blade.php
+++ b/resources/views/models/lists/create.blade.php
@@ -11,8 +11,8 @@
             <form action="{{ route('lists.store') }}" method="POST">
                 @csrf
 
-                <div class="mb-3">
-                    <label for="name">@lang('list.name')</label>
+                <div class="mb-4">
+                    <label class="form-label" for="name">@lang('list.name')</label>
 
                     <input name="name" id="name"
                         class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
@@ -28,8 +28,8 @@
 
                 <div class="row">
                     <div class="col-12 col-sm-6 col-md-7">
-                        <div class="mb-3">
-                            <label for="description">@lang('list.description')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="description">@lang('list.description')</label>
 
                             <textarea name="description" id="description" rows="4"
                                 class="form-control{{ $errors->has('description') ? ' is-invalid' : '' }}"
@@ -43,8 +43,8 @@
                         </div>
                     </div>
                     <div class="col-12 col-sm-6 col-md-5">
-                        <div class="mb-3">
-                            <label for="is_private">@lang('linkace.is_private')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
 
                             <select id="is_private" name="is_private"
                                 class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
diff --git a/resources/views/models/lists/edit.blade.php b/resources/views/models/lists/edit.blade.php
index 6d3502fa..b6a87b4d 100644
--- a/resources/views/models/lists/edit.blade.php
+++ b/resources/views/models/lists/edit.blade.php
@@ -14,8 +14,8 @@
 
                 <input type="hidden" name="list_id" value="{{ $list->id }}">
 
-                <div class="mb-3">
-                    <label for="name">@lang('list.name')</label>
+                <div class="mb-4">
+                    <label class="form-label" for="name">@lang('list.name')</label>
 
                     <input name="name" id="name"
                         class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
@@ -31,8 +31,8 @@
 
                 <div class="row">
                     <div class="col-12 col-sm-6 col-md-7">
-                        <div class="mb-3">
-                            <label for="description">@lang('list.description')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="description">@lang('list.description')</label>
 
                             <textarea name="description" id="description" rows="4"
                                 class="form-control{{ $errors->has('description') ? ' is-invalid' : '' }}"
@@ -46,8 +46,8 @@
                         </div>
                     </div>
                     <div class="col-12 col-sm-6 col-md-5">
-                        <div class="mb-3">
-                            <label for="is_private">@lang('linkace.is_private')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
 
                             <select id="is_private" name="is_private"
                                 class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
diff --git a/resources/views/models/notes/edit.blade.php b/resources/views/models/notes/edit.blade.php
index 2b1dc98c..c0349241 100644
--- a/resources/views/models/notes/edit.blade.php
+++ b/resources/views/models/notes/edit.blade.php
@@ -12,8 +12,8 @@
                 @method('PATCH')
                 @csrf
 
-                <div class="mb-3">
-                    <label class="label" for="note">@lang('note.note_content')</label>
+                <div class="mb-4">
+                    <label class="form-label" class="form-label" for="note">@lang('note.note_content')</label>
                     <textarea name="note" id="note"
                         class="form-control{{ $errors->has('note') ? ' is-invalid' : '' }}"
                         title="@lang('note.note_content')" required>{{ old('note') ?: $note->note ?: '' }}</textarea>
diff --git a/resources/views/models/tags/create.blade.php b/resources/views/models/tags/create.blade.php
index 1ce5e24f..ed56f92f 100644
--- a/resources/views/models/tags/create.blade.php
+++ b/resources/views/models/tags/create.blade.php
@@ -13,8 +13,8 @@
 
                 <div class="row">
                     <div class="col-12 col-sm-6 col-md-7">
-                        <div class="mb-3">
-                            <label for="name">@lang('tag.name')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="name">@lang('tag.name')</label>
 
                             <input name="name" id="name"
                                 class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
@@ -29,8 +29,8 @@
                         </div>
                     </div>
                     <div class="col-12 col-sm-6 col-md-5">
-                        <div class="mb-3">
-                            <label for="is_private">@lang('linkace.is_private')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
 
                             <select id="is_private" name="is_private"
                                 class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">
diff --git a/resources/views/models/tags/edit.blade.php b/resources/views/models/tags/edit.blade.php
index c22af732..a6b51a55 100644
--- a/resources/views/models/tags/edit.blade.php
+++ b/resources/views/models/tags/edit.blade.php
@@ -16,8 +16,8 @@
 
                 <div class="row">
                     <div class="col-12 col-sm-6 col-md-7">
-                        <div class="mb-3">
-                            <label for="name">@lang('tag.name')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="name">@lang('tag.name')</label>
 
                             <input name="name" id="name"
                                 class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
@@ -32,8 +32,8 @@
                         </div>
                     </div>
                     <div class="col-12 col-sm-6 col-md-5">
-                        <div class="mb-3">
-                            <label for="is_private">@lang('linkace.is_private')</label>
+                        <div class="mb-4">
+                            <label class="form-label" for="is_private">@lang('linkace.is_private')</label>
 
                             <select id="is_private" name="is_private"
                                 class="form-select{{ $errors->has('is_private') ? ' is-invalid' : '' }}">