diff --git a/content/errors/404.blade.php b/content/errors/404.blade.php
new file mode 100644
index 0000000..d8de9df
--- /dev/null
+++ b/content/errors/404.blade.php
@@ -0,0 +1,40 @@
+@extends('template.'.config('settings.template').'.content.master')
+@section('content')
+
+    <div class="container">
+        <h1>Seite nicht gefunden</h1>
+
+        <br>
+        <br>
+        <br>
+        <br>
+
+        <a href="{{url('/')}}">Zurück zur Startseite</a>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+        <br>
+
+    </div>
+
+
+
+
+@stop
\ No newline at end of file
diff --git a/content/head.blade.php b/content/head.blade.php
index c041c7e..c737034 100644
--- a/content/head.blade.php
+++ b/content/head.blade.php
@@ -8,6 +8,6 @@
     <link href="{{asset('template/css/main.css')}}" rel="stylesheet" >
 
 
-@include('template.'.config('settings.template').'.includes.integrations')
+@include('template.'.config('settings.template').'.content.includes.integrations')
 
 
diff --git a/content/index.blade.php b/content/index.blade.php
index eb506ee..b0a3d49 100644
--- a/content/index.blade.php
+++ b/content/index.blade.php
@@ -1,75 +1,78 @@
 @extends('template.'.config('settings.template').'.content.master')
 @section('content')
-    
-<div class="jumbotron  js--add-gradient">
+
+
+@section('content')
+
+    <div class="jumbotron  js--add-gradient">
+        <div class="container">
+            <div class="jumbotron__container">
+                <h2 class="jumbotron__subtitle">
+                    Wir verkaufen auf 5 verschiedenen Märkte unser
+                </h2>
+                <h1 class="jumbotron__title">
+                    Bio-Holzofenbrot
+                </h1>
+
+            </div>
+        </div>
+    </div>
+
+
+
+
+
     <div class="container">
-        <div class="jumbotron__container">
-            <h2 class="jumbotron__subtitle">
-                Wir verkaufen auf 5 verschiedenen Märkte unser
-            </h2>
-            <h1 class="jumbotron__title">
-                Bio-Holzofenbrot
-            </h1>
+        <div class="row">
+            <h1>Biohof Finkenhammer - Aktuelle Angebote und Informationen</h1>
+
+
+
 
         </div>
-    </div>
-</div>
+        <div class="row">
+            <div class="col-12">
+                <h2 id="aktuelles">Aktuelles</h2>
+                <br>
 
+            </div>
 
+            @foreach($nachrichten as $nach)
+                <div class="col-12 col-md-6 col-lg-4" style="margin-bottom: 80px;">
+                    <div class="card h-100 shadow-lg" id="news-{{$nach->id}}">
+                        @if ($nach->image)
+                            <img src="{{ asset('uploads/' . $nach->image) }}" class="img-responsive">
+                        @endif
+                        <div class="card-body">
+                            <h3 class="card-title">
+                                {{$nach->title}}
+                            </h3>
+                            <h7 class="card-subtitle mb-2">
+                                @if ($nach->user and $nach->user->public_author == 1)
+                                    <a   class="text-dark" href="{{ route('author.get', [$nach->user->slug]) }}">
+                                        <img src="{{ $nach->user->gravatar() }}" width="32" class="rounded-circle">
+                                        {{ $nach->user->name }}</a> -
+                                @endif
+                                <span style="font-weight: normal " class="text-dark">{{date('d.m.Y H:i', strtotime($nach->created_at))}}</span>
 
-
-
-<div class="container">
-    <div class="row">
-        <h1>Biohof Finkenhammer - Aktuelle Angebote und Informationen</h1>
-
-
-
-
-    </div>
-    <div class="row">
-        <div class="col-12">
-            <h2 id="aktuelles">Aktuelles</h2>
-            <br>
-
-        </div>
-
-        @foreach($nachrichten as $nach)
-            <div class="col-12 col-md-6 col-lg-4" style="margin-bottom: 80px;">
-                <div class="card h-100 shadow-lg" id="news-{{$nach->id}}">
-                    @if ($nach->image)
-                        <img src="{{ asset('uploads/' . $nach->image) }}" class="img-responsive">
-                    @endif
-                    <div class="card-body">
-                        <h3 class="card-title">
-                            {{$nach->title}}
-                        </h3>
-                        <h7 class="card-subtitle mb-2">
-                            @if ($nach->user and $nach->user->public_author == 1)
-                                <a   class="text-dark" href="{{ route('author.get', [$nach->user->slug]) }}">
-                                    <img src="{{ $nach->user->gravatar() }}" width="32" class="rounded-circle">
-                                    {{ $nach->user->name }}</a> -
-                            @endif
-                            <span style="font-weight: normal " class="text-dark">{{date('d.m.Y H:i', strtotime($nach->created_at))}}</span>
-
-                        </h7>
+                            </h7>
 
 
                             {!!Str::limit( $nach->nachrichten ,600)!!}
 
