diff --git a/src/stubs/resources/views/full/index-formfield.stub b/src/stubs/resources/views/full/index-formfield.stub
index 14e1738..06cee82 100644
--- a/src/stubs/resources/views/full/index-formfield.stub
+++ b/src/stubs/resources/views/full/index-formfield.stub
@@ -3,21 +3,21 @@
 @section('title', __('master.list'))
 
 @section('content')
-<h1>
+<div class="mb-3">
     <div class="float-right">
         @can('create', new fullMstr)
             {{ link_to_route('masters.create', __('master.create'), [], ['class' => 'btn btn-success']) }}
         @endcan
     </div>
-    {{ __('master.list') }}
-    <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small>
-</h1>
+    <h1 class="page-title">{{ __('master.list') }} <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small></h1>
+</div>
+
 <div class="row">
     <div class="col-md-12">
         <div class="card table-responsive">
             <div class="card-header">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'mr-sm-2']) !!}
+                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'mx-sm-2']) !!}
                 {{ Form::submit(__('master.search'), ['class' => 'btn btn-secondary']) }}
                 {{ link_to_route('masters.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
diff --git a/src/stubs/resources/views/full/index.stub b/src/stubs/resources/views/full/index.stub
index 7881ae3..d8401ac 100644
--- a/src/stubs/resources/views/full/index.stub
+++ b/src/stubs/resources/views/full/index.stub
@@ -3,23 +3,23 @@
 @section('title', __('master.list'))
 
 @section('content')
-<h1>
+<div class="mb-3">
     <div class="float-right">
         @can('create', new fullMstr)
             <a href="{{ route('masters.create') }}" class="btn btn-success">{{ __('master.create') }}</a>
         @endcan
     </div>
-    {{ __('master.list') }}
-    <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small>
-</h1>
+    <h1 class="page-title">{{ __('master.list') }} <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small></h1>
+</div>
+
 <div class="row">
     <div class="col-md-12">
         <div class="card table-responsive">
             <div class="card-header">
                 <form method="GET" action="" accept-charset="UTF-8" class="form-inline">
                     <div class="form-group">
-                        <label for="q" class="control-label mr-sm-2">{{ __('master.search') }}</label>
-                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control mr-sm-2" value="{{ request('q') }}">
+                        <label for="q" class="control-label">{{ __('master.search') }}</label>
+                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control mx-sm-2" value="{{ request('q') }}">
                     </div>
                     <input type="submit" value="{{ __('master.search') }}" class="btn btn-secondary">
                     <a href="{{ route('masters.index') }}" class="btn btn-link">{{ __('app.reset') }}</a>
diff --git a/src/stubs/resources/views/simple/index-formfield.stub b/src/stubs/resources/views/simple/index-formfield.stub
index 6c739d9..7fc6a98 100644
--- a/src/stubs/resources/views/simple/index-formfield.stub
+++ b/src/stubs/resources/views/simple/index-formfield.stub
@@ -3,21 +3,21 @@
 @section('title', __('master.list'))
 
 @section('content')
-<h1>
+<div class="mb-3">
     <div class="float-right">
         @can('create', new fullMstr)
             {{ link_to_route('masters.index', __('master.create'), ['action' => 'create'], ['class' => 'btn btn-success']) }}
         @endcan
     </div>
-    {{ __('master.list') }}
-    <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small>
-</h1>
+    <h1 class="page-title">{{ __('master.list') }} <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small></h1>
+</div>
+
 <div class="row">
     <div class="col-md-8">
         <div class="card table-responsive">
             <div class="card-header">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'mr-sm-2']) !!}
