diff --git a/.env.example b/.env.example
index dba86cf7..4744a660 100644
--- a/.env.example
+++ b/.env.example
@@ -16,4 +16,4 @@ MAIL_PASSWORD=
 
 SITE_URL=/
 UPLOAD_URL=/public/uploads
-THUMBNAILS_URL=/uploads/thumbnails
\ No newline at end of file
+THUMBNAIL_URL=/public/uploads/thumbnails
\ No newline at end of file
diff --git a/config/mail.php b/config/mail.php
index 56cc97fd..7c60a671 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -54,7 +54,10 @@ return [
     |
     */
 
-    'from' => ['address' => null, 'name' => null],
+    'from' => [
+        'address' => env('MAIL_FROM_ADDRESS', env('MAIL_USERNAME')),
+        'name'    => env('MAIL_FROM_NAME', '')
+    ],
 
     /*
     |--------------------------------------------------------------------------
diff --git a/templates/PragueTennisCamp/Resources/assets/css/app.css b/templates/PragueTennisCamp/Resources/assets/css/app.css
index a0bc0841..07fa0b2e 100644
--- a/templates/PragueTennisCamp/Resources/assets/css/app.css
+++ b/templates/PragueTennisCamp/Resources/assets/css/app.css
@@ -139,6 +139,10 @@ header.top-bar h1 a {
 	line-height: 20%;
 }
 
+.trainee-team ul {
+	list-style: none;
+}
+
 .trainee-team h2, .trainee-team h3, .trainee-team h4 {
 	font-size: 130%;
 }
@@ -161,6 +165,17 @@ header.top-bar h1 a {
 	margin-top: 2em;
 }
 
+.required input, .required textarea {
+	float: left;
+	width: calc(100% - 13px);
+}
+.required:after {
+	color: red;
+	content: ' *';
+	float: right;
+	margin-top: 4%;
+}
+
 #footer {
 	margin-bottom: 50px;
 	width: 98%;
diff --git a/templates/PragueTennisCamp/Resources/assets/js/app.js b/templates/PragueTennisCamp/Resources/assets/js/app.js
index 441b9994..08bc823d 100644
--- a/templates/PragueTennisCamp/Resources/assets/js/app.js
+++ b/templates/PragueTennisCamp/Resources/assets/js/app.js
@@ -1,7 +1,7 @@
 $(document).foundation()
 
 $ ('#formSend').click (function () {
-	$ (this).value = 'Odesílám...';
+	$ (this).value = '...';
 
 	var form = $(this).closest('form');
 
@@ -16,6 +16,6 @@ $ ('#formSend').click (function () {
 		} else {
 			alert (resp.message);
 		}
-		$ (this).value = "ODESLAT";
+		$ (this).value = "Senden";
 	});
 });
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php
index e7d99aae..1f80f1c1 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/_partials/form.blade.php
@@ -1,31 +1,31 @@
 <form action="{{route('email.send', ['formId' => $page->id])}}" method="post">
     {!! csrf_field() !!}
-    <div class="column medium-4">
-        <input class="large" placeholder="jméno a příjmení" name="name" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="Nachname" name="name" type="text">
     </div>
-    <div class="column medium-4">
-        <input class="large" placeholder="telefon" name="phone" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="Vorname" name="surname" type="text">
     </div>
-    <div class="column medium-4">
-        <input class="large" placeholder="e-mail" name="email" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="E-mail" name="email" type="text">
     </div>
 
 
-    <div class="column medium-4">
-        <input class="large" placeholder="počet osob" name="personCount" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="Anzahl Personen" name="personCount" type="text">
     </div>
-    <div class="column medium-4">
-        <input class="large" placeholder="termín od" name="from" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="Anreise" name="from" type="text">
     </div>
 
-    <div class="column medium-4">
-        <input class="large" placeholder="termín do" name="to" type="text">
+    <div class="column required medium-4">
+        <input required class="large" placeholder="Abreise" name="to" type="text">
     </div>
 
-    <div class="column medium-12">
-        <textarea class="large" placeholder="zpráva" name="message"></textarea>
+    <div class="column required medium-12">
+        <textarea required class="large" placeholder="Nachricht" name="message"></textarea>
     </div>
     <div class="column medium-6 right">
-        <a href="#" class="button expanded long secondary" id="formSend">ODESLAT</a>
+        <button type="submit" class="button expanded long secondary" id="formSend">Senden</button>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php
index a7e2e69b..e74e5256 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php
@@ -4,17 +4,19 @@
     @include(\App\CMS\Helpers\Template::name('commonHeader'))
 @endsection
 
+@section('bodyClass', 'photo-bg')
+
 
 @section('content')
 
     <div class="row content-container">
 
         <div class="column text-center m-b-25 show-for-large">
-            <h2>Kontakt</h2>
+            <h2>{{$page->title}}</h2>
         </div>
 
         <div class="column text-center large-4">
-            <h2 class="hide-for-large">Kontakt</h2>
+            <h2 class="hide-for-large">{{$page->title}}</h2>
 
             <h4>{{$page->moduleSettings['companyName']}}</h4>
 
diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/emails/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/emails/default.blade.php
index e69de29b..7630f472 100644
--- a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/emails/default.blade.php
+++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/emails/default.blade.php
@@ -0,0 +1,8 @@
+<p>Nová zpráva od {{$data->name}} {{$data->surname}}</p>
+<p>E-mail: {{$data->email}}</p>
+<p>Od: {{$data->from}}</p>
+<p>Do: {{$data->to}}</p>
+<p>Osob: {{$data->personCount}}</p>
+<p>
+    {{$data->message}}
+</p>
\ No newline at end of file