diff --git a/resources/views/users/partials/parent-spouse.blade.php b/resources/views/users/partials/parent-spouse.blade.php
index afc9e49..25d8f9b 100644
--- a/resources/views/users/partials/parent-spouse.blade.php
+++ b/resources/views/users/partials/parent-spouse.blade.php
@@ -1,27 +1,27 @@
 <div class="panel panel-default">
-    <div class="panel-heading"><h3 class="panel-title">{{ trans('user.family') }}</h3></div>
+    <div class="panel-heading"><h3 class="panel-title">{{ __('user.family') }}</h3></div>
 
     <table class="table">
         <tbody>
             <tr>
-                <th class="col-sm-4">{{ trans('user.father') }}</th>
+                <th class="col-sm-4">{{ __('user.father') }}</th>
                 <td class="col-sm-8">
                     @can ('edit', $user)
                         @if (request('action') == 'set_father')
                         {{ Form::open(['route' => ['family-actions.set-father', $user->id]]) }}
-                        {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => trans('app.select_from_existing_males')]) !!}
+                        {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => __('app.select_from_existing_males')]) !!}
                         <div class="input-group">
-                            {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
+                            {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }}
                             <span class="input-group-btn">
-                                {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_father_button']) }}
-                                {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
+                                {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_father_button']) }}
+                                {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
                             </span>
                         </div>
                         {{ Form::close() }}
                         @else
                             {{ $user->fatherLink() }}
                             <div class="pull-right">
-                                {{ link_to_route('users.show', trans('user.set_father'), [$user->id, 'action' => 'set_father'], ['class' => 'btn btn-link btn-xs']) }}
+                                {{ link_to_route('users.show', __('user.set_father'), [$user->id, 'action' => 'set_father'], ['class' => 'btn btn-link btn-xs']) }}
                             </div>
                         @endif
                     @else
@@ -30,24 +30,24 @@
                 </td>
             </tr>
             <tr>
-                <th>{{ trans('user.mother') }}</th>
+                <th>{{ __('user.mother') }}</th>
                 <td>
                     @can ('edit', $user)
                         @if (request('action') == 'set_mother')
                         {{ Form::open(['route' => ['family-actions.set-mother', $user->id]]) }}
-                        {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => trans('app.select_from_existing_females')]) !!}
+                        {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => __('app.select_from_existing_females')]) !!}
                         <div class="input-group">
-                            {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
+                            {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }}
                             <span class="input-group-btn">
