diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php
index 5749be8f59..abc5e1f8b1 100755
--- a/resources/views/accessories/checkin.blade.php
+++ b/resources/views/accessories/checkin.blade.php
@@ -2,59 +2,76 @@
 
 {{-- Page title --}}
 @section('title')
-     {{ trans('admin/hardware/general.checkin') }}
+     {{ trans('admin/accessories/general.checkin') }}
 @parent
 @stop
 
+@section('header_right')
+    <a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+        {{ trans('general.back') }}</a>
+@stop
+
+
 {{-- Page content --}}
 @section('content')
 
-<div class="row header">
-    <div class="col-md-12">
-        <a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="fa fa-arrow-left icon-white"></i>  {{ trans('general.back') }}</a>
-        <h3> {{ trans('general.checkin') }}</h3>
-    </div>
-</div>
 
-<div class="row form-wrapper">
-<!-- left column -->
-<div class="col-md-10 column">
 
-<form class="form-horizontal" method="post" action="" autocomplete="off">
-    <!-- CSRF Token -->
-    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+    <div class="row">
+        <div class="col-md-9">
+            <form class="form-horizontal" method="post" action="" autocomplete="off">
+                <!-- CSRF Token -->
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-			@if ($accessory->name)
-            <!-- accessory name -->
-            <div class="form-group">
-                <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
-                <div class="col-md-6">
-                  <p class="form-control-static">{{ $accessory->name }}</p>
-                </div>
-            </div>
-            @endif
+                <div class="box box-default">
+                    @if ($accessory->id)
+                        <div class="box-header with-border">
+                            <h3 class="box-title">{{ $accessory->name }}</h3>
+                        </div><!-- /.box-header -->
+                    @endif
 
-            <!-- Note -->
-            <div class="form-group {{ $errors->has('note') ? '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="note" name="note">
-                        {{ Input::old('note', $accessory->note) }}
-                    </textarea>
-                    {!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
-                </div>
-            </div>
-            <!-- Form actions -->
-                <div class="form-group">
-                    <label class="col-md-2 control-label"></label>
-                    <div class="col-md-7">
-                        <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i>{{ trans('general.checkin') }}</button>
+                    <div class="box-body">
+
+                        <form class="form-horizontal" method="post" action="" autocomplete="off">
+                            <!-- CSRF Token -->
+                            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+
+                                    @if ($accessory->name)
+                                    <!-- accessory name -->
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
+                                        <div class="col-md-6">
+                                          <p class="form-control-static">{{ $accessory->name }}</p>
+                                        </div>
+                                    </div>
+                                    @endif
+
+                                    <!-- Note -->
+                                    <div class="form-group {{ $errors->has('note') ? '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="note" name="note">
+                                                {{ Input::old('note', $accessory->note) }}
+                                            </textarea>
+                                            {!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+                                        </div>
+                                    </div>
+                                    <!-- Form actions -->
+                                        <div class="form-group">
+                                            <label class="col-md-2 control-label"></label>
+                                            <div class="col-md-7">
+                                                <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+                                                <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i>{{ trans('general.checkin') }}</button>
+                                            </div>
+                                        </div>
+
+                        </form>
                     </div>
-                </div>
-
-</form>
-</div> <!-- .col-md-10.column -->
-</div> <!-- .row.form-wrapper -->
-
+                        <div class="box-footer text-right">
+                            <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
+                        </div>
+                </div> <!-- .box.box-default -->
+            </form>
+        </div> <!-- .col-md-9-->
+    </div> <!-- .row -->
 @stop
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index bf02673ede..d89ea825dc 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-     {{ trans('admin/hardware/general.checkout') }}
+     {{ trans('admin/accessories/general.checkout') }}
 @parent
 @stop
 @section('header_right')
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 2e86178189..cbe81166ef 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -87,8 +87,8 @@
                             &nbsp; &nbsp;</span>
                         </span>
                         @endif
-                        {{ $asset->present()->statusText() }}
-                        ({{ $asset->assetstatus->getStatuslabelType() }})
+                        <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">{{ $asset->present()->statusText() }}</a>
+                          <label class="label label-default">{{ $asset->assetstatus->getStatuslabelType() }}</label>
                       </td>
                     </tr>
                     @endif