diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index f2eeba8f38..bb4e6e6207 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -565,10 +565,12 @@
                 <tbody>
                 @foreach ($user->licenses as $license)
                   <tr>
-                    <td>{{ $license->name }}</td>
+                    <td>
+                      {{ $license->name }}
+                    </td>
                     <td>
                       @can('viewKeys', $license)
-                        {{ $license->serial }}
+                        <code style="white-space: pre-wrap"><span class="js-copy-link" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key">{{ $license->serial }}</span></span></code>
                       @else
                         ------------
                       @endcan
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index d0c026b29a..224bf32813 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1165,7 +1165,7 @@
                                                     <td><a href="{{ route('licenses.show', $seat->license->id) }}">{{ $seat->license->name }}</a></td>
                                                     <td>
                                                         @can('viewKeys', $seat->license)
-                                                            {!! nl2br(e($seat->license->serial)) !!}
+                                                            <code style="white-space: pre-wrap"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $seat->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $seat->id }}">{{ $seat->license->serial }}</span></span></code>
                                                         @else
                                                             ------------
                                                         @endcan
diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php
index 5ef9159549..a300b2a010 100755
--- a/resources/views/licenses/checkin.blade.php
+++ b/resources/views/licenses/checkin.blade.php
@@ -16,7 +16,7 @@
 @section('content')
     <div class="row">
         <!-- left column -->
-        <div class="col-md-7">
+        <div class="col-md-8">
             <form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', ['licenseId'=>$licenseSeat->id, 'backTo'=>$backto] ) }}" autocomplete="off">
                 {{csrf_field()}}
 
@@ -28,31 +28,41 @@
 
             <!-- license name -->
             <div class="form-group">
-                <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
-                <div class="col-md-6">
+                <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
+                <div class="col-md-8">
                     <p class="form-control-static">{{ $licenseSeat->license->name }}</p>
                 </div>
             </div>
 
-            <!-- Serial -->
+            <!-- Category -->
             <div class="form-group">
-                <label class="col-sm-2 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
-                <div class="col-md-6">
-                    <p class="form-control-static">
-                        @can('viewKeys', $licenseSeat->license)
-                            {{ $licenseSeat->license->serial }}
-                        @else
-                            ------------
-                        @endcan
-                        </p>
+                <label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
+                <div class="col-md-9">
+                    <p class="form-control-static">{{ $licenseSeat->license->category->name }}</p>
                 </div>
             </div>
 
+            <!-- Serial -->
+            @can('viewKeys', $licenseSeat->license)
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}
+                    <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                        <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                    </i>
+                </label>
+                <div class="col-md-8">
+                    <p class="form-control-static">
+                       <code style="white-space: pre-wrap"><span class="js-copy-key">{{ $licenseSeat->license->serial }}</span></code>
+                    </p>
+                </div>
+            </div>
+            @endcan
+
             <!-- Note -->
             <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-                <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
-                <div class="col-md-7">
-                    <textarea class="col-md-6 form-control" id="notes" name="notes"></textarea>
+                <label for="note" class="col-md-3 control-label">{{ trans('general.checkin_note') }}</label>
+                <div class="col-md-8">
+                    <textarea class="form-control" id="notes" name="notes" rows="5"></textarea>
                     {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                 </div>
             </div>
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index ef6b87fc0d..af090a7c47 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -15,7 +15,7 @@
 @section('content')
 <div class="row">
         <!-- left column -->
-    <div class="col-md-7">
+    <div class="col-md-8">
         <form class="form-horizontal" method="post" action="" autocomplete="off">
             {{csrf_field()}}
 
@@ -26,7 +26,7 @@
                 <div class="box-body">
 
 
-                    <!-- Asset name -->
+                    <!-- License name -->
                     <div class="form-group">
                         <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
                         <div class="col-md-9">
@@ -42,18 +42,19 @@
                     </div>
 
                     <!-- Serial -->
+                    @can('viewKeys', $license)
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
+                        <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}
+                            <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                            </i>
+                        </label>
                         <div class="col-md-9">
-                            <p class="form-control-static" style="word-wrap: break-word;">
-                                @can('viewKeys', $license)
-                                    {{ $license->serial }}
-                                @else
-                                    ------------
-                                @endcan
+                            <p class="form-control-static"><code style="white-space: pre-wrap"><span class="js-copy-key">{{ $license->serial }}</span></code>
                             </p>
                         </div>
                     </div>
+                    @endcan
 
                     @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true'])
 
@@ -64,9 +65,9 @@
 
                     <!-- Note -->
                     <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-                        <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+                        <label for="note" class="col-md-3 control-label">{{ trans('general.checkout_note') }}</label>
                         <div class="col-md-8">
-                            <textarea class="col-md-6 form-control" id="notes" name="notes" style="width: 100%">{{ old('note') }}</textarea>
+                            <textarea class="col-md-6 form-control" id="notes" name="notes" rows="5">{{ old('note') }}</textarea>
                             {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
                     </div>
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 2de0f9d6e0..ffcc94621b 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -124,13 +124,13 @@
                   <div class="row">
                     <div class="col-md-3">
                       <strong>{{ trans('admin/licenses/form.license_key') }}</strong>
+                      <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                        <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                      </i>
                     </div>
                     <div class="col-md-9">
                       @can('viewKeys', $license)
-                        <span class="js-copy">{!! nl2br(e($license->serial)) !!}</span>
-                          <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
-                            <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
-                          </i>
+                        <code><span class="js-copy">{!! nl2br(e($license->serial)) !!}</span></code>
                       @else
                         ------------
                       @endcan
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index a11de31af0..fbaa96b539 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -831,7 +831,7 @@
                   </td>
                   <td class="col-md-4">
                     @can('viewKeys', $license)
-                    {!! $license->present()->serialUrl() !!}
+                          <code style="white-space: pre-wrap"><span class="js-copy-link" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key">{{ $license->serial }}</span></span></code>
                     @else
                       ------------
                     @endcan