diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index 2676d7b549..7d982f1ad8 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -89,7 +89,7 @@ class ActionlogsTransformer
 
             'item' => ($actionlog->item) ? [
                 'id' => (int) $actionlog->item->id,
-                'name' => e($actionlog->item->getDisplayNameAttribute()),
+                'name' => ($actionlog->itemType()=='user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()),
                 'type' => e($actionlog->itemType()),
             ] : null,
             'location' => ($actionlog->location) ? [
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 5d8926ae52..5495ba95b5 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -14,7 +14,7 @@
 <div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
     <label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label>
     <div class="col-md-7 required">
-        {{ Form::select('category_type', $category_types , Input::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', $item->itemCount() > 0 ? 'disabled' : '')) }}
+        {{ Form::select('category_type', $category_types , Input::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', $item->itemCount() > 0 ? 'disabled' : '')) }}
         {!! $errors->first('category_type', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -23,7 +23,7 @@
 <div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
     <label for="eula_text" class="col-md-3 control-label">{{ trans('admin/categories/general.eula_text') }}</label>
     <div class="col-md-7">
-        {{ Form::textarea('eula_text', Input::old('eula_text', $item->eula_text), array('class' => 'form-control')) }}
+        {{ Form::textarea('eula_text', Input::old('eula_text', $item->eula_text), array('class' => 'form-control', 'aria-label'=>'eula_text')) }}
         <p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
         <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
 
@@ -37,13 +37,16 @@
     </div>
     <div class="col-md-9">
         @if ($snipeSettings->default_eula_text!='')
-            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal']) }}
+            <label for="use_default_eula">
+            {{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal', 'aria-label'=>'use_default_eula']) }}
             {!! trans('admin/categories/general.use_default_eula') !!}
+            </label>
         @else
             <div class="icheckbox disabled">
-            {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled']) }}
-
-            {!! trans('admin/categories/general.use_default_eula_disabled') !!}
+                <label for="use_default_eula">
+                {{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
+                {!! trans('admin/categories/general.use_default_eula_disabled') !!}
+                </label>
             </div>
         @endif
     </div>
@@ -55,8 +58,10 @@
     <div class="col-md-3">
     </div>
     <div class="col-md-9">
-        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal']) }}
+        <label for="require_acceptance">
+        {{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal', 'aria-label'=>'require_acceptance']) }}
         {{ trans('admin/categories/general.require_acceptance') }}
+        </label>
     </div>
 </div>
 
@@ -66,8 +71,10 @@
     <div class="col-md-3">
     </div>
     <div class="col-md-9">
-        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal']) }}
+        <label for="checkin_email">
+        {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal','aria-label'=>'checkin_email']) }}
         {{ trans('admin/categories/general.checkin_email') }}
+        </label>
     </div>
 </div>
 
diff --git a/resources/views/companies/index.blade.php b/resources/views/companies/index.blade.php
index dbe6caa5ab..7407f2a084 100644
--- a/resources/views/companies/index.blade.php
+++ b/resources/views/companies/index.blade.php
@@ -44,7 +44,7 @@
     </div>
     <!-- side address column -->
     <div class="col-md-3">
-      <h4>About Companies</h4>
+      <h2>About Companies</h2>
       <p>
         You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.
       </p>
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index 7edfb3b6d1..6c01fb8fb1 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -22,7 +22,7 @@
         {{ trans('admin/locations/table.currency') }}
     </label>
     <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($item, 'currency')) ? ' required' : '' }}">
-        {{ Form::text('currency', Input::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
+        {{ Form::text('currency', Input::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }}
         {!! $errors->first('currency', '<span class="alert-msg">:message</span>') !!}
     </div>
 </div>
@@ -43,13 +43,16 @@
 @endif
 
 <!-- Image -->
-@if ($item->image)
+@if (($item->image) && ($item->image!=''))
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" />
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', Input::old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+            </label>
+            <br>
+            <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}">
+            {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
         </div>
     </div>
 @endif
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 10c5c35835..0ab866cd1e 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -50,19 +50,23 @@
         </div>
     </div>
 
-    <!-- Image -->
-    @if ($item->image)
-        <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-            <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-            <div class="col-md-5">
-                {{ Form::checkbox('image_delete') }}
-                <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" />
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </div>
+<!-- Image -->
+    @if (($item->image) && ($item->image!=''))
+    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
+        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
+        <div class="col-md-5">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', Input::old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+            </label>
+            <br>
+            <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}">
+            {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
         </div>
+    </div>
     @endif
 
-@include ('partials.forms.edit.image-upload')
+
+    @include ('partials.forms.edit.image-upload')
 
 
 @stop
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index ae271c5835..cc63bc2a90 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -37,7 +37,7 @@
     <div class="form-group {{ $errors->has('custom_fieldset') ? ' has-error' : '' }}">
         <label for="custom_fieldset" class="col-md-3 control-label">{{ trans('admin/models/general.fieldset') }}</label>
         <div class="col-md-7">
-            {{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
+            {{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset')) }}
             {!! $errors->first('custom_fieldset', '<span class="alert-msg"><br><i class="fa fa-times"></i> :message</span>') !!}
             <label class="m-l-xs">
                 {{ Form::checkbox('add_default_values', 1, Input::old('add_default_values'), ['class' => 'js-default-values-toggler']) }}
@@ -57,15 +57,20 @@
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])
 
 <!-- Image -->
-@if ($item->image)
+@if (($item->image) && ($item->image!=''))
 <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
     <div class="col-md-5">
-        {{ Form::checkbox('image_delete') }}
-        <img src="{{ url('/') }}/uploads/models/{{ $item->image }}" />
+        <label for="image_delete">
+            {{ Form::checkbox('image_delete', '1', Input::old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+        </label>
+        <br>
+        <img src="{{ url('/') }}/uploads/models/{{ $item->image }}" alt="Image for {{ $item->name }}">
         {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
     </div>
 </div>
+
+
 @endif
 
 @include ('partials.forms.edit.image-upload')
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 9f0c52fcd6..97bdcba3f7 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -159,7 +159,7 @@
                 // Add some overrides for any funny urls we have
                 var dest = destination;
                 if (destination=='fieldsets') {
-                    var dest = 'fields/fieldsets';
+                    var dpolymorphicItemFormatterest = 'fields/fieldsets';
                 }
 
                 return '<nobr><a href="{{ url('/') }}/' + dest + '/' + value.id + '"> ' + value.name + '</a></span>';
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index ee9ee87303..46ffd70ee8 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,15 +1,15 @@
 <div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
     {{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7">
-        {{Form::text('address', Input::old('address', $item->address), array('class' => 'form-control')) }}
+        {{Form::text('address', Input::old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address')) }}
         {!! $errors->first('address', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
 
 <div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
-    {{ Form::label('address2', ' ', array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-        {{Form::text('address2', Input::old('address2', $item->address2), array('class' => 'form-control')) }}
+    <label class="sr-only " for="address2">{{  trans('general.address')  }}</label>
+    <div class="col-md-7 col-md-offset-3">
+        {{Form::text('address2', Input::old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2')) }}
         {!! $errors->first('address2', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -17,7 +17,7 @@
 <div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
     {{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7">
-    {{Form::text('city', Input::old('city', $item->city), array('class' => 'form-control')) }}
+    {{Form::text('city', Input::old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city')) }}
         {!! $errors->first('city', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -25,7 +25,7 @@
 <div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
     {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7">
-    {{Form::text('state', Input::old('state', $item->state), array('class' => 'form-control')) }}
+    {{Form::text('state', Input::old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state')) }}
         {!! $errors->first('state', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 3106e8377b..21c6dfc507 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -3,7 +3,7 @@
     <div class="col-md-9">
         <label class="btn btn-default">
             {{ trans('button.select_file')  }}
-            <input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none">
+            <input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none" aria-label="image">
         </label>
         <span class='label label-default' id="upload-file-info"></span>
 
@@ -11,7 +11,7 @@
         {!! $errors->first('image', '<span class="alert-msg">:message</span>') !!}
     </div>
     <div class="col-md-4 col-md-offset-3">
-        <img id="imagePreview" style="max-width: 200px;" alt="Uploaded image thumbnail">
+        <img id="imagePreview" style="max-width: 200px; display: none;" alt="Uploaded image thumbnail">
     </div>
 </div>
 
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 42334130c2..49b0761bf4 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -26,7 +26,7 @@
 <div class="form-group{{ $errors->has('statuslabel_types') ? ' has-error' : '' }}">
     <label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }} </label>
     <div class="col-md-7 required">
-        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px')) }}
+        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px', 'aria-label'=>'statuslabel_types')) }}
         {!! $errors->first('statuslabel_types', '<span class="alert-msg"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>