-                                {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_mother_button']) }}
-                                {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
+                                {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_mother_button']) }}
+                                {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
                             </span>
                         </div>
                         {{ Form::close() }}
                         @else
                             {{ $user->motherLink() }}
                             <div class="pull-right">
-                                {{ link_to_route('users.show', trans('user.set_mother'), [$user->id, 'action' => 'set_mother'], ['class' => 'btn btn-link btn-xs']) }}
+                                {{ link_to_route('users.show', __('user.set_mother'), [$user->id, 'action' => 'set_mother'], ['class' => 'btn btn-link btn-xs']) }}
                             </div>
                         @endif
                     @else
@@ -56,16 +56,13 @@
                 </td>
             </tr>
             <tr>
-                <th class="col-sm-4">{{ trans('user.parent') }}</th>
+                <th class="col-sm-4">{{ __('user.parent') }}</th>
                 <td class="col-sm-8">
-
                     @can ('edit', $user)
                     <div class="pull-right">
-                        @if (request('action') == 'set_parent')
-                            {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }}
-                        @else
-                            {{ link_to_route('users.show', trans('user.set_parent'), [$user->id, 'action' => 'set_parent'], ['class' => 'btn btn-link btn-xs']) }}
-                        @endif
+                        @unless (request('action') == 'set_parent')
+                            {{ link_to_route('users.show', __('user.set_parent'), [$user->id, 'action' => 'set_parent'], ['class' => 'btn btn-link btn-xs']) }}
+                        @endunless
                     </div>
                     @endcan
 
@@ -74,26 +71,25 @@
                     @endif
 
                     @can('edit', $user)
-                    @if (request('action') == 'set_parent')
-                    {{ Form::open(['route' => ['family-actions.set-parent', $user->id]]) }}
-                    {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => trans('app.select_from_existing_couples')]) !!}
-                    {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_parent_button']) }}
-                    {{ Form::close() }}
-                    @endif
+                        @if (request('action') == 'set_parent')
+                            {{ Form::open(['route' => ['family-actions.set-parent', $user->id]]) }}
+                            {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => __('app.select_from_existing_couples')]) !!}
+                            {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_parent_button']) }}
+                            {{ link_to_route('users.show', __('app.cancel'), $user, ['class' => 'btn btn-default btn-sm']) }}
+                            {{ Form::close() }}
+                        @endif
                     @endcan
                 </td>
             </tr>
             @if ($user->gender_id == 1)
             <tr>
-                <th>{{ trans('user.wife') }}</th>
+                <th>{{ __('user.wife') }}</th>
                 <td>
                     @can ('edit', $user)
                     <div class="pull-right">
-                        @if (request('action') == 'add_spouse')
-                            {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }}
-                        @else
-                            {{ link_to_route('users.show', trans('user.add_wife'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }}
-                        @endif
+                        @unless (request('action') == 'add_spouse')
+                            {{ link_to_route('users.show', __('user.add_wife'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }}
+                        @endunless
                     </div>
                     @endcan
 
@@ -105,38 +101,37 @@
                         </ul>
                     @endif
                     @can('edit', $user)
-                    @if (request('action') == 'add_spouse')
-                    <div>
-                        {{ Form::open(['route' => ['family-actions.add-wife', $user->id]]) }}
-                        {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_females')]) !!}
-                        <div class="form-group">
-                            <div class="row">
-                                <div class="col-md-7">
-                                    {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
-                                </div>
-                                <div class="col-md-5">
-                                    {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => trans('couple.marriage_date')]) }}
+                        @if (request('action') == 'add_spouse')
+                        <div>
+                            {{ Form::open(['route' => ['family-actions.add-wife', $user->id]]) }}
+                            {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => __('app.select_from_existing_females')]) !!}
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-7">
+                                        {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }}
+                                    </div>
+                                    <div class="col-md-5">
+                                        {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => __('couple.marriage_date')]) }}
+                                    </div>
                                 </div>
                             </div>
+                            {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_wife_button']) }}
+                            {{ link_to_route('users.show', __('app.cancel'), $user, ['class' => 'btn btn-default btn-sm']) }}
+                            {{ Form::close() }}
                         </div>
-                        {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_wife_button']) }}
-                        {{ Form::close() }}
-                    </div>
-                    @endif
+                        @endif
                     @endcan
                 </td>
             </tr>
             @else
             <tr>
-                <th>{{ trans('user.husband') }}</th>
+                <th>{{ __('user.husband') }}</th>
                 <td>
                     @can ('edit', $user)
                     <div class="pull-right">
-                        @if (request('action') == 'add_spouse')
-                            {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }}
-                        @else
-                            {{ link_to_route('users.show', trans('user.add_husband'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }}
-                        @endif
+                        @unless (request('action') == 'add_spouse')
+                            {{ link_to_route('users.show', __('user.add_husband'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }}
+                        @endunless
                     </div>
                     @endcan
                     @if ($user->husbands->isEmpty() == false)
@@ -147,24 +142,25 @@
                         </ul>
                     @endif
                     @can('edit', $user)
-                    @if (request('action') == 'add_spouse')
-                    <div>
-                        {{ Form::open(['route' => ['family-actions.add-husband', $user->id]]) }}
-                        {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_males')]) !!}
-                        <div class="form-group">
-                            <div class="row">
-                                <div class="col-md-7">
-                                    {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
-                                </div>
-                                <div class="col-md-5">
-                                    {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => trans('couple.marriage_date')]) }}
+                        @if (request('action') == 'add_spouse')
+                        <div>
+                            {{ Form::open(['route' => ['family-actions.add-husband', $user->id]]) }}
+                            {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => __('app.select_from_existing_males')]) !!}
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-7">
+                                        {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }}
+                                    </div>
+                                    <div class="col-md-5">
+                                        {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => __('couple.marriage_date')]) }}
+                                    </div>
                                 </div>
                             </div>
+                            {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_husband_button']) }}
+                            {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
+                            {{ Form::close() }}
                         </div>
-                        {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_husband_button']) }}
-                        {{ Form::close() }}
-                    </div>
-                    @endif
+                        @endif
                     @endcan
                 </td>
             </tr>