diff --git a/src/stubs/resources/views/full/edit-formfield.stub b/src/stubs/resources/views/full/edit-formfield.stub
new file mode 100644
index 0000000..d23de5b
--- /dev/null
+++ b/src/stubs/resources/views/full/edit-formfield.stub
@@ -0,0 +1,56 @@
+@extends('layouts.app')
+
+@section('title', __('master.edit'))
+
+@section('content')
+<div class="row">
+    <div class="col-md-6 col-md-offset-3">
+        @if (request('action') == 'delete' && $singleMstr)
+        @can('delete', $singleMstr)
+            <div class="panel panel-default">
+                <div class="panel-heading"><h3 class="panel-title">{{ __('master.delete') }}</h3></div>
+                <div class="panel-body">
+                    <label class="control-label">{{ __('master.name') }}</label>
+                    <p>{{ $singleMstr->name }}</p>
+                    <label class="control-label">{{ __('master.description') }}</label>
+                    <p>{{ $singleMstr->description }}</p>
+                    {!! $errors->first('master_id', '<span class="form-error small">:message</span>') !!}
+                </div>
+                <hr style="margin:0">
+                <div class="panel-body">{{ __('master.delete_confirm') }}</div>
+                <div class="panel-footer">
+                    {!! FormField::delete(
+                        ['route' => ['masters.destroy', $singleMstr]],
+                        __('app.delete_confirm_button'),
+                        ['class'=>'btn btn-danger'],
+                        [
+                            'master_id' => $singleMstr->id,
+                            'page' => request('page'),
+                            'q' => request('q'),
+                        ]
+                    ) !!}
+                    {{ link_to_route('masters.edit', __('app.cancel'), [$singleMstr], ['class' => 'btn btn-default']) }}
+                </div>
+            </div>
+        @endcan
+        @else
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('master.edit') }}</h3></div>
+            {!! Form::model($singleMstr, ['route' => ['masters.update', $singleMstr],'method' => 'patch']) !!}
+            <div class="panel-body">
+                {!! FormField::text('name', ['required' => true, 'label' => __('master.name')]) !!}
+                {!! FormField::textarea('description', ['label' => __('master.description')]) !!}
+            </div>
+            <div class="panel-footer">
+                {!! Form::submit(__('master.update'), ['class' => 'btn btn-success']) !!}
+                {{ link_to_route('masters.show', __('app.cancel'), [$singleMstr], ['class' => 'btn btn-default']) }}
+                @can('delete', $singleMstr)
+                    {{ link_to_route('masters.edit', __('app.delete'), [$singleMstr, 'action' => 'delete'], ['class' => 'btn btn-danger pull-right', 'id' => 'del-master-'.$singleMstr->id]) }}
+                @endcan
+            </div>
+            {!! Form::close() !!}
+        </div>
+    </div>
+</div>
+@endif
+@endsection
diff --git a/src/stubs/resources/views/full/edit.stub b/src/stubs/resources/views/full/edit.stub
index d23de5b..b73855b 100644
--- a/src/stubs/resources/views/full/edit.stub
+++ b/src/stubs/resources/views/full/edit.stub
@@ -36,19 +36,28 @@
         @else
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('master.edit') }}</h3></div>
-            {!! Form::model($singleMstr, ['route' => ['masters.update', $singleMstr],'method' => 'patch']) !!}
-            <div class="panel-body">
-                {!! FormField::text('name', ['required' => true, 'label' => __('master.name')]) !!}
-                {!! FormField::textarea('description', ['label' => __('master.description')]) !!}
-            </div>
-            <div class="panel-footer">
-                {!! Form::submit(__('master.update'), ['class' => 'btn btn-success']) !!}
-                {{ link_to_route('masters.show', __('app.cancel'), [$singleMstr], ['class' => 'btn btn-default']) }}
-                @can('delete', $singleMstr)
-                    {{ link_to_route('masters.edit', __('app.delete'), [$singleMstr, 'action' => 'delete'], ['class' => 'btn btn-danger pull-right', 'id' => 'del-master-'.$singleMstr->id]) }}
-                @endcan
-            </div>
-            {!! Form::close() !!}
+            <form method="POST" action="{{ route('masters.update', $singleMstr) }}" accept-charset="UTF-8">
+                {{ csrf_field() }} {{ method_field('patch') }}
+                <div class="panel-body">
+                    <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                        <label for="name" class="control-label">{{ __('master.name') }}</label>
+                        <input id="name" type="text" class="form-control" name="name" value="{{ old('name', $singleMstr->name) }}" required>
+                        {!! $errors->first('name', '<span class="help-block small">:message</span>') !!}
+                    </div>
+                    <div class="form-group{{ $errors->has('description') ? ' has-error' : '' }}">
+                        <label for="description" class="control-label">{{ __('master.description') }}</label>
+                        <textarea id="description" type="text" class="form-control" name="description" rows="4">{{ old('description', $singleMstr->description) }}</textarea>
+                        {!! $errors->first('description', '<span class="help-block small">:message</span>') !!}
+                    </div>
+                </div>
+                <div class="panel-footer">
+                    <input type="submit" value="{{ __('master.update') }}" class="btn btn-success">
+                    <a href="{{ route('masters.show', $singleMstr) }}" class="btn btn-default">{{ __('app.cancel') }}</a>
+                    @can('delete', $singleMstr)
+                        <a href="{{ route('masters.edit', [$singleMstr, 'action' => 'delete']) }}" id="del-master-{{ $singleMstr->id }}" class="btn btn-danger pull-right">{{ __('app.delete') }}</a>
+                    @endcan
+                </div>
+            </form>
         </div>
     </div>
 </div>
diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php
index 91c6ec2..b0df8fb 100644
--- a/tests/Generators/ViewsGeneratorTest.php
+++ b/tests/Generators/ViewsGeneratorTest.php
@@ -200,19 +200,28 @@ class ViewsGeneratorTest extends TestCase
         @else
         <div class=\"panel panel-default\">
             <div class=\"panel-heading\"><h3 class=\"panel-title\">{{ __('{$this->lang_name}.edit') }}</h3></div>
-            {!! Form::model(\${$this->single_model_var_name}, ['route' => ['{$this->table_name}.update', \${$this->single_model_var_name}],'method' => 'patch']) !!}
-            <div class=\"panel-body\">
-                {!! FormField::text('name', ['required' => true, 'label' => __('{$this->lang_name}.name')]) !!}
-                {!! FormField::textarea('description', ['label' => __('{$this->lang_name}.description')]) !!}
-            </div>
-            <div class=\"panel-footer\">
-                {!! Form::submit(__('{$this->lang_name}.update'), ['class' => 'btn btn-success']) !!}
-                {{ link_to_route('{$this->table_name}.show', __('app.cancel'), [\${$this->single_model_var_name}], ['class' => 'btn btn-default']) }}
-                @can('delete', \${$this->single_model_var_name})
-                    {{ link_to_route('{$this->table_name}.edit', __('app.delete'), [\${$this->single_model_var_name}, 'action' => 'delete'], ['class' => 'btn btn-danger pull-right', 'id' => 'del-{$this->lang_name}-'.\${$this->single_model_var_name}->id]) }}
-                @endcan
-            </div>
-            {!! Form::close() !!}
+            <form method=\"POST\" action=\"{{ route('{$this->table_name}.update', \${$this->single_model_var_name}) }}\" accept-charset=\"UTF-8\">
+                {{ csrf_field() }} {{ method_field('patch') }}
+                <div class=\"panel-body\">
+                    <div class=\"form-group{{ \$errors->has('name') ? ' has-error' : '' }}\">
+                        <label for=\"name\" class=\"control-label\">{{ __('{$this->lang_name}.name') }}</label>
+                        <input id=\"name\" type=\"text\" class=\"form-control\" name=\"name\" value=\"{{ old('name', \${$this->single_model_var_name}->name) }}\" required>
+                        {!! \$errors->first('name', '<span class=\"help-block small\">:message</span>') !!}
+                    </div>
+                    <div class=\"form-group{{ \$errors->has('description') ? ' has-error' : '' }}\">
+                        <label for=\"description\" class=\"control-label\">{{ __('{$this->lang_name}.description') }}</label>
+                        <textarea id=\"description\" type=\"text\" class=\"form-control\" name=\"description\" rows=\"4\">{{ old('description', \${$this->single_model_var_name}->description) }}</textarea>
+                        {!! \$errors->first('description', '<span class=\"help-block small\">:message</span>') !!}
+                    </div>
+                </div>
+                <div class=\"panel-footer\">
+                    <input type=\"submit\" value=\"{{ __('{$this->lang_name}.update') }}\" class=\"btn btn-success\">
+                    <a href=\"{{ route('{$this->table_name}.show', \${$this->single_model_var_name}) }}\" class=\"btn btn-default\">{{ __('app.cancel') }}</a>
+                    @can('delete', \${$this->single_model_var_name})
+                        <a href=\"{{ route('{$this->table_name}.edit', [\${$this->single_model_var_name}, 'action' => 'delete']) }}\" id=\"del-{$this->lang_name}-{{ \${$this->single_model_var_name}->id }}\" class=\"btn btn-danger pull-right\">{{ __('app.delete') }}</a>
+                    @endcan
+                </div>
+            </form>
         </div>
     </div>
 </div>