+                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'mx-sm-2']) !!}
                 {{ Form::submit(__('master.search'), ['class' => 'btn btn-secondary']) }}
                 {{ link_to_route('masters.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
diff --git a/src/stubs/resources/views/simple/index.stub b/src/stubs/resources/views/simple/index.stub
index 4a0edea..78ba849 100644
--- a/src/stubs/resources/views/simple/index.stub
+++ b/src/stubs/resources/views/simple/index.stub
@@ -3,23 +3,23 @@
 @section('title', __('master.list'))
 
 @section('content')
-<h1>
+<div class="mb-3">
     <div class="float-right">
         @can('create', new fullMstr)
-            <a href="{{ route('masters.index', ['action' => 'create']) }}" class="btn btn-success">{{ __('master.create') }}</a>
+            <a href="{{ route('masters.create') }}" class="btn btn-success">{{ __('master.create') }}</a>
         @endcan
     </div>
-    {{ __('master.list') }}
-    <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small>
-</h1>
+    <h1 class="page-title">{{ __('master.list') }} <small>{{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }}</small></h1>
+</div>
+
 <div class="row">
     <div class="col-md-8">
         <div class="card table-responsive">
             <div class="card-header">
                 <form method="GET" action="" accept-charset="UTF-8" class="form-inline">
                     <div class="form-group">
-                        <label for="q" class="control-label mr-sm-2">{{ __('master.search') }}</label>
-                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control mr-sm-2" value="{{ request('q') }}">
+                        <label for="q" class="control-label">{{ __('master.search') }}</label>
+                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control mx-sm-2" value="{{ request('q') }}">
                     </div>
                     <input type="submit" value="{{ __('master.search') }}" class="btn btn-secondary">
                     <a href="{{ route('masters.index') }}" class="btn btn-link">{{ __('app.reset') }}</a>
diff --git a/tests/CommandOptions/FullCrudFormfieldOptionsTest.php b/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
index 7360d9d..f980a1d 100644
--- a/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
+++ b/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
@@ -47,21 +47,21 @@ class FullCrudFormfieldOptionsTest extends TestCase
 @section('title', __('{$this->lang_name}.list'))
 
 @section('content')
-<h1>
+<div class=\"mb-3\">
     <div class=\"float-right\">
         @can('create', new {$this->full_model_name})
             {{ link_to_route('{$this->table_name}.create', __('{$this->lang_name}.create'), [], ['class' => 'btn btn-success']) }}
         @endcan
     </div>
-    {{ __('{$this->lang_name}.list') }}
-    <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small>
-</h1>
+    <h1 class=\"page-title\">{{ __('{$this->lang_name}.list') }} <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small></h1>
+</div>
+
 <div class=\"row\">
     <div class=\"col-md-12\">
         <div class=\"card table-responsive\">
             <div class=\"card-header\">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'mr-sm-2']) !!}
+                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'mx-sm-2']) !!}
                 {{ Form::submit(__('{$this->lang_name}.search'), ['class' => 'btn btn-secondary']) }}
                 {{ link_to_route('{$this->table_name}.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
diff --git a/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php b/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php
index 98717c4..20c2931 100644
--- a/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php
+++ b/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php
@@ -45,21 +45,21 @@ class SimpleCrudFormfieldOptionsTest extends TestCase
 @section('title', __('{$this->lang_name}.list'))
 
 @section('content')
-<h1>
+<div class=\"mb-3\">
     <div class=\"float-right\">
         @can('create', new {$this->full_model_name})
             {{ link_to_route('{$this->table_name}.index', __('{$this->lang_name}.create'), ['action' => 'create'], ['class' => 'btn btn-success']) }}
         @endcan
     </div>
-    {{ __('{$this->lang_name}.list') }}
-    <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small>
-</h1>
+    <h1 class=\"page-title\">{{ __('{$this->lang_name}.list') }} <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small></h1>
+</div>
+
 <div class=\"row\">
     <div class=\"col-md-8\">
         <div class=\"card table-responsive\">
             <div class=\"card-header\">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'mr-sm-2']) !!}
+                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'mx-sm-2']) !!}
                 {{ Form::submit(__('{$this->lang_name}.search'), ['class' => 'btn btn-secondary']) }}
                 {{ link_to_route('{$this->table_name}.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
diff --git a/tests/Generators/Simple/ViewsGeneratorTest.php b/tests/Generators/Simple/ViewsGeneratorTest.php
index fdeb664..e1a0c3f 100644
--- a/tests/Generators/Simple/ViewsGeneratorTest.php
+++ b/tests/Generators/Simple/ViewsGeneratorTest.php
@@ -19,23 +19,23 @@ class ViewsGeneratorTest extends TestCase
 @section('title', __('{$this->lang_name}.list'))
 
 @section('content')
-<h1>
+<div class=\"mb-3\">
     <div class=\"float-right\">
         @can('create', new {$this->full_model_name})
-            <a href=\"{{ route('{$this->table_name}.index', ['action' => 'create']) }}\" class=\"btn btn-success\">{{ __('{$this->lang_name}.create') }}</a>
+            <a href=\"{{ route('{$this->table_name}.create') }}\" class=\"btn btn-success\">{{ __('{$this->lang_name}.create') }}</a>
         @endcan
     </div>
-    {{ __('{$this->lang_name}.list') }}
-    <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small>
-</h1>
+    <h1 class=\"page-title\">{{ __('{$this->lang_name}.list') }} <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small></h1>
+</div>
+
 <div class=\"row\">
     <div class=\"col-md-8\">
         <div class=\"card table-responsive\">
             <div class=\"card-header\">
                 <form method=\"GET\" action=\"\" accept-charset=\"UTF-8\" class=\"form-inline\">
                     <div class=\"form-group\">
-                        <label for=\"q\" class=\"control-label mr-sm-2\">{{ __('{$this->lang_name}.search') }}</label>
-                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control mr-sm-2\" value=\"{{ request('q') }}\">
+                        <label for=\"q\" class=\"control-label\">{{ __('{$this->lang_name}.search') }}</label>
+                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control mx-sm-2\" value=\"{{ request('q') }}\">
                     </div>
                     <input type=\"submit\" value=\"{{ __('{$this->lang_name}.search') }}\" class=\"btn btn-secondary\">
                     <a href=\"{{ route('{$this->table_name}.index') }}\" class=\"btn btn-link\">{{ __('app.reset') }}</a>
diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php
index c860169..4ce8ebf 100644
--- a/tests/Generators/ViewsGeneratorTest.php
+++ b/tests/Generators/ViewsGeneratorTest.php
@@ -19,23 +19,23 @@ class ViewsGeneratorTest extends TestCase
 @section('title', __('{$this->lang_name}.list'))
 
 @section('content')
-<h1>
+<div class=\"mb-3\">
     <div class=\"float-right\">
         @can('create', new {$this->full_model_name})
             <a href=\"{{ route('{$this->table_name}.create') }}\" class=\"btn btn-success\">{{ __('{$this->lang_name}.create') }}</a>
         @endcan
     </div>
-    {{ __('{$this->lang_name}.list') }}
-    <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small>
-</h1>
+    <h1 class=\"page-title\">{{ __('{$this->lang_name}.list') }} <small>{{ __('app.total') }} : {{ \${$this->collection_model_var_name}->total() }} {{ __('{$this->lang_name}.{$this->lang_name}') }}</small></h1>
+</div>
+
 <div class=\"row\">
     <div class=\"col-md-12\">
         <div class=\"card table-responsive\">
             <div class=\"card-header\">
                 <form method=\"GET\" action=\"\" accept-charset=\"UTF-8\" class=\"form-inline\">
                     <div class=\"form-group\">
-                        <label for=\"q\" class=\"control-label mr-sm-2\">{{ __('{$this->lang_name}.search') }}</label>
-                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control mr-sm-2\" value=\"{{ request('q') }}\">
+                        <label for=\"q\" class=\"control-label\">{{ __('{$this->lang_name}.search') }}</label>
+                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control mx-sm-2\" value=\"{{ request('q') }}\">
                     </div>
                     <input type=\"submit\" value=\"{{ __('{$this->lang_name}.search') }}\" class=\"btn btn-secondary\">
                     <a href=\"{{ route('{$this->table_name}.index') }}\" class=\"btn btn-link\">{{ __('app.reset') }}</a>