diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index 4324f3f78e..ffa5815b64 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -86,7 +86,9 @@
 
                     <div class="tab-pane fade in active" id="asset_tab">
                         <!-- checked out assets table -->
-                        <div class="table-responsive">
+                        <div class="table table-responsive">
+                            @include('partials.asset-bulk-actions')
+
                             <table
                                     data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
                                     data-cookie-id-table="assetsListingTable"
@@ -98,6 +100,10 @@
                                     data-show-export="true"
                                     data-show-refresh="true"
                                     data-sort-order="asc"
+                                    data-toolbar="#assetsBulkEditToolbar"
+                                    data-bulk-button-id="#bulkAssetEditButton"
+                                    data-bulk-form-id="#assetsBulkForm"
+                                    data-click-to-select="true"
                                     id="assetsListingTable"
                                     class="table table-striped snipe-table"
                                     data-url="{{route('api.assets.index',['company_id' => $company->id]) }}"
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 9b5e20dc56..4ebdfd7f57 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -472,10 +472,14 @@
                                                         @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
                                                             {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }}
                                                         @else
-                                                            {!! nl2br(e($asset->{$field->db_column_name()})) !!} &nbsp;
+                                                            {!! nl2br(e($asset->{$field->db_column_name()})) !!}
                                                         @endif
 
                                                     @endif
+
+                                                    @if ($asset->{$field->db_column_name()}=='')
+                                                        &nbsp;
+                                                    @endif
                                                 </div>
                                             </div>
                                         @endforeach