diff --git a/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php b/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php
index 43fa6e3c..0c809522 100644
--- a/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php
+++ b/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php
@@ -3,6 +3,7 @@ namespace Modules\ContactForm\Pipeline\SavePipeline;
 
 use App\CMS\Contracts\Content\SavePipeline\Process;
 use App\Models\Content\Content;
+use Modules\ContactForm\Handlers\ContactForm;
 
 class SaveContactInformation implements Process
 {
@@ -16,6 +17,8 @@ class SaveContactInformation implements Process
      */
     function handle(Content & $page, array & $input)
     {
+        if ($page->moduleHandler != ContactForm::class)
+            return;
 
         $settings = [
             'phone'        => $input['phone'],
diff --git a/resources/views/admin/content/formParts/appearance.blade.php b/resources/views/admin/content/formParts/appearance.blade.php
index 8c20e63d..341a5ca3 100644
--- a/resources/views/admin/content/formParts/appearance.blade.php
+++ b/resources/views/admin/content/formParts/appearance.blade.php
@@ -34,6 +34,10 @@
 
             <select class="form-control" name="template">
                 @foreach($templates as $template)
+                    @if(\Illuminate\Support\Str::contains($template->template_name, '_partials' ))
+                        @continue
+                    @endif
+
                     <option value="{{$template->template_name}}"
                             @if(old('template', $page->template) == $template->template_name) selected @endif>
                         {{$template->name}}
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/_partials/traineeTeamList.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/_partials/traineeTeamList.blade.php
new file mode 100644
index 00000000..9a3e66ad
--- /dev/null
+++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/_partials/traineeTeamList.blade.php
@@ -0,0 +1,19 @@
+@if (isset($page->traineeTeamCategory))
+    <div class="text-center trainee-team">
+        <h2>{{$page->traineeTeamCategory->name}}</h2>
+
+        @foreach($page->traineeTeamCategory->content as $i => $subpage)
+            <div class="column text-center small-12 medium-{{ceil(12/count($page->traineeTeamCategory->content))}}"
+                 data-equalizer-watch>
+                <a href="{{route('page.content', ['url' => $subpage->url])}}">
+                    @if(empty($subpage->titlePhoto))
+                        <img class="thumbnail" src="@asset('visitor/images/avatar.png')" alt="{{$subpage->title}}">
+                    @else
+                        <img class="thumbnail" src="@upload($subpage->titlePhoto)" alt="{{$subpage->title}}">
+                    @endif
+                    <h4>{{$subpage->title}}</h4>
+                </a>
+            </div>
+        @endforeach
+    </div>
+@endif
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php
index 91bd3d2e..a32bd688 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php
@@ -1,5 +1,7 @@
 @extendVisitor('defaultLayout')
 
+@section('bodyClass', 'photo-bg')
+
 @section('topMenu')
     @include(\App\CMS\Helpers\Template::name('commonHeader'))
 @endsection
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php
index 49240946..1b18fb7f 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php
@@ -1,5 +1,7 @@
 @extendVisitor('defaultLayout')
 
+@section('bodyClass', 'photo-bg')
+
 @section('topMenu')
     <h1 class="text-center">
         <a href="{{route('page.index')}}">
@@ -48,22 +50,6 @@
     <div class="row content-container">
         {!! $page->pageContent !!}
 
-        <div class="text-center trainee-team">
-            <h2>{{$page->traineeTeamCategory->name}}</h2>
-
-            @foreach($page->traineeTeamCategory->content as $i => $subpage)
-                <div class="column text-center small-12 medium-{{ceil(12/count($page->traineeTeamCategory->content))}}"
-                     data-equalizer-watch>
-                    <a href="{{route('page.content', ['url' => $subpage->url])}}">
-                        @if(empty($subpage->titlePhoto))
-                            <img class="thumbnail" src="@asset('visitor/images/avatar.png')" alt="{{$subpage->title}}">
-                        @else
-                            <img class="thumbnail" src="@upload($subpage->titlePhoto)" alt="{{$subpage->title}}">
-                        @endif
-                        <h4>{{$subpage->title}}</h4>
-                    </a>
-                </div>
-            @endforeach
-        </div>
+        @include('modules.staticpages.visitor._partials.traineeTeamList')
     </div>
 @endsection
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php
deleted file mode 100644
index 59b24c91..00000000
--- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepagePhoto.blade.php
+++ /dev/null
@@ -1,71 +0,0 @@
-@extendVisitor('defaultLayout')
-
-@section('bodyClass', 'photo-bg')
-
-@section('topMenu')
-    <h1 class="text-center">
-        <a href="{{route('page.index')}}">
-            <img class="logo" src="@asset('visitor/images/logo.png')" alt="">
-            {{setting('pageName')}}
-        </a>
-    </h1>
-
-    <div class="title-bar text-right" data-responsive-toggle="main-menu" data-hide-for="medium">
-        <button class="menu-icon" type="button" data-toggle></button>
-    </div>
-
-    <header class="hide-for-small hide-for-medium hide-for-large top-bar centered text-center">
-        <div id="main-menu">
-            @widgetArea('mainMenu')
-        </div>
-    </header>
-
-@endsection
-
-@section('content')
-    @php $images = $page->files()->where('mime_type', 'like', 'image%')->get(); @endphp
-    @if(count($images) > 0)
-        <div class="orbit" role="region" data-orbit
-             data-options="animationDuration:3000; animInFromLeft:fade-in; animInFromRight:fade-in; animOutToLeft:fade-out; animOutToRight:fade-out;">
-            <ul class="orbit-container">
-                @foreach($images as $i => $image)
-                    <li class="orbit-slide slow @if($i == 0) is-active @endif">
-                        <img class="orbit-image" src="@upload($image->filename)" alt="" />
-                    </li>
-                @endforeach
-            </ul>
-
-            <nav class="orbit-bullets">
-                @foreach($images as $i => $image)
-                    <button @if($i == 0) class="is-active" @endif data-slide="{{$i}}"></button>
-                @endforeach
-            </nav>
-        </div>
-
-        <header class="hide-for-small-only top-bar centered text-center">
-            @widgetArea('mainMenu')
-        </header>
-    @endif
-
-    <div class="row content-container">
-        {!! $page->pageContent !!}
-
-        <div class="text-center trainee-team">
-            <h2>{{$page->traineeTeamCategory->name}}</h2>
-
-            @foreach($page->traineeTeamCategory->content as $i => $subpage)
-                <div class="column text-center small-12 medium-{{ceil(12/count($page->traineeTeamCategory->content))}}"
-                     data-equalizer-watch>
-                    <a href="{{route('page.content', ['url' => $subpage->url])}}">
-                        @if(empty($subpage->titlePhoto))
-                            <img class="thumbnail" src="@asset('visitor/images/avatar.png')" alt="{{$subpage->title}}">
-                        @else
-                            <img class="thumbnail" src="@upload($subpage->titlePhoto)" alt="{{$subpage->title}}">
-                        @endif
-                        <h4>{{$subpage->title}}</h4>
-                    </a>
-                </div>
-            @endforeach
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/traineeTeam.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/traineeTeam.blade.php
new file mode 100644
index 00000000..7607183e
--- /dev/null
+++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/traineeTeam.blade.php
@@ -0,0 +1,23 @@
+@extendVisitor('defaultLayout')
+
+@section('bodyClass', 'photo-bg')
+
+@section('topMenu')
+    @include(\App\CMS\Helpers\Template::name('commonHeader'))
+@endsection
+
+@section('content')
+
+    @if (!empty($page->titlePhoto))
+        <div class="row title-photo">
+            <img src="@upload($page->titlePhoto)" alt="">
+        </div>
+    @endif
+    <div class="row content-container">
+        <h1>{{$page->title}}</h1>
+
+        {!! $page->pageContent !!}
+
+        @include('modules.staticpages.visitor._partials.traineeTeamList')
+    </div>
+@endsection
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php
index 1ff8c237..27e4acf9 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/trainer.blade.php
@@ -1,5 +1,7 @@
 @extendVisitor('defaultLayout')
 
+@section('bodyClass', 'photo-bg')
+
 @section('topMenu')
     @include(\App\CMS\Helpers\Template::name('commonHeader'))
 @endsection
diff --git a/templates/PragueTennisCamp/Resources/views/visitor/errors/layout.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/errors/layout.blade.php
index cbe5e295..88d50dbb 100644
--- a/templates/PragueTennisCamp/Resources/views/visitor/errors/layout.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/visitor/errors/layout.blade.php
@@ -4,8 +4,9 @@
     <meta charset="utf-8" />
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-    <link href='https://fonts.googleapis.com/css?family=Hind+Siliguri:400,500,700,300&amp;subset=latin,latin-ext'
-          rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,500,700&subset=latin-ext,latin' rel='stylesheet'
+          type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Comfortaa&amp;subset=latin-ext" rel="stylesheet">
     <link rel="stylesheet" href="{{asset_path('visitor/css/app.css')}}">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -13,88 +14,19 @@
     <title>@yield('pageTitle') | {{setting('pageName')}}</title>
 
     <style>
-
-        body {
-            font-size: 150%;
-            line-height: 150%;
-            position: relative;
-        }
-
-        h1 {
-            font-size: 4em;
-            font-weight: 100;
-            padding-top: 30px;
-        }
-
-        header {
-            background: #7cad2a;
-            padding: 30px 0;
-        }
-
-        footer {
-            position: absolute;
-            bottom: 0;
-            padding: 5px 0;
-        }
-
-        footer a {
-            color: white;
+        .content-container {
+            width: 75%;
+            margin: auto;
         }
     </style>
 </head>
-<body class="text-center">
+<body>
 
-<header>
-    <a href="{{route('page.index')}}">
-        <img src="{{asset_path('visitor/images/menu_logo.png')}}" class="PragueTennisCamp-logo-menu" alt="PragueTennisCamp s.r.o.">
-    </a>
-</header>
+<div class="row content-container">
+    <h1>@yield('pageTitle')</h1>
 
-<h1>@yield('pageTitle')</h1>
-
-<div class="row">
     @yield('content')
 </div>
 
-<footer id="footer">
-    @if (!empty(setting('facebookProfile')))
-
-        <a href="{{setting('facebookProfile')}}" target="_blank">
-            <i class="fa fa-fw fa-facebook-official fb-color"></i>
-        </a>
-    @endif
-
-    @if (!empty(setting('linkedInProfile')))
-        <a href="{{setting('linkedInProfile')}}" target="_blank">
-            <i class="fa fa-fw fa-linkedin in-color"></i>
-        </a>
-    @endif
-
-    @if(!empty(setting('gplusProfile')))
-        <a href="{{setting('gplusProfile')}}" target="_blank">
-            <i class="fa fa-fw fa-google-plus gp-color"></i>
-        </a>
-    @endif
-
-</footer>
-
-{{--<ul class="social-icons menu">--}}
-{{--<a href="{{setting('facebookProfile')}}" target="_blank">--}}
-{{--<i class="fa fa-fw fa-2x fa-facebook-official fb-color"></i>--}}
-{{--</a>--}}
-
-{{--<li>--}}
-{{--<a href="{{setting('linkedInProfile')}}" target="_blank">--}}
-{{--<i class="fa fa-fw fa-2x fa-linkedin in-color"></i>--}}
-{{--</a>--}}
-{{--</li>--}}
-
-{{--<li>--}}
-{{--<a href="{{setting('gplusProfile')}}" target="_blank">--}}
-{{--<i class="fa fa-fw fa-2x fa-google-plus gp-color"></i>--}}
-{{--</a>--}}
-{{--</li>--}}
-{{--</ul>--}}
-
 </body>
 </html>
\ No newline at end of file