diff --git a/src/customer/accept.blade.php b/src/customer/accept.blade.php
index 6045aed..0282e6a 100644
--- a/src/customer/accept.blade.php
+++ b/src/customer/accept.blade.php
@@ -8,14 +8,15 @@
                     @csrf
                     @if ($acceptable->isNotEmpty())
                         @foreach ($acceptable as $accept)
-                            <div class="form-group row">
-                                <div class="col-md-1">
-                                    <input id="accept_{{ $accept->id }}" type="checkbox" class="form-control"
+                        <div class="form-group bg-white shadow-sm rounded py-2 px-3">
+                            <div class="form-group d-flex align-items-center form-group--gapped mb-0">
+                                <div>
+                                    <input id="accept_{{ $accept->id }}" type="checkbox" class="form-control d-flex align-items-center"
                                         name="accept_{{ $accept->id }}" value="true">
                                 </div>
 
                                 <label for="accept_{{ $accept->id }}"
-                                    class="col-md-11 col-form-label">{!! __('interface.misc.accept_notice', [
+                                    class="col-form-label p-0">{!! __('interface.misc.accept_notice', [
                                         'link' =>
                                             '<a href="' .
                                             (Route::has($accept->route) ? route($accept->route) : $accept->route) .
@@ -25,6 +26,7 @@ class="col-md-11 col-form-label">{!! __('interface.misc.accept_notice', [
                                         'date' => $accept->latest->created_at->format('d.m.Y, H:i'),
                                     ]) !!}</label>
                             </div>
+                        </div>
                         @endforeach
                         <button type="submit" class="btn btn-primary"><i class="bi bi-check-circle"></i>
                             {{ __('interface.actions.accept_and_continue') }}</button>
diff --git a/src/customer/shop/category.blade.php b/src/customer/shop/category.blade.php
index da97186..9c5445b 100644
--- a/src/customer/shop/category.blade.php
+++ b/src/customer/shop/category.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="container-fluid my-4">
         @if (! empty($category))
-            <div class="row">
+            <div class="row mb-4">
                 <div class="col-md-12">
                     <div class="row">
                         <div class="col-md-12">
@@ -20,7 +20,7 @@
                 </div>
             </div>
         @else
-            <div class="row">
+            <div class="row mb-4">
                 <div class="col-md-12">
                     <div class="row">
                         <div class="col-md-12">
@@ -57,6 +57,13 @@
                         <i class="bi bi-exclamation-triangle"></i>
                         @if ($user->role == 'customer')
                             {{ __('interface.misc.missing_data_notice') }}
+                            @if (Request::route()?->getName() !== 'customer.profile')
+                                <br>
+                                <br>
+                                <a href="{{ route('customer.profile') }}"
+                                    class="btn btn-primary"><i class="bi bi-pencil-square"></i>
+                                    {{ __('interface.actions.complete_now') }}</a>
+                            @endif
                         @else
                             {{ __('interface.misc.order_role_missing_hint') }}
                         @endif
diff --git a/src/customer/shop/form.blade.php b/src/customer/shop/form.blade.php
index e6eb536..f717292 100644
--- a/src/customer/shop/form.blade.php
+++ b/src/customer/shop/form.blade.php
@@ -262,9 +262,9 @@
                                             <div class="row">
                                                 <div class="col-md-12">
                                                     <div class="form-group bg-white border rounded py-2 px-3">
-                                                        <div class="row">
-                                                            <div class="col-md-2">
-                                                                <input id="accept_{{ $accept->id }}" type="checkbox" class="form-control" name="accept_{{ $accept->id }}" value="true">
+                                                        <div class="form-group d-flex align-items-center form-group--gapped mb-0">
+                                                            <div>
+                                                                <input id="accept_{{ $accept->id }}" type="checkbox" class="form-control d-flex align-items-center" name="accept_{{ $accept->id }}" value="true">
                                                             </div>
 
                                                             <label for="accept_{{ $accept->id }}" class="col-md-10 col-form-label">{!! __('interface.misc.accept_notice', ['link' => '<a href="' . (Route::has($accept->route) ? route($accept->route) : $accept->route) . '" target="_blank">' . __($accept->title) . '</a>', 'date' => $accept->latest->created_at->format('d.m.Y, H:i')]) !!} *</label>
diff --git a/src/layouts/admin.blade.php b/src/layouts/admin.blade.php
index 6934750..6f37ec4 100644
--- a/src/layouts/admin.blade.php
+++ b/src/layouts/admin.blade.php
@@ -99,7 +99,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
                         </a>
                     </li>
                 </ul>
-                @if (!empty(request()->get('service_products')))
+                @if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
                     <h6
                         class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 mt-3 text-primary">
                         <span>{{ __('interface.misc.products') }}</span>
diff --git a/src/layouts/customer.blade.php b/src/layouts/customer.blade.php
index 808e3ef..6812a46 100644
--- a/src/layouts/customer.blade.php
+++ b/src/layouts/customer.blade.php
@@ -144,7 +144,7 @@ class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.or
                         </a>
                     </li>
                 </ul>
-                @if (!empty(request()->get('service_products')))
+                @if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
                     <h6
                         class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 mt-3 text-primary">
                         <span>{{ __('interface.misc.products') }}</span>
diff --git a/src/layouts/public.blade.php b/src/layouts/public.blade.php
index c9e136d..0adb6ef 100644
--- a/src/layouts/public.blade.php
+++ b/src/layouts/public.blade.php
@@ -153,7 +153,7 @@ class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.or
                             </a>
                         </li>
                     </ul>
-                    @if (!empty(request()->get('service_products')))
+                    @if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
                         <h6
                             class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 {{ !empty(Auth::user()) ? 'mt-3' : '' }} text-primary">
                             <span>{{ __('interface.misc.products') }}</span>