diff --git a/src/stubs/resources/views/full/edit.stub b/src/stubs/resources/views/full/edit.stub
index 79f9a82..d23de5b 100644
--- a/src/stubs/resources/views/full/edit.stub
+++ b/src/stubs/resources/views/full/edit.stub
@@ -17,7 +17,7 @@
                     {!! $errors->first('master_id', '<span class="form-error small">:message</span>') !!}
                 </div>
                 <hr style="margin:0">
-                <div class="panel-body">{{ __('app.delete_confirm') }}</div>
+                <div class="panel-body">{{ __('master.delete_confirm') }}</div>
                 <div class="panel-footer">
                     {!! FormField::delete(
                         ['route' => ['masters.destroy', $singleMstr]],
diff --git a/src/stubs/resources/views/full/index.stub b/src/stubs/resources/views/full/index.stub
index f82cdd3..ad0242f 100644
--- a/src/stubs/resources/views/full/index.stub
+++ b/src/stubs/resources/views/full/index.stub
@@ -38,14 +38,14 @@
                         <td>{{ $singleMstr->name_link }}</td>
                         <td>{{ $singleMstr->description }}</td>
                         <td class="text-center">
-                        @can('view', $singleMstr)
-                            {!! link_to_route(
-                                'masters.show',
-                                __('app.show'),
-                                [$singleMstr],
-                                ['class' => 'btn btn-default btn-xs', 'id' => 'show-master-' . $singleMstr->id]
-                            ) !!}
-                        @endcan
+                            @can('view', $singleMstr)
+                                {!! link_to_route(
+                                    'masters.show',
+                                    __('app.show'),
+                                    [$singleMstr],
+                                    ['class' => 'btn btn-default btn-xs', 'id' => 'show-master-' . $singleMstr->id]
+                                ) !!}
+                            @endcan
                         </td>
                     </tr>
                     @endforeach
diff --git a/src/stubs/resources/views/simple/forms.stub b/src/stubs/resources/views/simple/forms.stub
index a6c553f..4927214 100644
--- a/src/stubs/resources/views/simple/forms.stub
+++ b/src/stubs/resources/views/simple/forms.stub
@@ -44,7 +44,7 @@
             {!! $errors->first('master_id', '<span class="form-error small">:message</span>') !!}
         </div>
         <hr style="margin:0">
-        <div class="panel-body">{{ __('app.delete_confirm') }}</div>
+        <div class="panel-body">{{ __('master.delete_confirm') }}</div>
         <div class="panel-footer">
             {!! FormField::delete(
                 ['route' => ['masters.destroy', $editableMaster]],
diff --git a/tests/Generators/Simple/ViewsGeneratorTest.php b/tests/Generators/Simple/ViewsGeneratorTest.php
index eaca41e..763c693 100644
--- a/tests/Generators/Simple/ViewsGeneratorTest.php
+++ b/tests/Generators/Simple/ViewsGeneratorTest.php
@@ -134,7 +134,7 @@ class ViewsGeneratorTest extends TestCase
             {!! \$errors->first('{$this->lang_name}_id', '<span class=\"form-error small\">:message</span>') !!}
         </div>
         <hr style=\"margin:0\">
-        <div class=\"panel-body\">{{ __('app.delete_confirm') }}</div>
+        <div class=\"panel-body\">{{ __('{$this->lang_name}.delete_confirm') }}</div>
         <div class=\"panel-footer\">
             {!! FormField::delete(
                 ['route' => ['{$this->table_name}.destroy', \$editable{$this->model_name}]],
diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php
index b41bae3..66f28ba 100644
--- a/tests/Generators/ViewsGeneratorTest.php
+++ b/tests/Generators/ViewsGeneratorTest.php
@@ -54,14 +54,14 @@ class ViewsGeneratorTest extends TestCase
                         <td>{{ \${$this->single_model_var_name}->name_link }}</td>
                         <td>{{ \${$this->single_model_var_name}->description }}</td>
                         <td class=\"text-center\">
-                        @can('view', \${$this->single_model_var_name})
-                            {!! link_to_route(
-                                '{$this->table_name}.show',
-                                __('app.show'),
-                                [\${$this->single_model_var_name}],
-                                ['class' => 'btn btn-default btn-xs', 'id' => 'show-{$this->lang_name}-' . \${$this->single_model_var_name}->id]
-                            ) !!}
-                        @endcan
+                            @can('view', \${$this->single_model_var_name})
+                                {!! link_to_route(
+                                    '{$this->table_name}.show',
+                                    __('app.show'),
+                                    [\${$this->single_model_var_name}],
+                                    ['class' => 'btn btn-default btn-xs', 'id' => 'show-{$this->lang_name}-' . \${$this->single_model_var_name}->id]
+                                ) !!}
+                            @endcan
                         </td>
                     </tr>
                     @endforeach
@@ -172,7 +172,7 @@ class ViewsGeneratorTest extends TestCase
                     {!! \$errors->first('{$this->lang_name}_id', '<span class=\"form-error small\">:message</span>') !!}
                 </div>
                 <hr style=\"margin:0\">
-                <div class=\"panel-body\">{{ __('app.delete_confirm') }}</div>
+                <div class=\"panel-body\">{{ __('{$this->lang_name}.delete_confirm') }}</div>
                 <div class=\"panel-footer\">
                     {!! FormField::delete(
                         ['route' => ['{$this->table_name}.destroy', \${$this->single_model_var_name}]],