diff --git a/resources/views/exercise/show.blade.php b/resources/views/exercise/show.blade.php
index e4d6c1cd8..6432de9e1 100644
--- a/resources/views/exercise/show.blade.php
+++ b/resources/views/exercise/show.blade.php
@@ -61,30 +61,31 @@ class="sticky-top col-md-12 d-flex {{ $previousExercise->exists ? 'justify-conte
             @include(getExerciseListingViewFilepath($exercise))
             <hr>
             <div>
-              @auth
-                <div class="d-flex justify-content-between mb-4">
-                  @if ($exercise->solutions()->exists())
-                    <a class="btn btn-secondary mr-1"
-                      href="{{ route('solutions.index', ['filter' => ['exercise_id' => $exercise->id]]) }}" role="button">
-                      {{ __('views.exercise.show.buttons.show_solutions') }}
-                    </a>
-                  @endif
+            @auth
+                <div class="d-flex justify-content-start gap-2 mb-4">
+                    @if ($exercise->solutions()->exists())
+                        <a class="btn btn-secondary"
+                            href="{{ route('solutions.index', ['filter' => ['exercise_id' => $exercise->id]]) }}" role="button">
+                            {{ __('views.exercise.show.buttons.show_solutions') }}
+                        </a>
+                    @endif
 
-                  @if (!$isShowSavedSolutionsButton)
-                    <a href="{{ route('solutions.index', ['filter' => ['exercise_id' => $exercise->id, 'user_id' => $authUser->id]]) }}"
-                      class="mr-1 btn btn-primary btn-light">{{ __('solution.show_solution') }}</a>
-                  @endif
-                  @if ($exercise->users->isEmpty())
-                    <p>{{ __('exercise.show.nobody_completed') }}</p>
-                  @else
-                    @include('exercise._modal.completed_by')
-                    <button type="button" class="btn btn-primary" data-bs-toggle="modal"
-                      data-bs-target="#modal-completed-by">
-                      {{ __('exercise.show.who_completed') }}
-                    </button>
-                  @endif
+                    @if (!$isShowSavedSolutionsButton)
+                        <a href="{{ route('solutions.index', ['filter' => ['exercise_id' => $exercise->id, 'user_id' => $authUser->id]]) }}"
+                            class="btn btn-primary">{{ __('solution.show_solution') }}</a>
+                    @endif
+
+                    @if ($exercise->users->isEmpty())
+                        <p class="mb-0">{{ __('exercise.show.nobody_completed') }}</p>
+                    @else
+                        @include('exercise._modal.completed_by')
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal"
+                            data-bs-target="#modal-completed-by">
+                            {{ __('exercise.show.who_completed') }}
+                        </button>
+                    @endif
                 </div>
-              @endauth
+            @endauth
             </div>
           </div>
           <div class="tab-pane fade" id="exercise-discussion" role="tabpanel" aria-labelledby="exercise-discussion-tab">