diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index c406264a7..2cd3ac5be 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -18,55 +18,180 @@
 
 <div class="row">
   <div class="col-md-9">
-    <div class="box box-default">
-      @if ($consumable->id)
-      <div class="box-header with-border">
-        <div class="box-heading">
-          <h2 class="box-title"> {{ $consumable->name }}</h2>
-        </div>
-      </div><!-- /.box-header -->
-      @endif
 
-      <div class="box-body">
-        <div class="row">
-          <div class="col-md-12">
-            <div class="table table-responsive">
+    <!-- Custom Tabs -->
+    <div class="nav-tabs-custom">
 
-              <table
-                      data-cookie-id-table="consumablesCheckedoutTable"
-                      data-pagination="true"
-                      data-id-table="consumablesCheckedoutTable"
-                      data-search="false"
-                      data-side-pagination="server"
-                      data-show-columns="true"
-                      data-show-export="true"
-                      data-show-footer="true"
-                      data-show-refresh="true"
-                      data-sort-order="asc"
-                      data-sort-name="name"
-                      id="consumablesCheckedoutTable"
-                      class="table table-striped snipe-table"
-                      data-url="{{route('api.consumables.showUsers', $consumable->id)}}"
-                      data-export-options='{
+      <ul class="nav nav-tabs hidden-print">
+
+
+        <li class="active">
+          <a href="#details" data-toggle="tab">
+            <span class="hidden-lg hidden-md">
+            <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+            </span>
+            <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
+          </a>
+        </li>
+
+
+        @can('consumables.files', $consumable)
+          <li>
+            <a href="#files" data-toggle="tab">
+            <span class="hidden-lg hidden-md">
+            <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
+              <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
+                {!! ($consumable->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($consumable->uploads->count()).'</badge>' : '' !!}
+            </span>
+            </a>
+          </li>
+        @endcan
+
+        @can('update', \App\Models\Consumble::class)
+          <li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
+              <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a>
+          </li>
+        @endcan
+
+      </ul>
+
+      <div class="tab-content">
+
+        <div class="tab-pane active" id="details">
+
+
+              <div class="table-responsive">
+
+                <table
+                        data-cookie-id-table="consumablesCheckedoutTable"
+                        data-pagination="true"
+                        data-id-table="consumablesCheckedoutTable"
+                        data-search="false"
+                        data-side-pagination="server"
+                        data-show-columns="true"
+                        data-show-export="true"
+                        data-show-footer="true"
+                        data-show-refresh="true"
+                        data-sort-order="asc"
+                        data-sort-name="name"
+                        id="consumablesCheckedoutTable"
+                        class="table table-striped snipe-table"
+                        data-url="{{route('api.consumables.showUsers', $consumable->id)}}"
+                        data-export-options='{
                 "fileName": "export-consumables-{{ str_slug($consumable->name) }}-checkedout-{{ date('Y-m-d') }}",
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
-                <thead>
+                  <thead>
                   <tr>
                     <th data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
                     <th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
                     <th data-searchable="false" data-sortable="false" data-field="note">{{ trans('general.notes') }}</th>
                     <th data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.admin') }}</th>
                   </tr>
-                </thead>
-              </table>
-            </div>
-          </div> <!-- /.col-md-12-->
+                  </thead>
+                </table>
+              </div>
 
         </div>
+
+
+        @can('consumables.files', $consumable)
+          <div class="tab-pane" id="files">
+
+            <div class="table-responsive">
+              <table
+                      data-cookie-id-table="consumableUploadsTable"
+                      data-id-table="consumableUploadsTable"
+                      id="consumableUploadsTable"
+                      data-search="true"
+                      data-pagination="true"
+                      data-side-pagination="client"
+                      data-show-columns="true"
+                      data-show-export="true"
+                      data-show-footer="true"
+                      data-toolbar="#upload-toolbar"
+                      data-show-refresh="true"
+                      data-sort-order="asc"
+                      data-sort-name="name"
+                      class="table table-striped snipe-table"
+                      data-export-options='{
+                    "fileName": "export-consumables-uploads-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
+                    }'>
+                <thead>
+                <tr>
+                  <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
+                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
+                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
+                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
+                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
+                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
+                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
+                </tr>
+                </thead>
+                <tbody>
+                @if ($consumable->uploads->count() > 0)
+                  @foreach ($consumable->uploads as $file)
+                    <tr>
+                      <td>
+                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
+                        <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
+
+                      </td>
+                      <td>
+                        @if ($file->filename)
+                          @if ( Helper::checkUploadIsImage($file->get_src('consumables')))
+                            <a href="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
+                          @endif
+                        @endif
+                      </td>
+                      <td>
+                        {{ $file->filename }}
+                      </td>
+                      <td data-value="{{ Storage::size('private_uploads/consumables/'.$file->filename) }}">
+                        {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/consumables/'.$file->filename)) }}
+                      </td>
+
+                      <td>
+                        @if ($file->note)
+                          {{ $file->note }}
+                        @endif
+                      </td>
+                      <td>
+                        @if ($file->filename)
+                          <a href="{{ route('show.consumablefile', [$consumable->id, $file->id, 'download' => 'true']) }}" class="btn btn-default">
+                            <i class="fas fa-download" aria-hidden="true"></i>
+                            <span class="sr-only">{{ trans('general.download') }}</span>
+                          </a>
+                        @endif
+                      </td>
+                      <td>{{ $file->created_at }}</td>
+                      <td>
+                        <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/consumablefile', [$consumable->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
+                          <i class="fas fa-trash icon-white" aria-hidden="true"></i>
+                          <span class="sr-only">{{ trans('general.delete') }}</span>
+                        </a>
+                      </td>
+                    </tr>
+                  @endforeach
+                @else
+                  <tr>
+                    <td colspan="8">{{ trans('general.no_results') }}</td>
+                  </tr>
+                @endif
+                </tbody>
+              </table>
+            </div>
+          </div> <!-- /.tab-pane -->
+        @endcan
+
       </div>
-    </div> <!-- /.box.box-default-->
-  </div> <!-- /.col-md-9-->
+    </div>
+
+  </div>
+
+
   <div class="col-md-3">
 
 
@@ -163,6 +288,11 @@
 
 @stop
 
+@can('update', \App\Models\Consumable::class)
+  @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id])
+@endcan
+
+
 @section('moar_scripts')
 @include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false])
 @stop