diff --git a/resources/views/customers/edit.blade.php b/resources/views/customers/edit.blade.php
index b9c7cf3..a5b5da6 100644
--- a/resources/views/customers/edit.blade.php
+++ b/resources/views/customers/edit.blade.php
@@ -20,15 +20,15 @@
             <div class="panel-body">
                 <div class="row">
                     <div class="col-md-6">
-                        <legend>@lang('customer.detail')</legend>
+                        <legend>{{ __('customer.detail') }}</legend>
                         {!! FormField::text('name', ['required' => true]) !!}
                         <div class="row">
-                            <div class="col-xs-6">{!! FormField::radios('is_active', ['Non Aktif', 'Aktif']) !!}</div>
+                            <div class="col-xs-6">{!! FormField::radios('is_active', [__('app.in_active'), __('app.active')]) !!}</div>
                         </div>
                         {!! FormField::textarea('notes') !!}
                     </div>
                     <div class="col-md-6">
-                        <legend>@lang('customer.contact')</legend>
+                        <legend>{{ __('customer.contact') }}</legend>
                         {!! FormField::text('pic') !!}
                         <div class="row">
                             <div class="col-xs-7">{!! FormField::email('email') !!}</div>
diff --git a/resources/views/vendors/forms.blade.php b/resources/views/vendors/forms.blade.php
index a7e238c..2a48da0 100644
--- a/resources/views/vendors/forms.blade.php
+++ b/resources/views/vendors/forms.blade.php
@@ -1,17 +1,17 @@
-@if (Request::get('action') == 'create')
+@if (request('action') == 'create')
     {!! Form::open(['route' => 'vendors.store']) !!}
     {!! FormField::text('name', ['required' => true]) !!}
     {!! FormField::text('website') !!}
     {!! FormField::textarea('notes') !!}
-    {!! Form::submit(trans('vendor.create'), ['class' => 'btn btn-success']) !!}
-    {{ link_to_route('vendors.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }}
+    {!! Form::submit(__('vendor.create'), ['class' => 'btn btn-success']) !!}
+    {{ link_to_route('vendors.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
     {!! Form::close() !!}
 @endif
-@if (Request::get('action') == 'edit' && $editableVendor)
-    {!! Form::model($editableVendor, ['route' => ['vendors.update', $editableVendor->id],'method' => 'patch']) !!}
+@if (request('action') == 'edit' && $editableVendor)
+    {!! Form::model($editableVendor, ['route' => ['vendors.update', $editableVendor->id], 'method' => 'patch']) !!}
     {!! FormField::text('name', ['required' => true]) !!}
     {!! FormField::text('website') !!}
-    {!! FormField::radios('is_active', ['Non Aktif', 'Aktif']) !!}
+    {!! FormField::radios('is_active', [__('app.in_active'), __('app.active')]) !!}
     {!! FormField::textarea('notes') !!}
     @if (request('q'))
         {{ Form::hidden('q', request('q')) }}
@@ -19,38 +19,38 @@
     @if (request('page'))
         {{ Form::hidden('page', request('page')) }}
     @endif
-    {!! Form::submit(trans('vendor.update'), ['class' => 'btn btn-success']) !!}
-    {{ link_to_route('vendors.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }}
+    {!! Form::submit(__('vendor.update'), ['class' => 'btn btn-success']) !!}
+    {{ link_to_route('vendors.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
     @can('delete', $editableVendor)
         {!! link_to_route(
             'vendors.index',
-            trans('app.delete'),
-            ['action' => 'delete', 'id' => $editableVendor->id] + Request::only('page', 'q'),
+            __('app.delete'),
+            ['action' => 'delete', 'id' => $editableVendor->id] + request(['page', 'q']),
             ['id' => 'del-vendor-' . $editableVendor->id, 'class' => 'btn btn-danger pull-right']
         ) !!}
     @endcan
     {!! Form::close() !!}
 @endif
-@if (Request::get('action') == 'delete' && $editableVendor)
+@if (request('action') == 'delete' && $editableVendor)
     <div class="panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title">{{ trans('vendor.delete') }}</h3></div>
+        <div class="panel-heading"><h3 class="panel-title">{{ __('vendor.delete') }}</h3></div>
         <div class="panel-body">
-            <label class="control-label">{{ trans('vendor.name') }}</label>
+            <label class="control-label">{{ __('vendor.name') }}</label>
             <p>{{ $editableVendor->name }}</p>
             {!! $errors->first('vendor_id', '<span class="form-error small">:message</span>') !!}
         </div>
         <hr style="margin:0">
         @can('delete', $editableVendor)
-            <div class="panel-body">{{ trans('app.delete_confirm') }}</div>
+            <div class="panel-body">{{ __('app.delete_confirm') }}</div>
         @else
-            <div class="panel-body">{{ trans('vendor.undeleteable') }}</div>
+            <div class="panel-body">{{ __('vendor.undeleteable') }}</div>
         @endcan
         <div class="panel-footer">
             @can('delete', $editableVendor)
             {!! FormField::delete(
-                ['route'=>['vendors.destroy',$editableVendor->id]],
-                trans('app.delete_confirm_button'),
-                ['class'=>'btn btn-danger'],
+                ['route' => ['vendors.destroy', $editableVendor->id]],
+                __('app.delete_confirm_button'),
+                ['class' => 'btn btn-danger'],
                 [
                     'vendor_id' => $editableVendor->id,
                     'page' => request('page'),
@@ -58,7 +58,7 @@
                 ]
             ) !!}
             @endcan
-            {{ link_to_route('vendors.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }}
+            {{ link_to_route('vendors.index', __('app.cancel'), [], ['class' => 'btn btn-default']) }}
         </div>
     </div>
 @endif
diff --git a/resources/views/vendors/index.blade.php b/resources/views/vendors/index.blade.php
index 1810ace..148bb36 100644
--- a/resources/views/vendors/index.blade.php
+++ b/resources/views/vendors/index.blade.php
@@ -14,7 +14,7 @@
     <div class="col-md-8">
         <div class="panel panel-default table-responsive">
             <div class="panel-heading">
-                {{ Form::open(['method' => 'get','class' => 'form-inline']) }}
+                {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
                 {!! FormField::text('q', ['value' => request('q'), 'label' => __('vendor.search'), 'class' => 'input-sm']) !!}
                 {{ Form::submit(__('vendor.search'), ['class' => 'btn btn-sm']) }}
                 {{ link_to_route('vendors.index', __('app.reset')) }}
@@ -40,7 +40,7 @@
                             {{ link_to_route(
                                 'vendors.index',
                                 __('app.edit'),
-                                ['action' => 'edit', 'id' => $vendor->id] + Request::only('page', 'q'),
+                                ['action' => 'edit', 'id' => $vendor->id] + request(['page', 'q']),
                                 ['id' => 'edit-vendor-' . $vendor->id]
                             ) }}
                         </td>