diff --git a/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php b/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php
index b7a065e0..8bc621ad 100644
--- a/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php
+++ b/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php
@@ -8,14 +8,14 @@
         <div class="medium-12 large-6 column columns p-lr-0 contact-detail">
             <div class="column text-right large-12 medium-6 p-lr-0">
                 <h2 class="hide-for-large">Kontakt</h2>
-                <p class="contact-p green-text"><b>{{$page->module_settings->companyName}}</b></p>
+                <p class="contact-p green-text"><b>{{$page->module_settings->companyName or "Název společnosti"}}</b></p>
                 <p class="contact-p">
-                    {!! nl2br($page->module_settings->address) !!}
+                    {!! nl2br($page->module_settings->address) or "Ulice<br>PSČ a Město<br>IČO" !!}
                     <br>
                     <br>
                     -<br>
-                    tel.: {{$page->module_settings->phone}}<br>
-                    e-mail: <a href="mailto:{{$page->module_settings->email}}">{{$page->module_settings->email}}</a></p>
+                    tel.: {{$page->module_settings->phone or "Telefonní kontakt"}}<br>
+                    e-mail: <a href="mailto:{{$page->module_settings->email or "e-mail"}}">{{$page->module_settings->email or "e-mail"}}</a></p>
                 <br>
             </div>
             <div id="map" class="column large-12 medium-6 p-lr-0" style="height: 250px;"></div>
@@ -47,13 +47,13 @@
                     {!! csrf_field() !!}
                     <div class="column medium-6">
                         <input class="rounded large" placeholder="jméno a příjmení" name="name" type="text">
-                        <input class="rounded large" placeholder="e-mail" name="email" type="text">
                     </div>
                     <div class="column medium-6">
                         <input class="rounded large" placeholder="telefon" name="phone" type="text">
-                        <input class="rounded large" placeholder="počet kusů" name="pieces" type="text">
+                        {{--<input class="rounded large" placeholder="počet kusů" name="pieces" type="text">--}}
                     </div>
                     <div class="column medium-12">
+                        <input class="rounded large" placeholder="e-mail" name="email" type="text">
                         <textarea class="rounded large" placeholder="zpráva" name="message"></textarea>
                     </div>
                     <div class="column medium-4">