diff --git a/content/index.blade.php b/content/index.blade.php
index 214b090..e90ace5 100644
--- a/content/index.blade.php
+++ b/content/index.blade.php
@@ -1,5 +1,13 @@
 @inject('type', 'Type')
 @extends('template.'.config('settings.template').'.content.master')
+
+@php
+    $typeAnkundigung = $type->get("Ankündigung");
+    $typeLeistungen = $type->get("Leistungen");
+    $typeNews = $type->get("News");
+    $typeProdukte = $type->get("Produkte");
+@endphp
+
 @section('head')
     <style>
         .block {
@@ -65,12 +73,12 @@
             </div>
         </div>
     </div>
-    @if($type->get("Ankündigung")->status)
-        @php($ankundigung = filterByContentType("Ankündigung"))
-        @if($ankundigung->isNotEmpty())
+    
+    @if($typeAnkundigung->status)
+        @if($typeAnkundigung->contents->isNotEmpty())
             <div class="container">
                 <div class="row pt-1 pt-lg-4">
-                    @foreach($ankundigung->take(3) as $content)
+                    @foreach($typeAnkundigung->contents->take(3) as $content)
                         <div class="col-12">
                             @isset($content->link)
                                 <a href="{{ $content->link }}" class="text-decoration-none" data-aos="fade-up">
@@ -105,16 +113,15 @@
             </div>
         @endif
     @endif
-    @if($type->get("Leistungen")->status)
-        @php($leistungen = filterByContentType("Leistungen"))
-        @if($leistungen->isNotEmpty())
+    @if($typeLeistungen->status)
+        @if($typeLeistungen->contents->isNotEmpty())
             <section>
                 <div class="container">
                     <div class="row">
                         <div class="col-12">
                             <h2 id="leistungen" class="mb-4">Leistungen</h2>
                         </div>
-                        @foreach($leistungen->take(3) as $contentIndex => $content)
+                        @foreach($typeLeistungen->contents->take(3) as $contentIndex => $content)
                             <a href="{{ $content->path }}" class="text-decoration-none">
                                 <div class="card mb-4" >
                                     <div class="row g-0">
@@ -131,7 +138,7 @@
                                 </div>
                             </a>
                         @endforeach
-                        @if($leistungen->count() > 3)
+                        @if($typeLeistungen->contents->count() > 3)
                         <div class="col-12 text-center mt-3">
                             <a href="{{url('/leistungen')}}" class="text-muted text-decoration-none">
                                 Alle Leistungen
@@ -146,16 +153,15 @@
             </section>
         @endif
     @endif
-    @if($type->get("News")->status)
-        @php($news = filterByContentType("News"))
-        @if($news->isNotEmpty())
+    @if($typeNews->status)
+        @if($typeNews->contents->isNotEmpty())
             <section id="article-section" style="margin-top:120px;">
                 <div class="container">
                     <div class="row">
                         <div class="col-12">
                             <h2 id="aktuelles" class="mb-4">Aktuelles</h2>
                         </div>
-                        @foreach($news->take(3) as $index => $content)
+                        @foreach($typeNews->contents->take(3) as $index => $content)
                             <div class="col-12 col-md-6 col-lg-4 mb-4" data-aos="fade-up" data-aos-delay="{{$index * 250}}">
                                 <div class="card shadow-sm h-100">
                                     <a href="{{ $content->path }}" class="text-decoration-none">
@@ -200,16 +206,15 @@
             </section>
         @endif
     @endif
-    @if($type->get("Produkte")->status)
-        @php($products = filterByContentType("Produkte"))
-        @if($products->isNotEmpty())
+    @if($typeProdukte->status)
+        @if($typeProdukte->contents->isNotEmpty())
             <section id="article-section" style="margin-top:120px;">
                 <div class="container">
                     <div class="row">
                         <div class="col-12">
                             <h2 id="aktuelles" class="mb-4">Produkte</h2>
                         </div>
-                        @foreach($products->take(3) as $content)
+                        @foreach($typeProdukte->contents->take(3) as $content)
                             <div class="col-12 col-md-6 col-lg-4 mb-4">
                                 <div class="card shadow-sm h-100">
                                     <a href="{{ $content->path }}" class="text-decoration-none">
diff --git a/content/master.blade.php b/content/master.blade.php
index 2189203..87e635f 100644
--- a/content/master.blade.php
+++ b/content/master.blade.php
@@ -1,4 +1,15 @@
 @inject('type', 'Type')
+
+@php
+    $typeAnkundigung = $type->get("Ankündigung");
+    $typeLeistungen = $type->get("Leistungen");
+    $typeNews = $type->get("News");
+    $typeProdukte = $type->get("Produkte");
+    $typeEvents = $type->get("Event");
+    $typeReferenzen = $type->get("Referenzen");
+    $typeJobs = $type->get("Jobs");
+@endphp
+
 <!doctype html>
 <html lang="de">
 <head>
@@ -80,24 +91,24 @@
                 </button>
                 <div class="collapse navbar-collapse justify-content-end" id="navbarSupportedContent">
                     <div class="navbar-nav fs-5">
-                        @if($type->get("Produkte")->status)
+                        @if($typeProdukte->status)
                             <a class="nav-item nav-link {{request()->is('produkt*')?'active':''}}" href="{{url('/produkte')}}">Produkte</a>
                         @endif
-                        @if($type->get("Leistungen")->status)
+                        @if($typeLeistungen->status)
                             <a class="nav-item nav-link {{request()->is('leistung*')?'active':''}}" href="{{url('/leistungen')}}">Leistungen</a>
                         @endif
-                        @if($type->get("News")->status)
+                        @if($typeNews->status)
                             <a class="nav-item nav-link {{request()->is('aktuelles*') || request()->is('news*')?'active':''}}" href="{{url('/aktuelles')}}">Aktuelles</a>
                         @endif
                         <a class="nav-item nav-link {{request()->is('ueber-uns*')?'active':''}}" href="{{url('/ueber-uns')}}">Über uns</a>
-                        @if($type->get("Referenzen")->status)
+                        @if($typeReferenzen->status)
                             <a class="nav-item nav-link {{request()->is('referenzen*')?'active':''}}" href="{{url('/referenzen')}}">Referenzen</a>
                         @endif
-                        @if($type->get("Referenzen")->status)
+                        @if($typeEvents->status)
                             <a class="nav-item nav-link {{request()->is('events*')?'active':''}}" href="{{url('/events')}}">Events</a>
                         @endif
 
-                        @if($type->get("Jobs")->status)
+                        @if($typeJobs->status)
                              <a class="nav-item nav-link {{request()->is('karriere*')?'active':''}}" href="{{url('/karriere')}}">Karriere</a>
                         @endif