diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css
index 5358f701..ac0fd097 100644
--- a/resources/assets/admin/css/vendor.css
+++ b/resources/assets/admin/css/vendor.css
@@ -13032,4 +13032,9 @@ a:focus {
 	color: #FF4444;
 	font-size: 13px;
 	display: block !important;
+}
+
+.tab-with-error {
+	color: red !important;
+	font-weight: bold;
 }
\ No newline at end of file
diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js
index 5e5bfbe2..faea5bd0 100644
--- a/resources/assets/admin/js/app.js
+++ b/resources/assets/admin/js/app.js
@@ -1430,13 +1430,13 @@ $ (document).ready (function () {
 			target.val (slugify (source.val (), true));
 	});
 
+	// find if any error occured and mark tab with that error
 	$('.has-error').each(function () {
 		var error = $(this);
 		var tabCard = error.closest('.tab-pane');
 
-		$("#"+tabCard.prop('id')+"-tab").css('background-color', 'red');
+		$("#"+tabCard.prop('id')+"-tab").addClass('tab-with-error');
 	});
-
 });
 
 
diff --git a/resources/lang/en/admin/contents.php b/resources/lang/en/admin/contents.php
index 33a616be..51dc80c3 100644
--- a/resources/lang/en/admin/contents.php
+++ b/resources/lang/en/admin/contents.php
@@ -47,4 +47,5 @@ return [
     'files'                  => 'Files',
     'lockUrl'                => 'Keep URL',
     'noCategory'             => ' -- No category -- ',
+    'noTemplates'            => 'Cannot create content page. There are no available templates for this module.'
 ];
\ No newline at end of file
diff --git a/resources/views/admin/content/formParts/appearance.blade.php b/resources/views/admin/content/formParts/appearance.blade.php
index 77831836..550e454a 100644
--- a/resources/views/admin/content/formParts/appearance.blade.php
+++ b/resources/views/admin/content/formParts/appearance.blade.php
@@ -12,7 +12,6 @@
             @lang('admin/contents.uploadTitleImage')
         </label>
         <input type="file" id="titlePhoto" name="titlePhoto" class="form-control" />
-        <span class="has-error">Neplatny template</span>
 
         @include('admin.snippets.hasError', ['field' => 'titlePhoto'])
     </div>
diff --git a/resources/views/admin/content/formParts/basicInformation.blade.php b/resources/views/admin/content/formParts/basicInformation.blade.php
index bff8450a..5efbbf58 100644
--- a/resources/views/admin/content/formParts/basicInformation.blade.php
+++ b/resources/views/admin/content/formParts/basicInformation.blade.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-lg-6">
-        <input type="text" name="title" class="form-control slug-source"
+        <input type="text" name="title" required class="form-control slug-source"
                placeholder="@lang('admin/contents.field_title')"
                value="{{old('title', $page->title)}}" />
 
diff --git a/resources/views/admin/content/formParts/files.blade.php b/resources/views/admin/content/formParts/files.blade.php
index 1b6eaa74..991ad2b4 100644
--- a/resources/views/admin/content/formParts/files.blade.php
+++ b/resources/views/admin/content/formParts/files.blade.php
@@ -4,7 +4,10 @@
         <div class="col-lg-6">
             <ul>
                 @foreach($page->files as $file)
-                    <li><label><input type="checkbox" name="keepAssigned[{{$file->id}}]" checked /> {{$file->original_filename}}</label></li>
+                    <li>
+                        <input type="checkbox" name="keepAssigned[{{$file->id}}]" checked />
+                        {{$file->original_filename}}
+                    </li>
                 @endforeach
             </ul>
         </div>
@@ -15,6 +18,6 @@
             @lang('admin/contents.files')
         </label>
 
-            <input type="file" name="files[]" class="form-control" multiple />
+        <input type="file" name="files[]" class="form-control" multiple />
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/admin/content/new.blade.php b/resources/views/admin/content/new.blade.php
index a3742aa4..896ff7a0 100644
--- a/resources/views/admin/content/new.blade.php
+++ b/resources/views/admin/content/new.blade.php
@@ -3,6 +3,13 @@
 @section('pageHeading', @trans('admin/contents.new', ['name' => $moduleName]))
 
 @section('content')
+
+    @if(!count($templates))
+        <div class="alert alert-warning">
+            @lang('admin/contents.noTemplates')
+        </div>
+    @endif
+
     <form method="POST" enctype="multipart/form-data" action="{{route('content.newPost', ['moduleId' => $moduleId])}}">
         {!! csrf_field() !!}
 
@@ -10,7 +17,7 @@
 
         <button type="submit" class="btn btn-primary">@lang('admin/contents.save')</button>
     </form>
-@stop
+@endsection
 
 @section('javascripts')
     @include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])