+                        </div>
                     </div>
                 </div>
-            </div>
 
-        @endforeach
+            @endforeach
+
+
+
+        </div>
+
 
 
 
     </div>
-
-
-
-
-</div>
     </div>
-@stop
+@stop
\ No newline at end of file
diff --git a/content/master.blade.php b/content/master.blade.php
index 8b5595f..d6791a7 100644
--- a/content/master.blade.php
+++ b/content/master.blade.php
@@ -6,11 +6,14 @@
 </head>
 
 <body>
+@include('template.'.config('settings.template').'.content.includes.header')
+
+
 
 @yield('content')
 
-@include('template.'.config('settings.template').'.includes.footer')
-@include('template.'.config('settings.template').'.includes.scripts')
+@include('template.'.config('settings.template').'.content.includes.footer')
+@include('template.'.config('settings.template').'.content.includes.scripts')
 
 
 
diff --git a/content/pages/baeckerei.blade.php b/content/pages/baeckerei.blade.php
index 8be9319..fc148ab 100644
--- a/content/pages/baeckerei.blade.php
+++ b/content/pages/baeckerei.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/bauernmarkt-vohenstrauss.blade.php b/content/pages/bauernmarkt-vohenstrauss.blade.php
index 0bc65a6..cd03a19 100644
--- a/content/pages/bauernmarkt-vohenstrauss.blade.php
+++ b/content/pages/bauernmarkt-vohenstrauss.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/bauernmarkt-weiden.blade.php b/content/pages/bauernmarkt-weiden.blade.php
index 5a33f7c..cd2a2de 100644
--- a/content/pages/bauernmarkt-weiden.blade.php
+++ b/content/pages/bauernmarkt-weiden.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/donaumarkt-regensburg.blade.php b/content/pages/donaumarkt-regensburg.blade.php
index ba185e2..9d76377 100644
--- a/content/pages/donaumarkt-regensburg.blade.php
+++ b/content/pages/donaumarkt-regensburg.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/foerderung.blade.php b/content/pages/foerderung.blade.php
index d89f6a2..55e5b86 100644
--- a/content/pages/foerderung.blade.php
+++ b/content/pages/foerderung.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
 
diff --git a/content/pages/hofladen-pleystein.blade.php b/content/pages/hofladen-pleystein.blade.php
index 5615525..f2f9b67 100644
--- a/content/pages/hofladen-pleystein.blade.php
+++ b/content/pages/hofladen-pleystein.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/huehnerhof.blade.php b/content/pages/huehnerhof.blade.php
index c9d9374..5b1ad42 100644
--- a/content/pages/huehnerhof.blade.php
+++ b/content/pages/huehnerhof.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/impressum.blade.php b/content/pages/impressum.blade.php
index afb4a94..c994199 100644
--- a/content/pages/impressum.blade.php
+++ b/content/pages/impressum.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/kontakt.blade.php b/content/pages/kontakt.blade.php
index 4095833..9ce1b8b 100644
--- a/content/pages/kontakt.blade.php
+++ b/content/pages/kontakt.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
     <div class="breadcrumbs">
         <div class="container">
diff --git a/content/pages/presse.blade.php b/content/pages/presse.blade.php
index 718b94c..6f665d4 100644
--- a/content/pages/presse.blade.php
+++ b/content/pages/presse.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 
 @section('content')
 
diff --git a/content/pages/ueber-uns.blade.php b/content/pages/ueber-uns.blade.php
index afe2a12..d846057 100644
--- a/content/pages/ueber-uns.blade.php
+++ b/content/pages/ueber-uns.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
 
diff --git a/content/pages/verkaufsstellen.blade.php b/content/pages/verkaufsstellen.blade.php
index af124c8..cff88d0 100644
--- a/content/pages/verkaufsstellen.blade.php
+++ b/content/pages/verkaufsstellen.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/wochenmarkt-burglengenfeld.blade.php b/content/pages/wochenmarkt-burglengenfeld.blade.php
index b6fe582..0e05687 100644
--- a/content/pages/wochenmarkt-burglengenfeld.blade.php
+++ b/content/pages/wochenmarkt-burglengenfeld.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">
diff --git a/content/pages/wochenmarkt-neutraubling.blade.php b/content/pages/wochenmarkt-neutraubling.blade.php
index 9023cdd..7780442 100644
--- a/content/pages/wochenmarkt-neutraubling.blade.php
+++ b/content/pages/wochenmarkt-neutraubling.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.master')
+@extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
     <div class="breadcrumbs">