diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 1223996b84..c680949f5e 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -2,126 +2,115 @@
 
 {{-- Page title --}}
 @section('title')
-{{ trans('admin/hardware/general.checkin') }}
-@parent
+  {{ trans('admin/hardware/general.checkin') }}
+  @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
-<style>
+  <style>
 
-  .input-group {
-    padding-left: 0px !important;
-  }
-</style>
+    .input-group {
+      padding-left: 0px !important;
+    }
+  </style>
 
 
-<div class="row">
-  <!-- left column -->
-  <div class="col-md-9">
-    <div class="box box-default">
-      <div class="box-header with-border">
-        <h2 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
-      </div><!-- /.box-header -->
+  <div class="row">
+    <!-- left column -->
+    <div class="col-md-9">
+      <div class="box box-default">
+        <div class="box-header with-border">
+          <h2 class="box-title">{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
+        </div><!-- /.box-header -->
 
-      <div class="box-body">
-        <div class="col-md-12">
-          @if ($backto=='user')
-          <form class="form-horizontal" method="post"
-          action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
-          autocomplete="off">
-          @else
-          <form class="form-horizontal" method="post"
-          action="{{ route('checkin/hardware', $asset->id) }}" autocomplete="off">
-          @endif
-            {{csrf_field()}}
+        <div class="box-body">
+          <div class="col-md-12">
+            @if ($backto=='user')
+              <form class="form-horizontal" method="post"
+                    action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
+                    autocomplete="off">
+                @else
+                  <form class="form-horizontal" method="post"
+                        action="{{ route('checkin/hardware', $asset->id) }}" autocomplete="off">
+                  @endif
+                  {{csrf_field()}}
 
-          <!-- AssetModel name -->
-            <div class="form-group">
-              {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                <p class="form-control-static">
-                  @if (($asset->model) && ($asset->model->name))
-                    {{ $asset->model->name }}
+                  <!-- AssetModel name -->
+                    <div class="form-group">
+                      {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
+                      <div class="col-md-8">
+                        <p class="form-control-static">
+                          @if (($asset->model) && ($asset->model->name))
+                            {{ $asset->model->name }}
 
-                  @else
-                    <span class="text-danger text-bold">
+                          @else
+                            <span class="text-danger text-bold">
                       <i class="fa fa-exclamation-triangle"></i>This asset's model is invalid!
                       The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
-                  @endif
-                    </p>
-              </div>
-            </div>
+                          @endif
+                        </p>
+                      </div>
+                    </div>
 
 
-            <!-- Asset Name -->
-            <!-- Only allow an asset name to be changed if the checker-outer has permission to edit the asset -->
-            @can('update', $asset)
-            <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-              {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                <input class="form-control" type="text" name="name" aria-label="name" id="name"
-                {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-                </div>
-              </div>
-            @else
-              @if ($asset->name!='')
-                <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-                  {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
-                  <div class="col-md-8">
-                    <p class="form-control-static">{{ $asset->name }}</p>
-                  </div>
-                </div>
-            @endif
-          @endcan
+                    <!-- Asset Name -->
+                    <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
+                      {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
+                      <div class="col-md-8">
+                        <input class="form-control" type="text" name="name" aria-label="name" id="name"
+                               value="{{ old('name', $asset->name) }}"/>
+                        {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                    </div>
 
-            <!-- Status -->
-            <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
-              {{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-7 required">
-                {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
-                {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-            </div>
+                    <!-- Status -->
+                    <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
+                      {{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
+                      <div class="col-md-7 required">
+                        {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
+                        {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                    </div>
 
-            @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null])
+                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null])
 
-            <!-- Checkout/Checkin Date -->
-            <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
-              {{ Form::label('checkin_at', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-              <div class="input-group col-md-5 required">
-                <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                  <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ old('checkin_at', date('Y-m-d')) }}">
-                  <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
-                </div>
-                {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-              </div>
-            </div>
+                  <!-- Checkout/Checkin Date -->
+                    <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
+                      {{ Form::label('checkin_at', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }}
+                      <div class="col-md-8">
+                        <div class="input-group col-md-5 required">
+                          <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+                            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ old('checkin_at', date('Y-m-d')) }}">
+                            <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
+                          </div>
+                          {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        </div>
+                      </div>
+                    </div>
 
 
-              <!-- Note -->
-              <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                    <!-- Note -->
+                    <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
 
-                {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                      {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
 
-                <div class="col-md-8">
+                      <div class="col-md-8">
                   <textarea class="col-md-6 form-control" id="note"
-                  name="note">{{ old('note', $asset->note) }}</textarea>
-                  {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-                </div>
-              </div>
-            <div class="box-footer">
-              <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-              <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
-            </div>
-          </form>
-        </div> <!--/.col-md-12-->
-      </div> <!--/.box-body-->
+                            name="note">{{ old('note', $asset->note) }}</textarea>
+                        {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                    </div>
+                    <div class="box-footer">
+                      <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
+                      <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
+                    </div>
+                  </form>
+          </div> <!--/.col-md-12-->
+        </div> <!--/.box-body-->
 
-    </div> <!--/.box.box-default-->
+      </div> <!--/.box.box-default-->
+    </div>
   </div>
-</div>
 
-@stop
+@stop
\ No newline at end of file
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index c65c7a1099..c90570639b 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -2,183 +2,160 @@
 
 {{-- Page title --}}
 @section('title')
-     {{ trans('admin/hardware/general.checkout') }}
-@parent
+    {{ trans('admin/hardware/general.checkout') }}
+    @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
 
-<style>
+    <style>
 
-.input-group {
-    padding-left: 0px !important;
-}
-</style>
+        .input-group {
+            padding-left: 0px !important;
+        }
+    </style>
 
-<div class="row">
-  <!-- left column -->
-  <div class="col-md-7">
-    <div class="box box-default">
-      <form class="form-horizontal" method="post" action="" autocomplete="off">
-        <div class="box-header with-border">
-            <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
-        </div>
-        <div class="box-body">
-            {{csrf_field()}}
-            <!-- AssetModel name -->
-            <div class="form-group">
-                {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
-                <div class="col-md-8">
-                    <p class="form-control-static">
-                        @if (($asset->model) && ($asset->model->name))
-                            {{ $asset->model->name }}
+    <div class="row">
+        <!-- left column -->
+        <div class="col-md-7">
+            <div class="box box-default">
+                <form class="form-horizontal" method="post" action="" autocomplete="off">
+                    <div class="box-header with-border">
+                        <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
+                    </div>
+                    <div class="box-body">
+                    {{csrf_field()}}
+                    <!-- AssetModel name -->
+                        <div class="form-group">
+                            {{ Form::label('model', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <p class="form-control-static">
+                                    @if (($asset->model) && ($asset->model->name))
+                                        {{ $asset->model->name }}
 
-                        @else
-                            <span class="text-danger text-bold">
+                                    @else
+                                        <span class="text-danger text-bold">
                   <i class="fa fa-exclamation-triangle"></i>This asset's model is invalid!
                   The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
-                        @endif
-                    </p>
-                </div>
-            </div>
-
-            <!-- Asset Name -->
-            <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-              {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $asset->name) }}" tabindex="1">
-                {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-            </div>
-            @endif
-
-            <!-- Asset Name -->
-            <!-- Only allow an asset name to be changed if the checker-outer has permission to edit the asset -->
-            @can('update', $asset)
-                <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-                  {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
-                  <div class="col-md-8">
-                    <input class="form-control" type="text" name="name" id="name" value="{{ Request::old('name', $asset->name) }}" tabindex="1">
-                    {!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
-                  </div>
-                </div>
-            @else
-                @if ($asset->name!='')
-                    <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-                        {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
-                        <div class="col-md-8">
-                            <p class="form-control-static">{{ $asset->name }}</p>
-                        </div>
-                    </div>
-                @endif
-            @endcan
-
-                @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
-
-                @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
-
-                <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
-                @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
-
-                @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
-
-
-
-            <!-- Checkout/Checkin Date -->
-            <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
-              {{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                  <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
-                      <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
-                      <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
-                  </div>
-                {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-            </div>
-
-            <!-- Expected Checkin Date -->
-            <div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
-              {{ Form::label('expected_checkin', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                  <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
-                      <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
-                      <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
-                  </div>
-                {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-            </div>
-
-            <!-- Note -->
-            <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-              {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
-              <div class="col-md-8">
-                <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
-                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-              </div>
-            </div>
-
-                @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->slack_endpoint!=''))
-                    <div class="form-group notification-callout">
-                        <div class="col-md-8 col-md-offset-3">
-                            <div class="callout callout-info">
-
-                                    @if ($asset->requireAcceptance())
-                                        <i class="fa fa-envelope" aria-hidden="true"></i>
-                                    {{ trans('admin/categories/general.required_acceptance') }}
-                                        <br>
-                                    @endif
-
-                                    @if ($asset->getEula())
-                                        <i class="fa fa-envelope" aria-hidden="true"></i>
-                                       {{ trans('admin/categories/general.required_eula') }}
-                                        <br>
-                                    @endif
-
-                                    @if ($snipeSettings->slack_endpoint!='')
-                                        <i class="fa fa-slack" aria-hidden="true"></i>
-                                       A slack message will be sent
                                     @endif
+                                </p>
                             </div>
                         </div>
+
+                        <!-- Asset Name -->
+                        <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
+                            {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $asset->name) }}" tabindex="1">
+                                {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+                    @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
+
+                    @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
+
+                    <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
+                    @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
+
+                    @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
+
+
+
+                    <!-- Checkout/Checkin Date -->
+                        <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
+                            {{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
+                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
+                                    <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
+                                </div>
+                                {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+
+                        <!-- Expected Checkin Date -->
+                        <div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
+                            {{ Form::label('expected_checkin', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
+                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
+                                    <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
+                                </div>
+                                {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+
+                        <!-- Note -->
+                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+
+                        @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->slack_endpoint!=''))
+                            <div class="form-group notification-callout">
+                                <div class="col-md-8 col-md-offset-3">
+                                    <div class="callout callout-info">
+
+                                        @if ($asset->requireAcceptance())
+                                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                                            {{ trans('admin/categories/general.required_acceptance') }}
+                                            <br>
+                                        @endif
+
+                                        @if ($asset->getEula())
+                                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                                            {{ trans('admin/categories/general.required_eula') }}
+                                            <br>
+                                        @endif
+
+                                        @if ($snipeSettings->slack_endpoint!='')
+                                            <i class="fa fa-slack" aria-hidden="true"></i>
+                                            A slack message will be sent
+                                        @endif
+                                    </div>
+                                </div>
+                            </div>
+                        @endif
+
+                    </div> <!--/.box-body-->
+                    <div class="box-footer">
+                        <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
+                        <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
                     </div>
-                 @endif
+                </form>
+            </div>
+        </div> <!--/.col-md-7-->
 
-        </div> <!--/.box-body-->
-        <div class="box-footer">
-          <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-          <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
+        <!-- right column -->
+        <div class="col-md-5" id="current_assets_box" style="display:none;">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
+                </div>
+                <div class="box-body">
+                    <div id="current_assets_content">
+                    </div>
+                </div>
+            </div>
         </div>
-      </form>
     </div>
-  </div> <!--/.col-md-7-->
-
-  <!-- right column -->
-  <div class="col-md-5" id="current_assets_box" style="display:none;">
-    <div class="box box-primary">
-      <div class="box-header with-border">
-        <h2 class="box-title">{{ trans('admin/users/general.current_assets') }}</h2>
-      </div>
-      <div class="box-body">
-        <div id="current_assets_content">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
 @stop
 
 @section('moar_scripts')
     @include('partials/assets-assigned')
 
     <script>
-//        $('#checkout_at').datepicker({
-//            clearBtn: true,
-//            todayHighlight: true,
-//            endDate: '0d',
-//            format: 'yyyy-mm-dd'
-//        });
+        //        $('#checkout_at').datepicker({
+        //            clearBtn: true,
+        //            todayHighlight: true,
+        //            endDate: '0d',
+        //            format: 'yyyy-mm-dd'
+        //        });
 
 
     </script>
-@stop
+@stop
\ No newline at end of file