diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 6627a7ebd55be3e2fad1c85d695649581bb12c8e..3c8cd00899fdc6a961e98155227cca6bf17c0b55 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -43,7 +43,9 @@ class StartpageController extends Controller
             ->with('time', $request->input('param_time', '1000'))
             ->with('sprueche', $request->input('param_sprueche', 'off'))
             ->with('tab', $request->input('param_sprueche', 'off'))
-            ->with('focusPages', $focusPages);
+            ->with('focusPages', $focusPages)
+            ->with('navbarFocus', 'suche');
+
     }
 
     public function loadPage($subpage)
@@ -138,7 +140,8 @@ class StartpageController extends Controller
             ->with('foki', $foki)
             ->with('title', 'Einstellungen')
             ->with('css', 'settings.css')
-            ->with('js', ['settings.js']);
+            ->with('js', ['settings.js'])
+            ->with('navbarFocus', 'suche');
         die(var_dump($foki));
 
         return $xml->saveXML();
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 23648ff8638571ca344141d220cb8bec530d62ce..65af63edc149adafaef6d58bd3348c781a5faf5a 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -11,89 +11,99 @@
 |
 */
 
-    Route::group(
-        [
-            'prefix' => LaravelLocalization::setLocale(), 
-            'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]
-        ], 
-        function()
-        {
-        /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
+	Route::group(
+		[
+			'prefix' => LaravelLocalization::setLocale(), 
+			'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]
+		], 
+		function()
+		{
+		/** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
 
-        Route::get('/', 'StartpageController@loadStartPage');
+		Route::get('/', 'StartpageController@loadStartPage');
 
-        Route::get('impressum', function()
-        {
-            return view('impressum')
-                ->with('title', trans('titles.impressum'))
-                ->with('css', 'impressum.css');
-        });
+		Route::get('impressum', function()
+		{
+			return view('impressum')
+				->with('title', trans('titles.impressum'))
+				->with('css', 'impressum.css')
+				->with('navbarFocus', 'kontakt');
+		});
 
-        Route::get('about', function()
-        {
-            return view('about')
-                ->with('title', trans('titles.about'))
-                ->with('css', 'about.css');
-        });
-        Route::get('team', function()
-        {
-            return view('team.team')
-                ->with('title', trans('titles.team'))
-                ->with('css', 'team.css');
-        });
-        Route::get('team/pubkey-wsb', function()
-        {
-            return view('team.pubkey-wsb')
-                ->with('title', trans('titles.team'));
-        });
+		Route::get('about', function()
+		{
+			return view('about')
+				->with('title', trans('titles.about'))
+				->with('css', 'about.css')
+				->with('navbarFocus', 'kontakt');
+		});
+		Route::get('team', function()
+		{
+			return view('team.team')
+				->with('title', trans('titles.team'))
+				->with('css', 'team.css')
+				->with('navbarFocus', 'kontakt');
+		});
+		Route::get('team/pubkey-wsb', function()
+		{
+			return view('team.pubkey-wsb')
+				->with('title', trans('titles.team'))
+				->with('navbarFocus', 'kontakt');
+		});
 
-        Route::get('kontakt', function()
-        {
-            return view('kontakt.kontakt')
-                ->with('title', trans('titles.kontakt'))
-                ->with('css', 'kontakt.css')
-                ->with('js', ['openpgp.min.js','kontakt.js']);
-        });
+		Route::get('kontakt', function()
+		{
+			return view('kontakt.kontakt')
+				->with('title', trans('titles.kontakt'))
+				->with('css', 'kontakt.css')
+				->with('js', ['openpgp.min.js','kontakt.js'])
+				->with('navbarFocus', 'kontakt');
+		});
 
-        Route::post('kontakt', 'MailController@contactMail');
+		Route::post('kontakt', 'MailController@contactMail');
 
-        Route::get('spende', function()
-        {
-            return view('spende')
-                ->with('title', trans('titles.spende'))
-                ->with('css', 'donation.css');
-        });
-        Route::post('spende', 'MailController@donation');
+		Route::get('spende', function()
+		{
+			return view('spende')
+				->with('title', trans('titles.spende'))
+				->with('css', 'donation.css')
+				->with('navbarFocus', 'foerdern');
+		});
+		
+		Route::post('spende', 'MailController@donation');
 
-        Route::get('datenschutz', function()
-        {
-            return view('datenschutz')
-                ->with('title', trans('titles.datenschutz'))
-                ->with('css', 'privacy.css');
-        });
+		Route::get('datenschutz', function()
+		{
+			return view('datenschutz')
+				->with('title', trans('titles.datenschutz'))
+				->with('css', 'privacy.css')
+				->with('navbarFocus', 'datenschutz');
+		});
 
-        Route::get('hilfe', function()
-        {
-            return view('hilfe')
-                ->with('title', trans('titles.hilfe'))
-                ->with('css', 'help.css');
-        });
+		Route::get('hilfe', function()
+		{
+			return view('hilfe')
+				->with('title', trans('titles.hilfe'))
+				->with('css', 'help.css')
+				->with('navbarFocus', 'dienste');
+		});
 
-        Route::get('widget', function()
-        {
-            return view('widget')
-                ->with('title', trans('titles.widget'))
-                ->with('css', 'widget.css');
-        });
-        
-        Route::get('settings', 'StartpageController@loadSettings');
+		Route::get('widget', function()
+		{
+			return view('widget')
+				->with('title', trans('titles.widget'))
+				->with('css', 'widget.css')
+				->with('navbarFocus', 'dienste');
+		});
+		
+		Route::get('settings', 'StartpageController@loadSettings');
 
-        
-        Route::get('meta/meta.ger3', 'MetaGerSearch@search');
-        Route::get('meta/picture', 'Pictureproxy@get');
-        Route::get('clickstats', 'LogController@clicklog');
+		
+		Route::get('meta/meta.ger3', 'MetaGerSearch@search');
+		Route::get('meta/picture', 'Pictureproxy@get');
+		Route::get('clickstats', 'LogController@clicklog');
 
-        Route::get('qt', 'MetaGerSearch@quicktips');
-        Route::get('tips', 'MetaGerSearch@tips');
-        Route::get('opensearch.xml', 'StartpageController@loadPlugin');
-    });
+		Route::get('qt', 'MetaGerSearch@quicktips');
+		Route::get('tips', 'MetaGerSearch@tips');
+		Route::get('opensearch.xml', 'StartpageController@loadPlugin');
+	});
diff --git a/public/css/503.css b/public/css/503.css
new file mode 100644
index 0000000000000000000000000000000000000000..497bd97249ddcf2ea7a695f7029bb900399fd71c
--- /dev/null
+++ b/public/css/503.css
@@ -0,0 +1,29 @@
+html, body {
+	height: 100%;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	color: #B0BEC5;
+	display: table;
+	font-weight: 100;
+	font-family: 'Lato';
+}
+
+.container {
+	text-align: center;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.content {
+	text-align: center;
+	display: inline-block;
+}
+
+.title {
+	font-size: 72px;
+	margin-bottom: 40px;
+}
diff --git a/public/css/quicktips.css b/public/css/quicktips.css
new file mode 100644
index 0000000000000000000000000000000000000000..3cda80cd19d82bda9fda26b5708acdb78b6de941
--- /dev/null
+++ b/public/css/quicktips.css
@@ -0,0 +1,43 @@
+.quicktip {
+	margin-bottom:15px;
+	padding: 10px;
+	line-height: 1.2 !important;
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+	color: #000;
+	border-left: 3px solid #FB0;
+	font-size: 14px;
+}
+
+.wikiqtextract {
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.wikiqtextract p {
+	margin-bottom:0;
+}
+
+.quicktip a {
+	color: #00F;
+}
+
+.qtheader {
+	font-family: verdana,arial,helvetica,sans-serif;
+}
+
+.mutelink {
+	color:black!important;
+}
+
+#spruch {
+	margin-bottom:20px;
+	padding: 5px;
+	line-height: 1.2 !important;
+	color: #070;
+	border-left: 3px solid #070;
+	font-size: 16px;
+	font-family: Georgia,"Times New Roman",Palatino,Times,serif;
+}
+
+.author {
+	float: right !important;
+}
diff --git a/public/css/welcome.css b/public/css/welcome.css
new file mode 100644
index 0000000000000000000000000000000000000000..ba69802a283394b6b19577df300767800c327af6
--- /dev/null
+++ b/public/css/welcome.css
@@ -0,0 +1,27 @@
+html, body {
+	height: 100%;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	display: table;
+	font-weight: 100;
+	font-family: 'Lato';
+}
+
+.container {
+	text-align: center;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.content {
+	text-align: center;
+	display: inline-block;
+}
+
+.title {
+	font-size: 96px;
+}
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index e93d6dc965542477e3e52e4ad92ca7b535d786c3..d2bdfad30632ce094b0df5a4109770def71a701f 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -6,12 +6,11 @@
 <h1>{{ trans('about.head.1') }}</h1>
 <h3>{{ trans('about.head.2') }}</h3>
 <ul id="about-list">
-  <li>{{ trans('about.list.1') }} <a href="/datenschutz/">{{ trans('about.list.2') }}...</a></li>
-  <li>{{ trans('about.list.3') }} 
-    <a href="/spende/">{{ trans('about.list.4') }}</a> {{ trans('about.list.5') }}</li>
-  <li><a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> {{ trans('about.list.6') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">{{ trans('about.list.7') }} </a>{{ trans('about.list.8') }}</li>
-  <li>{{ trans('about.list.9') }} 
-    <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank">{{ trans('about.list.10') }}</a> {{ trans('about.list.11') }}</li>
-  <li><a href="http://blog.suma-ev.de/node/207" target="_blank">{{ trans('about.list.12') }}</a>{{ trans('about.list.13') }}</li>
-  <li> {{ trans('about.list.14') }} <a href="https://metager.de/kontakt/" target="_blank">{{ trans('about.list.15') }}</a> {{ trans('about.list.16') }} </li></ul>
+	<li>{{ trans('about.list.1') }} <a href="/datenschutz/">{{ trans('about.list.2') }}...</a></li>
+	<li>{{ trans('about.list.3') }} <a href="/spende/">{{ trans('about.list.4') }}</a> {{ trans('about.list.5') }}</li>
+	<li><a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> {{ trans('about.list.6') }}  <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">{{ trans('about.list.7') }} </a>{{ trans('about.list.8') }}</li>
+	<li>{{ trans('about.list.9') }} <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank">{{ trans('about.list.10') }}</a> {{ trans('about.list.11') }}</li>
+	<li><a href="http://blog.suma-ev.de/node/207" target="_blank">{{ trans('about.list.12') }}</a>{{ trans('about.list.13') }}</li>
+	<li> {{ trans('about.list.14') }} <a href="https://metager.de/kontakt/" target="_blank">{{ trans('about.list.15') }}</a> {{ trans('about.list.16') }} </li>
+</ul>
 @endsection
\ No newline at end of file
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
index 0db0c2a86da48a8d7993400e3bda1e9488d82637..a67c093ad654274f0748678a6a8b64dadd064b64 100644
--- a/resources/views/datenschutz.blade.php
+++ b/resources/views/datenschutz.blade.php
@@ -2,22 +2,23 @@
 
 @section('title', $title )
 
+@section('navbarFocus.datenschutz', 'class="active"')
+
 @section('content')
-        <h1>{{ trans('datenschutz.head') }}</h1>
-        <p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p>
-        <h2>{{ trans('datenschutz.policy.1') }}</h2>
-        <ul id="privacyList"><li>{{ trans('datenschutz.policy.2') }} <a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank">{{ trans('datenschutz.policy.3') }}</a> {{ trans('datenschutz.policy.4') }}</li>
-          <li>{{ trans('datenschutz.policy.5') }}</li>
-          <li>{{ trans('datenschutz.policy.6') }}</li>
-          <li>{{ trans('datenschutz.policy.7') }} 
-            <a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43&amp;sid=c994b628153235dfef098ba6fea3d60e" target="_blank">{{ trans('datenschutz.policy.8') }}</a></li>
-          <li>{{ trans('datenschutz.policy.9') }}</li>
-          <li>{{ trans('datenschutz.policy.10') }} <a href="/spende/">{{ trans('datenschutz.policy.11') }}</a> {{ trans('datenschutz.policy.12') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a>.</li>
-          <li>{{ trans('datenschutz.policy.13') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('datenschutz.policy.14') }} <a href="http://www.uni-hannover.de/" target="_blank">{{ trans('datenschutz.policy.15') }}</a> {{ trans('datenschutz.policy.16') }}</li>
-          <li>{{ trans('datenschutz.policy.17') }}</li>
-          <li>{{ trans('datenschutz.policy.18') }} <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">{{ trans('datenschutz.policy.19') }}</a> {{ trans('datenschutz.policy.20') }} <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">{{ trans('datenschutz.policy.21') }}</a> {{ trans('datenschutz.policy.22') }}</li></ul>
-        <h2>{{ trans('datenschutz.twitter') }}</h2>
-        <pre><p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
+<h1>{{ trans('datenschutz.head') }}</h1>
+<p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p>
+<h2>{{ trans('datenschutz.policy.1') }}</h2>
+<ul id="privacyList"><li>{{ trans('datenschutz.policy.2') }} <a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank">{{ trans('datenschutz.policy.3') }}</a> {{ trans('datenschutz.policy.4') }}</li>
+	<li>{{ trans('datenschutz.policy.5') }}</li>
+	<li>{{ trans('datenschutz.policy.6') }}</li>
+	<li>{{ trans('datenschutz.policy.7') }} <a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43&amp;sid=c994b628153235dfef098ba6fea3d60e" target="_blank">{{ trans('datenschutz.policy.8') }}</a></li>
+	<li>{{ trans('datenschutz.policy.9') }}</li>
+	<li>{{ trans('datenschutz.policy.10') }} <a href="/spende/">{{ trans('datenschutz.policy.11') }}</a> {{ trans('datenschutz.policy.12') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a>.</li>
+	<li>{{ trans('datenschutz.policy.13') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('datenschutz.policy.14') }} <a href="http://www.uni-hannover.de/" target="_blank">{{ trans('datenschutz.policy.15') }}</a> {{ trans('datenschutz.policy.16') }}</li>
+	<li>{{ trans('datenschutz.policy.17') }}</li>
+	<li>{{ trans('datenschutz.policy.18') }} <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">{{ trans('datenschutz.policy.19') }}</a> {{ trans('datenschutz.policy.20') }} <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">{{ trans('datenschutz.policy.21') }}</a> {{ trans('datenschutz.policy.22') }}</li></ul>
+<h2>{{ trans('datenschutz.twitter') }}</h2>
+<pre><p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
 &gt; MetaGer d&uuml;rfte im Moment die sicherste Suchmaschine weltweit sein</p>
 <p>&gt; 8.4.2014 Stiftung Datenschutz @DS_Stiftung
 &gt; Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinn&uuml;tzige
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 4a4150592d41e7059ff87d200fe3bb9362642537..625330e0841981bcd9efcab75abafe3d55d10b3b 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -1,47 +1,15 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <title>Be right back.</title>
-
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                color: #B0BEC5;
-                display: table;
-                font-weight: 100;
-                font-family: 'Lato';
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 72px;
-                margin-bottom: 40px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Be right back.</div>
-            </div>
-        </div>
-    </body>
+	<head>
+		<title>Be right back.</title>
+		<link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
+		<link rel="stylesheet" type="text/css" href="/css/503.css" />
+	</head>
+	<body>
+		<div class="container">
+			<div class="content">
+				<div class="title">Be right back.</div>
+			</div>
+		</div>
+	</body>
 </html>
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index c3965921d74396e736bb792a8b5b0234817579f7..fcc857e96d5a74797e700c767fd9b5c65db98a9e 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -7,26 +7,36 @@
 <p>{{ trans('hilfe.head.2') }}</p>
 <h2>{{ trans('hilfe.help.1') }}</h2>
 <h3>{{ trans('hilfe.help.2') }}</h3>
-<ul><li>{{ trans('hilfe.help.3') }}</li>
-  <li>{{ trans('hilfe.help.4') }}</li>
-  <li>{{ trans('hilfe.help.5') }}</li></ul>
+<ul>
+	<li>{{ trans('hilfe.help.3') }}</li>
+	<li>{{ trans('hilfe.help.4') }}</li>
+	<li>{{ trans('hilfe.help.5') }}</li>
+</ul>
 <h2>{{ trans('hilfe.help.6') }}</h2>
 <h3>{{ trans('hilfe.help.7') }}</h3>
-<ul><li>{{ trans('hilfe.help.8') }}</li></ul>
+<ul>
+	<li>{{ trans('hilfe.help.8') }}</li>
+</ul>
 <h4>{{ trans('hilfe.help.9') }}</h4>
-<ul><li>{{ trans('hilfe.help.10') }}</li>
-  <li>{{ trans('hilfe.help.11') }}</li>
-  <li>{{ trans('hilfe.help.12') }}</li>
-  <li>{{ trans('hilfe.help.13') }}</li></ul>
+<ul>
+	<li>{{ trans('hilfe.help.10') }}</li>
+	<li>{{ trans('hilfe.help.11') }}</li>
+	<li>{{ trans('hilfe.help.12') }}</li>
+	<li>{{ trans('hilfe.help.13') }}</li>
+</ul>
 <h3>{{ trans('hilfe.help.14') }}</h3>
 <p>{{ trans('hilfe.help.15') }}</p>
 <h2>{{ trans('hilfe.help.16') }}</h2>
 <h3>{{ trans('hilfe.help.17') }}</h3>
-<ul><li>{{ trans('hilfe.help.18') }}</li>
-<li>{{ trans('hilfe.help.19') }}</li></ul>
+<ul>
+	<li>{{ trans('hilfe.help.18') }}</li>
+	<li>{{ trans('hilfe.help.19') }}</li>
+</ul>
 <h3>{{ trans('hilfe.help.20') }}</h3>
 <p>{{ trans('hilfe.help.21') }}</p>
-<ul><li>{{ trans('hilfe.help.22') }}</li></ul>
+<ul>
+	<li>{{ trans('hilfe.help.22') }}</li>
+</ul>
 <h3>{{ trans('hilfe.help.23') }}</h3>
 <p>{{ trans('hilfe.help.24') }}</p>
 <h3>{{ trans('hilfe.help.25') }}</h3>
@@ -38,65 +48,77 @@
 <p>{{ trans('hilfe.help.35') }}</p>
 <p>{{ trans('hilfe.help.36') }} <a class="collapsed" href="#faq">MetaGer FAQ</a> {{ trans('hilfe.help.37') }} <a href="https://metager.de/kontakt/" target="_blank">Mail.</a></p>
 <h1 id="faq">{{ trans('hilfe.faq.1') }}</h1>
-<ol><li><p>{{ trans('hilfe.faq.2') }}</p>
-    <p>{{ trans('hilfe.faq.3') }}</p></li>
-    <li><p>{{ trans('hilfe.faq.4') }}</p>
-    <p>{{ trans('hilfe.faq.5') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.6') }}</p>
-    <p>{{ trans('hilfe.faq.7') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">Wikipedia</a>, {{ trans('hilfe.faq.8') }}</p></li>
-  <li>{{ trans('hilfe.faq.9') }}</li>
-  <ul><li>{{ trans('hilfe.faq.10') }}</li>
-    <li>{{ trans('hilfe.faq.11') }} <a href="http://www.klug-suchen.de/" target="_blank">klug-suchen.de.</a></li></ul>
-  <li><p>{{ trans('hilfe.faq.12') }}</p>
-    <p>{{ trans('hilfe.faq.13') }}</p></li>
-  <li>{{ trans('hilfe.faq.14') }}</li>
-  <p>{{ trans('hilfe.faq.15') }}</p>
-  <ul><li>{{ trans('hilfe.faq.16') }}</li>
-    <li>{{ trans('hilfe.faq.17') }}</li></ul>
-    <li><p>{{ trans('hilfe.faq.18') }}</p>
-    <p>{{ trans('hilfe.faq.19') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.20') }}</p>
-    <p>{{ trans('hilfe.faq.21') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.22') }}</p>
-   <p>{{ trans('hilfe.faq.23') }}</p></li>
-  <li>
-    <p>{{ trans('hilfe.faq.24') }}</p>
-    <p>{{ trans('hilfe.faq.25') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.26') }}</p></li>
-  <ul><li>{{ trans('hilfe.faq.27') }}</li>
-    <li>{{ trans('hilfe.faq.28') }}</li>
-    <li>{{ trans('hilfe.faq.29') }}</li></ul>
-  <p>{{ trans('hilfe.faq.30') }} <a href="mailto:jugendschutz@metager.de" class="link">{{ trans('hilfe.faq.31') }}</a></p>
-  <li><p>{{ trans('hilfe.faq.32') }}</p>
-      <p>{{ trans('hilfe.faq.33') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.34') }}</p>
-    <p>{{ trans('hilfe.faq.35') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.36') }}</p>
-    <p>{{ trans('hilfe.faq.37') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.38') }}</p>
-    <p>{{ trans('hilfe.faq.39') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.40') }}</p>
-    <p>{{ trans('hilfe.faq.41') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.42') }}</p>
-    <p>{{ trans('hilfe.faq.43') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.44') }}</p>
-    <p>{{ trans('hilfe.faq.45') }}</p>
-    <p>{{ trans('hilfe.faq.46') }}</p>
-    <p>{{ trans('hilfe.faq.47') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.48') }}</p>
-    <p>{{ trans('hilfe.faq.49') }}</p>
-    <p>{{ trans('hilfe.faq.50') }}</p>
-    <ul><li><p>{{ trans('hilfe.faq.51') }}</p></li>
-      <li><p>{{ trans('hilfe.faq.52') }} <a href="https://metager.de/hilfe/#TORanleitung" target="_blank">{{ trans('hilfe.faq.53') }}</a> {{ trans('hilfe.faq.54') }}</p></li>
-      <li><p>{{ trans('hilfe.faq.55') }}</p></li>
-      <li><p>{{ trans('hilfe.faq.56') }}</p></li></ul></li>
-  <li><p>{{ trans('hilfe.faq.57') }}</p>
-    <p>{{ trans('hilfe.faq.58') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.59') }}</p>
-    <p>{{ trans('hilfe.faq.60') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.61') }}</p>
-    <p>{{ trans('hilfe.faq.62') }}</p></li>
-  <li><p>{{ trans('hilfe.faq.63') }}</p>
-    <p>{{ trans('hilfe.faq.64') }} <a href="https://metager.de/tor/" target="_blank">https://metager.de/tor/</a></p>
-    <p>{{ trans('hilfe.faq.65') }}</p></li></ol>
+<ol>
+	<li><p>{{ trans('hilfe.faq.2') }}</p>
+		<p>{{ trans('hilfe.faq.3') }}</p></li>
+		<li><p>{{ trans('hilfe.faq.4') }}</p>
+		<p>{{ trans('hilfe.faq.5') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.6') }}</p>
+		<p>{{ trans('hilfe.faq.7') }} <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">Wikipedia</a>, {{ trans('hilfe.faq.8') }}</p></li>
+	<li>{{ trans('hilfe.faq.9') }}</li>
+	<ul>
+		<li>{{ trans('hilfe.faq.10') }}</li>
+		<li>{{ trans('hilfe.faq.11') }} <a href="http://www.klug-suchen.de/" target="_blank">klug-suchen.de.</a></li>
+	</ul>
+	<li><p>{{ trans('hilfe.faq.12') }}</p>
+		<p>{{ trans('hilfe.faq.13') }}</p></li>
+	<li>{{ trans('hilfe.faq.14') }}</li>
+	<p>{{ trans('hilfe.faq.15') }}</p>
+	<ul>
+		<li>{{ trans('hilfe.faq.16') }}</li>
+		<li>{{ trans('hilfe.faq.17') }}</li>
+	</ul>
+	<li><p>{{ trans('hilfe.faq.18') }}</p>
+		<p>{{ trans('hilfe.faq.19') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.20') }}</p>
+		<p>{{ trans('hilfe.faq.21') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.22') }}</p>
+	 <p>{{ trans('hilfe.faq.23') }}</p></li>
+	<li>
+		<p>{{ trans('hilfe.faq.24') }}</p>
+		<p>{{ trans('hilfe.faq.25') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.26') }}</p></li>
+	<ul>
+		<li>{{ trans('hilfe.faq.27') }}</li>
+		<li>{{ trans('hilfe.faq.28') }}</li>
+		<li>{{ trans('hilfe.faq.29') }}</li>
+	</ul>
+	<p>{{ trans('hilfe.faq.30') }} <a href="mailto:jugendschutz@metager.de" class="link">{{ trans('hilfe.faq.31') }}</a></p>
+	<li><p>{{ trans('hilfe.faq.32') }}</p>
+			<p>{{ trans('hilfe.faq.33') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.34') }}</p>
+		<p>{{ trans('hilfe.faq.35') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.36') }}</p>
+		<p>{{ trans('hilfe.faq.37') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.38') }}</p>
+		<p>{{ trans('hilfe.faq.39') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.40') }}</p>
+		<p>{{ trans('hilfe.faq.41') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.42') }}</p>
+		<p>{{ trans('hilfe.faq.43') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.44') }}</p>
+		<p>{{ trans('hilfe.faq.45') }}</p>
+		<p>{{ trans('hilfe.faq.46') }}</p>
+		<p>{{ trans('hilfe.faq.47') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.48') }}</p>
+		<p>{{ trans('hilfe.faq.49') }}</p>
+		<p>{{ trans('hilfe.faq.50') }}</p>
+		<ul>
+			<li><p>{{ trans('hilfe.faq.51') }}</p></li>
+			<li><p>{{ trans('hilfe.faq.52') }} <a href="https://metager.de/hilfe/#TORanleitung" target="_blank">{{ trans('hilfe.faq.53') }}</a> {{ trans('hilfe.faq.54') }}</p></li>
+			<li><p>{{ trans('hilfe.faq.55') }}</p></li>
+			<li><p>{{ trans('hilfe.faq.56') }}</p></li>
+		</ul>
+	</li>
+	<li><p>{{ trans('hilfe.faq.57') }}</p>
+		<p>{{ trans('hilfe.faq.58') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.59') }}</p>
+		<p>{{ trans('hilfe.faq.60') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.61') }}</p>
+		<p>{{ trans('hilfe.faq.62') }}</p></li>
+	<li><p>{{ trans('hilfe.faq.63') }}</p>
+		<p>{{ trans('hilfe.faq.64') }} <a href="https://metager.de/tor/" target="_blank">https://metager.de/tor/</a></p>
+		<p>{{ trans('hilfe.faq.65') }}</p>
+	</li>
+</ol>
 @endsection
\ No newline at end of file
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index eba25528fe3383434b4e56a1085dcff69ae06cad..37d5faaf2c95289e5867cc567c49cf7329f8acec 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -2,6 +2,10 @@
 
 @section('title', $title )
 
+@section('navbarFocus.search', 'class="active"')
+
+@section('navbarFocus.donate', 'class="dropdown"')
+
 @section('content')
 	<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
       <div class="modal-dialog ">
@@ -20,7 +24,7 @@
       </div>
     </div>
 	 <h1 id="mglogo">
-            <a class="hidden-xs" href="/">MetaGer
+            <a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer
             </a>
           </h1>
           <figure>
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 600bf8c9f6e0be94bc1b8e95c1d4c1c9bdf12913..6e1e3db689f18dea5f6ee891cad90241230f7b54 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -2,14 +2,13 @@
 		<div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
 			{{ $result->number }})
 		</div>
-
 		@if( $result->image !== "" )
-		<div class="image col-xs-2 col-sm-1">
-			<img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
-		</div>
-		<div class="resultInformation col-xs-10 col-sm-10">
+			<div class="image col-xs-2 col-sm-1">
+				<img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
+			</div>
+			<div class="resultInformation col-xs-10 col-sm-10">
 		@else
-		<div class="resultInformation col-xs-12 col-sm-11">
+			<div class="resultInformation col-xs-12 col-sm-11">
 		@endif
 			<p class="title">
 				<a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 04035280cc429f12f75f91a3b583893e0e220781..55511408d59ae30af0d1909ff60fe9a016eebfb0 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -2,65 +2,61 @@
 <html>
 
 <head>
-    <title>{{ $metager->getQ() }} - MetaGer</title>
-    <link href="/css/bootstrap.css" rel="stylesheet" />
-    <link href="/css/styleResultPage.css" rel="stylesheet" />
-    @if( isset($mobile) && $mobile )
-    <link href="/css/styleResultPageMobile.css" rel="stylesheet" />
-    @endif
-    <link href="/css/theme.css.php" rel="stylesheet" />
-    <link href="/favicon.ico" rel="icon" type="image/x-icon" />
-    <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-    <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
-    <meta content="{{ getmypid() }}" name="p" />
-    <meta content="{{ $eingabe }}" name="q" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>{{ $metager->getQ() }} - MetaGer</title>
+	<link href="/css/bootstrap.css" rel="stylesheet" />
+	<link href="/css/styleResultPage.css" rel="stylesheet" />
+	@if( isset($mobile) && $mobile )
+		<link href="/css/styleResultPageMobile.css" rel="stylesheet" />
+	@endif
+	<link href="/css/theme.css.php" rel="stylesheet" />
+	<link href="/favicon.ico" rel="icon" type="image/x-icon" />
+	<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+	<meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
+	<meta content="{{ getmypid() }}" name="p" />
+	<meta content="{{ $eingabe }}" name="q" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
-
 <body id="resultBody">
-    
-    @if( !isset($suspendheader) )
-    @include('layouts.researchandtabs')
-    @else
-    <div class="tab-content container-fluid">
-    @if( sizeof($errors) > 0 )
-    <div class="alert alert-danger">
-        <ul>
-            @foreach($errors as $error)
-            <li>{{ $error }}</li>
-            @endforeach
-        </ul>
-    </div>
-    @endif
-    @if( sizeof($warnings) > 0)
-    <div class="alert alert-warning">
-        <ul>
-            @foreach($warnings as $warning)
-            <li>{{ $warning }}</li>
-            @endforeach
-        </ul>
-    </div>
-    @endif
-    @yield('results')
-    </div>
-    @endif
-        
-    <footer>
-        <div class="row">
-            <div class="col-xs-6">
-                <a class="btn btn-default" href="/">MetaGer-Startseite</a>
-            </div>
-            <div class="col-xs-6">
-                <a class="btn btn-default" href="/impressum/">Impressum</a>
-            </div>
-        </div>
-    </footer>
-    <script src="/js/jquery.js" type="text/javascript"></script>
-    <script src="/js/bootstrap.js" type="text/javascript"></script>
-    <script src="/js/masonry.js" type="text/javascript"></script>
-    <script src="/js/imagesloaded.js" type="text/javascript"></script>
-    <script src="/js/scriptResultPage.js" type="text/javascript"></script>
-    <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
+	@if( !isset($suspendheader) )
+		@include('layouts.researchandtabs')
+	@else
+		<div class="tab-content container-fluid">
+	@if( sizeof($errors) > 0 )
+		<div class="alert alert-danger">
+			<ul>
+				@foreach($errors as $error)
+				<li>{{ $error }}</li>
+				@endforeach
+			</ul>
+		</div>
+	@endif
+	@if( sizeof($warnings) > 0)
+		<div class="alert alert-warning">
+			<ul>
+				@foreach($warnings as $warning)
+					<li>{{ $warning }}</li>
+				@endforeach
+			</ul>
+		</div>
+	@endif
+	@yield('results')
+		</div>
+	@endif
+	<footer>
+		<div class="row">
+			<div class="col-xs-6">
+				<a class="btn btn-default" href="/">MetaGer-Startseite</a>
+			</div>
+			<div class="col-xs-6">
+				<a class="btn btn-default" href="/impressum/">Impressum</a>
+			</div>
+		</div>
+	</footer>
+	<script src="/js/jquery.js" type="text/javascript"></script>
+	<script src="/js/bootstrap.js" type="text/javascript"></script>
+	<script src="/js/masonry.js" type="text/javascript"></script>
+	<script src="/js/imagesloaded.js" type="text/javascript"></script>
+	<script src="/js/scriptResultPage.js" type="text/javascript"></script>
+	<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
 </body>
-
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 9fed8dc8029af53c59d93ce4f21ad3a53f0e3150..f5af5723aed0fac3c7cbd1f83bddb4acf6210b57 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -1,183 +1,122 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>@yield('title')</title>
-        <meta charset="utf-8" />
-        <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsph&auml;re. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zug&auml;nglich sein und bleiben." />
-        <meta name="keywords" content="Internetsuche, privatsph&auml;re, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
-        <meta name="page-topic" content="Dienstleistung" />
-        <meta name="robots" content="index,follow" />
-        <meta name="revisit-after" content="7 days" />
-        <meta name="audience" content="all" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-        <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
-        <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-        <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen &amp; finden, Privatsph&auml;re sch&uuml;tzen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
-        <link href="/css/bootstrap.css" rel="stylesheet" />
-        <link href="/css/style.css" rel="stylesheet" />
-        @if (isset($css))
-        <link href="/css/{{ $css }}" rel="stylesheet" />
-        @endif
-        <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
-    </head>
-    <body>
-        <header>
-          <nav class="navbar navbar-default">
-            <div class="container">
-              <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
-                  <span class="sr-only">{{ trans('staticPages.navigationToggle') }}
-                  </span>
-                  <span class="icon-bar">
-                  </span>
-                  <span class="icon-bar">
-                  </span>
-                  <span class="icon-bar">
-                  </span>
-                </button>
-              </div>
-              <div>
-                @yield('homeIcon')
-              </div>
-              <div class="collapse navbar-collapse" id="navbar-collapse">
-                <ul class="nav navbar-nav navbar-right">
-                  <li>
-                    <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}
-                    </a>
-                  </li>
-                  <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
-                      <span class="caret">
-                      </span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl">{{ trans('staticPages.nav17') }}
-                        </a>
-                      </li>
-                    </ul>
-                  </li>
-                  <li>
-                    <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}
-                    </a>
-                  </li>
-                  <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
-                      <span class="caret">
-                      </span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      <li>
-                        <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}
-                        </a>
-                      </li>
-                    </ul>
-                  </li>
-                  <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
-                      <span class="caret">
-                      </span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}
-                        </a>
-                      </li>
-                      <li>
-                        <a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }}
-                        </a>
-                      </li>
-                    </ul>
-                  </li>
-                  <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
-                      <span class="caret"></span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
-                      <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
-                      @endforeach
-                    </ul>
-                  </li>
-                </ul>
-              </div>
-            </div>
-          </nav>
-        </header>
-
-        <div class="wrapper">
-            <main class="mg-panel container">
-                @if (isset($success))
-                  <div class="alert alert-success" role="alert">{{ $success }}</div>
-                @endif
-                @if (isset($error))
-                  <div class="alert alert-danger" role="alert">{{ $error }}</div>
-                @endif
-                @yield('content')
-            </main>
-            @yield('optionalContent')
-            <footer>
-              <ul class="list-inline hidden-xs">
-                <li>
-                  <a href="https://www.suma-ev.de/" target="_blank">
-                    <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo">
-                  </a>
-                </li>
-                <li id="info">
-                  <a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a>
-                  {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a>
-                </li>
-                <li>
-                  <a href="https://www.uni-hannover.de/" target="_blank">
-                    <img src="/img/luh_metager.png" alt="LUH Logo">
-                  </a>
-                </li>
-              </ul>
-            </footer>
-            <script type="text/javascript" src="/js/jquery.js"></script>
-            <script type="text/javascript" src="/js/bootstrap.js"></script>
-            <script type="text/javascript" src="/js/scriptStartPage.js"></script>
-	    @if (isset($js))
-	    	@foreach ($js as $script)
-            		<script type="text/javascript" src="/js/{{ $script }}"></script>
-            	@endforeach
-	    @endif
-            <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
-    </body>
+	<head>
+		<title>@yield('title')</title>
+		<meta charset="utf-8" />
+		<meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsph&auml;re. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zug&auml;nglich sein und bleiben." />
+		<meta name="keywords" content="Internetsuche, privatsph&auml;re, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
+		<meta name="page-topic" content="Dienstleistung" />
+		<meta name="robots" content="index,follow" />
+		<meta name="revisit-after" content="7 days" />
+		<meta name="audience" content="all" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+		<meta rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen &amp; finden, Privatsph&auml;re sch&uuml;tzen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
+		<link href="/css/bootstrap.css" rel="stylesheet" />
+		<link href="/css/style.css" rel="stylesheet" />
+		@if (isset($css))
+			<link href="/css/{{ $css }}" rel="stylesheet" />
+		@endif
+		<link id="theme" href="/css/theme.css.php" rel="stylesheet" />
+	</head>
+	<body>
+		<header>
+			<nav class="navbar navbar-default">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
+							<span class="sr-only">{{ trans('staticPages.navigationToggle') }}</span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+						</button>
+					</div>
+					<div>
+						@yield('homeIcon')
+					</div>
+					<div class="collapse navbar-collapse" id="navbar-collapse">
+						<ul class="nav navbar-nav navbar-right">
+							<li @if ($navbarFocus === 'suche') class="active" @endif >
+								<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
+							<li @if ($navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
+								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
+								<span class="caret"></span></a>
+								<ul class="dropdown-menu">
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a></li>
+									<li><a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl">{{ trans('staticPages.nav17') }}</a></li>
+								</ul>
+							</li>
+							<li @if ($navbarFocus === 'datenschutz') class="active" @endif >
+								<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
+							<li @if ($navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
+								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
+								<span class="caret"></span></a>
+								<ul class="dropdown-menu">
+									<li><a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a></li>
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a></li>
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a></li>
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a></li>
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
+								</ul>
+							</li>
+							<li @if ($navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
+								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
+								<span class="caret"></span></a>
+								<ul class="dropdown-menu">
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}</a></li>
+									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a></li>
+									<li><a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}</a></li>
+									<li><a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}</a></li>
+									<li><a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}</a></li>
+									<li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
+								<span class="caret"></span></a>
+								<ul class="dropdown-menu">
+									@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
+										<li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
+									@endforeach
+								</ul>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</nav>
+		</header>
+		<div class="wrapper">
+			<main class="mg-panel container">
+				@if (isset($success))
+					<div class="alert alert-success" role="alert">{{ $success }}</div>
+				@endif
+				@if (isset($error))
+					<div class="alert alert-danger" role="alert">{{ $error }}</div>
+				@endif
+				@yield('content')
+			</main>
+			@yield('optionalContent')
+			<footer>
+				<ul class="list-inline hidden-xs">
+					<li><a href="https://www.suma-ev.de/" target="_blank">
+						<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a></li>
+					<li id="info">
+						<a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a>
+						{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a></li>
+					<li><a href="https://www.uni-hannover.de/" target="_blank">
+						<img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
+				</ul>
+			</footer>
+			<script type="text/javascript" src="/js/jquery.js"></script>
+			<script type="text/javascript" src="/js/bootstrap.js"></script>
+			<script type="text/javascript" src="/js/scriptStartPage.js"></script>
+			@if (isset($js))
+				@foreach ($js as $script)
+					<script type="text/javascript" src="/js/{{ $script }}"></script>
+				@endforeach
+			@endif
+			<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
+		</div>
+	</body>
 </html>
diff --git a/resources/views/layouts/subPages.blade.php b/resources/views/layouts/subPages.blade.php
index c6ab157c5476b6338cad56ff7adda99ee3eb2be0..26a618702e695d084df9bee7390e3b8cf23a19de 100644
--- a/resources/views/layouts/subPages.blade.php
+++ b/resources/views/layouts/subPages.blade.php
@@ -1,10 +1,9 @@
 @extends('layouts.staticPages')
 
 @section('homeIcon')
-<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"">
-				  <div class="logo">
-				    <h1>MetaGer
-				    </h1>
-				  </div>
-				</a>
-@endsection
\ No newline at end of file
+	<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+		<div class="logo">
+			<h1>MetaGer</h1>
+		</div>
+	</a>
+@endsection
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 87aec49caa45c747334d565f109ac100d0b4089f..2c78a240eecf34ed06e9d644c8b03231b15131d6 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,32 +1,29 @@
 @extends('layouts.resultPage')
 
 @section('results')
-
-@if( $metager->showQuicktips() )
-<div class="col-xs-12 col-md-8 resultContainer">
-@else
-<div class="col-xs-12 col-md-12 resultContainer">
-@endif
-	{{-- 3-Mal Werbung --}}
-	@for($i = 0; $i <= 2; $i++)
-		@include('layouts.ad', ['ad' => $metager->popAd()])
-	@endfor
-
-	@foreach($metager->getResults()->items() as $result)
-		@if($result->number % 7 === 0)
-		@include('layouts.ad', ['ad' => $metager->popAd()])
-		@endif
-		@include('layouts.result', ['result' => $result])
-	@endforeach
-	<nav class="pager">
-        {!! $metager->getResults()->links() !!}
-    </nav>
-</div>
-@if( $metager->showQuicktips() )
-<div class="hidden-xs col-md-4" id="quicktips">
-	<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
-</div>
-@endif
-
+	@if( $metager->showQuicktips() )
+		<div class="col-xs-12 col-md-8 resultContainer">
+	@else
+		<div class="col-xs-12 col-md-12 resultContainer">
+	@endif
+			{{-- 3-Mal Werbung --}}
+			@for($i = 0; $i <= 2; $i++)
+				@include('layouts.ad', ['ad' => $metager->popAd()])
+			@endfor
+			@foreach($metager->getResults()->items() as $result)
+				@if($result->number % 7 === 0)
+					@include('layouts.ad', ['ad' => $metager->popAd()])
+				@endif
+				@include('layouts.result', ['result' => $result])
+			@endforeach
+			<nav class="pager">
+				{!! $metager->getResults()->links() !!}
+			</nav>
+		</div>
+	@if( $metager->showQuicktips() )
+		<div class="hidden-xs col-md-4" id="quicktips">
+			<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
+		</div>
+	@endif
 @endsection
 
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index d5f267f77547df5a3b451f4fbcef62fc60795971..13606769d5199525ecf8680ad3f9c666e16351c4 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -1,20 +1,17 @@
 @extends('layouts.resultPage')
 
 @section('results')
-
-<div id="container">
-@foreach($metager->getResults()->items() as $result)
-	<div class="item">
-		<div class="img">
-			<a href="{{ $result->link }}" target="{{ $metager->getTab() }}">
-			<img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/>
-			</a>
+	<div id="container">
+	@foreach($metager->getResults()->items() as $result)
+		<div class="item">
+			<div class="img">
+				<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/></a>
+			</div>
 		</div>
+	@endforeach
 	</div>
-@endforeach
-</div>
-<nav class="pager">
-        {!! $metager->getResults()->links() !!}
-</nav>
+	<nav class="pager">
+		{!! $metager->getResults()->links() !!}
+	</nav>
 @endsection
 
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index 249135498207446410e730e0ac7aaa8e0a251423..fde7799d86579f8f2a609963f5a3b902f45d0035 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/resources/views/metager3bilderresults.blade.php
@@ -1,14 +1,12 @@
 <div id="container">
-@foreach($metager->getResults()->items() as $result)
-	<div class="item">
-		<div class="img">
-			<a href="{{ $result->link }}" target="{{ $metager->getTab() }}">
-			<img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/>
-			</a>
+	@foreach($metager->getResults()->items() as $result)
+		<div class="item">
+			<div class="img">
+				<a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="Bild nicht gefunden"/></a>
+			</div>
 		</div>
-	</div>
-@endforeach
+	@endforeach
 </div>
 <nav class="pager">
-        {!! $metager->getResults()->links() !!}
+	{!! $metager->getResults()->links() !!}
 </nav>
\ No newline at end of file
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index d5bc429fc226fc2ea769a97210e2c64d5e5672ad..2338ae9d01a1116c1d1bcbf5bd14d6b1428e4218 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -3,16 +3,15 @@
 	@for($i = 0; $i <= 2; $i++)
 		@include('layouts.ad', ['ad' => $metager->popAd()])
 	@endfor
-
 	@foreach($metager->getResults()->items() as $result)
 		@if($result->number % 7 === 0)
-		@include('layouts.ad', ['ad' => $metager->popAd()])
+			@include('layouts.ad', ['ad' => $metager->popAd()])
 		@endif
 		@include('layouts.result', ['result' => $result])
 	@endforeach
 	<nav class="pager">
-        {!! $metager->getResults()->links() !!}
-    </nav>
+		{!! $metager->getResults()->links() !!}
+	</nav>
 </div>
 <div class="hidden-xs col-md-4" id="quicktips">
 	<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 6713f695e6fda0ea0f868cc264004b660771690b..ff49d5a056033ca2a837b17a27605ada395ef151 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -2,69 +2,20 @@
 	<head>
 		<title>MetaGer Quicktips</title>
 		<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
-		<style>
-			.quicktip {
-				margin-bottom:15px;
-				padding: 10px;
-				line-height: 1.2 !important;
-			    font-family: Georgia,"Times New Roman",Palatino,Times,serif;
-			    color: #000;
-			    border-left: 3px solid #FB0;
-			    font-size: 14px;
-			}
-
-			.wikiqtextract {
-			    font-family: Georgia,"Times New Roman",Palatino,Times,serif;
-			}
-
-			.wikiqtextract p {
-				margin-bottom:0;
-			}
-
-			.quicktip a {
-			    color: #00F;
-			}
-
-			.qtheader {
-				font-family: verdana,arial,helvetica,sans-serif;
-			}
-
-			.mutelink {
-				color:black!important;
-			}
-
-			#spruch {
-				margin-bottom:20px;
-				padding: 5px;
-				line-height: 1.2 !important;
-			    color: #070;
-			    border-left: 3px solid #070;
-			    font-size: 16px;
-			    font-family: Georgia,"Times New Roman",Palatino,Times,serif;
-			}
-
-			.author {
-				float: right !important;
-			}
-		</style>
+		<link rel="stylesheet" type="text/css" href="/css/quicktips.css" />
 	</head>
 	<body>
-	@if( $spruch !== "" )
-	<blockquote id="spruch">{!! $spruch !!}</blockquote>
-	@endif
-
-	@foreach( $mqs as $mq)
-		<div class="quicktip">
-			<b class="qtheader">
-				<a href="{{ $mq['URL'] }}" target="_blank">{{ $mq['title'] }}</a>
-			</b>
-			<br />
-			<div>{!! $mq['descr'] !!}</div>
-			@if( isset($mq['gefVon']) )
-			<div class="pull-right">{!! $mq['gefVon'] !!}</div>
-			@endif
-		</div>
-	@endforeach
-
+		@if( $spruch !== "" )
+			<blockquote id="spruch">{!! $spruch !!}</blockquote>
+		@endif
+		@foreach( $mqs as $mq)
+			<div class="quicktip">
+				<b class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank">{{ $mq['title'] }}</a></b><br>
+				<div>{!! $mq['descr'] !!}</div>
+				@if( isset($mq['gefVon']) )
+					<div class="pull-right">{!! $mq['gefVon'] !!}</div>
+				@endif
+			</div>
+		@endforeach
 	</body>
 </html>
\ No newline at end of file
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index b96b1d739c2e456501cd09b371b2e4d8961761db..37ca78a872be4c725d5649fb4e6f7ba598d1ff04 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -3,250 +3,312 @@
 @section('title', $title )
 
 @section('content')
-<form action="/" method="get">
-  <h1>{{ trans('settings.head.1') }}</h1>
-  <p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
-  <h2>{{ trans('settings.allgemein.1') }}</h2>
-  <input type="hidden" name="focus" value="angepasst">
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label></div>
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label></div>
-  <label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
-  <select class="form-control" name="param_lang">
-    <option value="all">{{ trans('settings.allgemein.5') }}</option>
-    <option value="de">{{ trans('settings.allgemein.6') }}</option></select>
-  <label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
-  <select class="form-control" name="param_resultCount">
-    <option value="10">10</option>
-    <option value="20" selected>20</option>
-    <option value="50">50</option>
-    <option value="100">100</option>
-    <option value="0">{{ trans('settings.allgemein.8') }}</option></select>
-  <label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
-  <select class="form-control" name="param_time">
-    <option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
-    <option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
-    <option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
-    <option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
-    <option value="20000">20 {{ trans('settings.allgemein.11') }}</option></select>
-  <h2>{{ trans('settings.suchmaschinen.1') }}</h2>
-  <div class="headingGroup web">
-    <h3>{{ trans('settings.suchmaschinen.2') }}:
-      <small><a data-type="web" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
-    <div class="row">
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_fastbot">Fastbot</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.fastbot.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_wikipedia">Wikipedia</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.wikipedia.org/wiki/Wikipedia:Hauptseite"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_witch">Witch</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.witch.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_dmoz">Dmoz</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_overture">Yahoo</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.yahoo.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_yacy">YaCy</label><a class="glyphicon glyphicon-link" target="_blank" href="http://yacy.de/de/index.html"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_nebel">Netluchs</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_exalead">Exalead</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.exalead.com/search/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_yandex">Yandex</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.yandex.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_zeitde">Die ZEIT</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.zeit.de/index"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label></div></div></div></div>
-  <div class="headingGroup nachrichten">
-    <h3>{{ trans('settings.suchmaschinen.6') }}:
-      <small><a data-type="nachrichten" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
-    <div class="row">
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_nebelfeed">Netluchs Twitter</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a></div></div></div></div>
-  <div class="headingGroup wissenschaft">
-    <h3>{{ trans('settings.suchmaschinen.7') }}:
-      <small><a data-type="wissenschaft" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
-    <div class="row">
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_tuhh">TUBdok</label><a class="glyphicon glyphicon-link" target="_blank" href="https://tubdok.tub.tuhh.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_MetaGer-QIP">MetaGer-QIP</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_pubmed">PubMed</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ncbi.nlm.nih.gov/pubmed/"></a></div></div></div></div>
-  <div class="headingGroup produktsuche">
-    <h3>{{ trans('settings.suchmaschinen.8') }}:
-      <small><a data-type="produktsuche" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
-    <div class="row">
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_ebay">Ebay</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ebay.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_mg_produkt">MetaGer {{ trans('settings.suchmaschinen.9') }}</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_mg_produkt2">MetaGer {{ trans('settings.suchmaschinen.9') }}</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_ecoshopper">Ecoshopper</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ecoshopper.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_similar_product">Ladenpreis</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ladenpreis.net/"></a></div></div></div></div>
-  <div class="headingGroup others">
-    <h3>{{ trans('settings.suchmaschinen.10') }}:
-      <small><a data-type="others" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
-    <div class="row">
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_allesklar">AllesKlar</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.allesklar.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_dmozint">dmoz international</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.org/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_harvest">CampusSearch</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_wikis">Wikis</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_bing">Bing</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.bing.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_fportal">Forschung</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_suchticker">Suchticker</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_tauchen">OpenCrawl ({{ trans('settings.suchmaschinen.11') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=tauchen&amp;query=&amp;hitsPerPage=10&amp;hitsPerSite=1"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_regengergie">OpenCrawl ({{ trans('settings.suchmaschinen.12') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=ernenerg"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_astronomie">OpenCrawl ({{ trans('settings.suchmaschinen.13') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=astronom"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_goyax">{{ trans('settings.suchmaschinen.14') }} (goyax)</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.goyax.de/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_stackexchange">Stackoverflow (Q&amp;A)</label><a class="glyphicon glyphicon-link" target="_blank" href="https://stackoverflow.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_dart">DartEurope</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dart-europe.eu/basic-search.php"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_beammachine">Beam Machine</label></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspageAll">OneNewspage ({{ trans('settings.suchmaschinen.15') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_onenewspagegermanyAll">OneNewspage ({{ trans('settings.suchmaschinen.16') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a></div></div>
-      <div class="col-sm-6 col-md-4 col-lg-3">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="param_loklak">loklak</label><a class="glyphicon glyphicon-link" target="_blank" href="http://loklak.org/"></a></div></div></div></div>
-  <input id="unten" type="submit" class="btn btn-primary" value="Startseite f&uuml;r einmalige Nutzung generieren">
-  <input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
-  <input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
-  <input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zur&uuml;cksetzen"></form>
+	<form action="/" method="get">
+		<h1>{{ trans('settings.head.1') }}</h1>
+		<p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
+		<h2>{{ trans('settings.allgemein.1') }}</h2>
+		<input type="hidden" name="focus" value="angepasst">
+		<div class="checkbox">
+			<label><input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label>
+		</div>
+		<div class="checkbox">
+			<label><input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label>
+		</div>
+		<label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
+		<select class="form-control" name="param_lang">
+			<option value="all">{{ trans('settings.allgemein.5') }}</option>
+			<option value="de">{{ trans('settings.allgemein.6') }}</option>
+		</select>
+		<label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
+		<select class="form-control" name="param_resultCount">
+			<option value="10">10</option>
+			<option value="20" selected>20</option>
+			<option value="50">50</option>
+			<option value="100">100</option>
+			<option value="0">{{ trans('settings.allgemein.8') }}</option>
+		</select>
+		<label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
+		<select class="form-control" name="param_time">
+			<option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
+			<option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
+			<option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
+			<option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
+			<option value="20000">20 {{ trans('settings.allgemein.11') }}</option>
+		</select>
+		<h2>{{ trans('settings.suchmaschinen.1') }}</h2>
+		<div class="headingGroup web">
+			<h3>{{ trans('settings.suchmaschinen.2') }}:
+				<small><a data-type="web" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+			<div class="row">
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_fastbot">Fastbot</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.fastbot.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_wikipedia">Wikipedia</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.wikipedia.org/wiki/Wikipedia:Hauptseite"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_witch">Witch</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.witch.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_dmoz">Dmoz</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_overture">Yahoo</label><a class="glyphicon glyphicon-link" target="_blank" href="https://de.yahoo.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_yacy">YaCy</label><a class="glyphicon glyphicon-link" target="_blank" href="http://yacy.de/de/index.html"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_nebel">Netluchs</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_exalead">Exalead</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.exalead.com/search/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_yandex">Yandex</label><a class="glyphicon glyphicon-link" target="_blank" href="https://www.yandex.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_zeitde">Die ZEIT</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.zeit.de/index"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="headingGroup nachrichten">
+			<h3>{{ trans('settings.suchmaschinen.6') }}:
+				<small><a data-type="nachrichten" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+			<div class="row">
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_nebelfeed">Netluchs Twitter</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.netluchs.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspage">OneNewspage</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagevideo">OneNewspage ({{ trans('settings.suchmaschinen.4') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/videos.htm"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagegermany">OneNewspage ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagegermanyvideo">OneNewspage Video ({{ trans('settings.suchmaschinen.5') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/videos.htm"></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="headingGroup wissenschaft">
+			<h3>{{ trans('settings.suchmaschinen.7') }}:
+				<small><a data-type="wissenschaft" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+			<div class="row">
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_tuhh">TUBdok</label><a class="glyphicon glyphicon-link" target="_blank" href="https://tubdok.tub.tuhh.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_BASE">BASE</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.base-search.net/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_MetaGer-QIP">MetaGer-QIP</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_minism">Minisucher SUMA-Lab</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_pubmed">PubMed</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ncbi.nlm.nih.gov/pubmed/"></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="headingGroup produktsuche">
+			<h3>{{ trans('settings.suchmaschinen.8') }}:
+				<small><a data-type="produktsuche" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+			<div class="row">
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_ebay">Ebay</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ebay.de/"></a>
+					</div>
+					</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_mg_produkt">MetaGer {{ trans('settings.suchmaschinen.9') }}</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_mg_produkt2">MetaGer {{ trans('settings.suchmaschinen.9') }}</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_ecoshopper">Ecoshopper</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ecoshopper.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_similar_product">Ladenpreis</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.ladenpreis.net/"></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="headingGroup others">
+			<h3>{{ trans('settings.suchmaschinen.10') }}:
+				<small><a data-type="others" class="checker"> ({{ trans('settings.suchmaschinen.3') }})</a></small></h3>
+			<div class="row">
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_allesklar">AllesKlar</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.allesklar.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_dmozint">dmoz international</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dmoz.org/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_harvest">CampusSearch</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_wikis">Wikis</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_bing">Bing</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.bing.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_fportal">Forschung</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_suchticker">Suchticker</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_tauchen">OpenCrawl ({{ trans('settings.suchmaschinen.11') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=tauchen&amp;query=&amp;hitsPerPage=10&amp;hitsPerSite=1"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_regengergie">OpenCrawl ({{ trans('settings.suchmaschinen.12') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=ernenerg"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_astronomie">OpenCrawl ({{ trans('settings.suchmaschinen.13') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.opencrawl.de/opencrawl/search.jsp?subcollection=astronom"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_goyax">{{ trans('settings.suchmaschinen.14') }} (goyax)</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.goyax.de/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_stackexchange">Stackoverflow (Q&amp;A)</label><a class="glyphicon glyphicon-link" target="_blank" href="https://stackoverflow.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_dart">DartEurope</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.dart-europe.eu/basic-search.php"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_beammachine">Beam Machine</label>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspageAll">OneNewspage ({{ trans('settings.suchmaschinen.15') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.onenewspage.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_onenewspagegermanyAll">OneNewspage ({{ trans('settings.suchmaschinen.16') }})</label><a class="glyphicon glyphicon-link" target="_blank" href="http://www.newsdeutschland.com/"></a>
+					</div>
+				</div>
+				<div class="col-sm-6 col-md-4 col-lg-3">
+					<div class="checkbox">
+						<label><input type="checkbox" name="param_loklak">loklak</label><a class="glyphicon glyphicon-link" target="_blank" href="http://loklak.org/"></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<input id="unten" type="submit" class="btn btn-primary" value="Startseite f&uuml;r einmalige Nutzung generieren">
+		<input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
+		<input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
+		<input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zur&uuml;cksetzen">
+	</form>
 @endsection
\ No newline at end of file
diff --git a/resources/views/settings1.blade.php b/resources/views/settings1.blade.php
index b09f689a9537673a011a591e48778ce8ca364777..fe1bf0f74070b714ebe1eb631253aab168111c78 100644
--- a/resources/views/settings1.blade.php
+++ b/resources/views/settings1.blade.php
@@ -3,61 +3,61 @@
 @section('title', $title )
 
 @section('content')
-<form action="/" method="get">
-  <h1>{{ trans('settings.head.1') }}</h1>
-  <p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
-  <h2>{{ trans('settings.allgemein.1') }}</h2>
-  <input type="hidden" name="focus" value="angepasst">
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label></div>
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label></div>
-  <label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
-  <select class="form-control" name="param_lang">
-    <option value="all">{{ trans('settings.allgemein.5') }}</option>
-    <option value="de">{{ trans('settings.allgemein.6') }}</option></select>
-  <label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
-  <select class="form-control" name="param_resultCount">
-    <option value="10">10</option>
-    <option value="20" selected>20</option>
-    <option value="50">50</option>
-    <option value="100">100</option>
-    <option value="0">{{ trans('settings.allgemein.8') }}</option></select>
-  <label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
-  <select class="form-control" name="param_time">
-    <option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
-    <option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
-    <option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
-    <option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
-    <option value="20000">20 {{ trans('settings.allgemein.11') }}</option></select>
-  <h2>{{ trans('settings.suchmaschinen.1') }}</h2>
-	@foreach( $foki as $fokus => $sumas )
-	<div class="headingGroup {{ $fokus }}">
-		<h3>
-			{{ ucfirst($fokus) }}
-			<small>
-				<a class="checker" data-type="{{ $fokus }}">(alle an-/abwählen)</a>
-			</small>
-		</h3>
-		<div class="row">
-			@foreach( $sumas as $name => $data )
-			<div class="col-sm-6 col-md-4 col-lg-3">
-				<div class="checkbox">
-					<label>
-						<input name="param_{{ $data['service'] }}" type="checkbox" />{{ $data['displayName'] }}
-					</label>
-					<a class="glyphicon glyphicon-link" target="_blank" href="{{ $data['url'] }}"></a>
+	<form action="/" method="get">
+		<h1>{{ trans('settings.head.1') }}</h1>
+		<p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
+		<h2>{{ trans('settings.allgemein.1') }}</h2>
+		<input type="hidden" name="focus" value="angepasst">
+		<div class="checkbox">
+			<label><input type="checkbox" name="param_sprueche">{{ trans('settings.allgemein.2') }}</label>
+		</div>
+		<div class="checkbox">
+			<label><input type="checkbox" name="param_tab">{{ trans('settings.allgemein.3') }}</label>
+		</div>
+		<label class="select-label">{{ trans('settings.allgemein.4') }}:</label>
+		<select class="form-control" name="param_lang">
+			<option value="all">{{ trans('settings.allgemein.5') }}</option>
+			<option value="de">{{ trans('settings.allgemein.6') }}</option></select>
+		<label class="select-label">{{ trans('settings.allgemein.7') }}:</label>
+		<select class="form-control" name="param_resultCount">
+			<option value="10">10</option>
+			<option value="20" selected>20</option>
+			<option value="50">50</option>
+			<option value="100">100</option>
+			<option value="0">{{ trans('settings.allgemein.8') }}</option></select>
+		<label class="select-label">{{ trans('settings.allgemein.9') }}:</label>
+		<select class="form-control" name="param_time">
+			<option value="1000" selected>1 {{ trans('settings.allgemein.10') }}</option>
+			<option value="2000">2 {{ trans('settings.allgemein.11') }}</option>
+			<option value="5000">5 {{ trans('settings.allgemein.11') }}</option>
+			<option value="10000">10 {{ trans('settings.allgemein.11') }}</option>
+			<option value="20000">20 {{ trans('settings.allgemein.11') }}</option></select>
+		<h2>{{ trans('settings.suchmaschinen.1') }}</h2>
+		@foreach( $foki as $fokus => $sumas )
+			<div class="headingGroup {{ $fokus }}">
+				<h3>
+					{{ ucfirst($fokus) }}
+					<small>
+						<a class="checker" data-type="{{ $fokus }}">(alle an-/abwählen)</a>
+					</small>
+				</h3>
+				<div class="row">
+					@foreach( $sumas as $name => $data )
+						<div class="col-sm-6 col-md-4 col-lg-3">
+							<div class="checkbox">
+								<label>
+									<input name="param_{{ $data['service'] }}" type="checkbox" />{{ $data['displayName'] }}
+								</label>
+								<a class="glyphicon glyphicon-link" target="_blank" href="{{ $data['url'] }}"></a>
+							</div>
+						</div>
+					@endforeach
 				</div>
 			</div>
-			@endforeach
-		</div>
-	</div>
-	@endforeach
-	<input id="unten" type="submit" class="btn btn-primary" value="Startseite f&uuml;r einmalige Nutzung generieren">
-	<input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
-	<input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
-	<input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zur&uuml;cksetzen">
-</form>
+		@endforeach
+		<input id="unten" type="submit" class="btn btn-primary" value="Startseite f&uuml;r einmalige Nutzung generieren">
+		<input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
+		<input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
+		<input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zur&uuml;cksetzen">
+	</form>
 @endsection
\ No newline at end of file
diff --git a/resources/views/spende.blade.php b/resources/views/spende.blade.php
index 2427faa988e02877b7f62f5d1fbf6f23135693db..b9640ce23e339cf1ff8eada8bfdb2e95025f6e58 100644
--- a/resources/views/spende.blade.php
+++ b/resources/views/spende.blade.php
@@ -2,84 +2,82 @@
 
 @section('title', $title )
 
+@section('navbarFocus.donate', 'class="dropdown active"')
+
 @section('content')
 <h1>{{ trans('spenden.headline.1') }}</h1>
 <h2>{{ trans('spenden.headline.2') }}</h2>
 <div class="col">
-<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
-<h2>{{ trans('spenden.bankinfo.1') }}</h2>
-<p>{{ trans('spenden.bankinfo.2') }}</p>
-            <p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
-            <hr>
-            <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
-              <h2>{{ trans('spenden.logos.1') }}</h2>
-              <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-                <input name="cmd" value="_xclick" type="hidden">
-                <input name="business" value="wsb@suma-ev.de" type="hidden">
-                <input name="item_name" value="SuMa-eV Spende" type="hidden">
-                <input name="buyer_credit_promo_code" value="" type="hidden">
-                <input name="buyer_credit_product_category" value="" type="hidden">
-                <input name="buyer_credit_shipping_method" value="" type="hidden">
-                <input name="buyer_credit_user_address_change" value="" type="hidden">
-                <input name="no_shipping" value="0" type="hidden">
-                <input name="no_note" value="1" type="hidden">
-                <input name="currency_code" value="EUR" type="hidden">
-                <input name="tax" value="0" type="hidden">
-                <input name="lc" value="DE" type="hidden">
-                <input name="bn" value="PP-DonationsBF" type="hidden">
-                <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
-              </form>
-            </div>
-            <div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
-              <h2>{{ trans('spenden.logos.2') }}</h2>
-              <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">
-                <img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin">
-              </a>
-            </div>
-            <div class="clearfix">
-            </div>
-            <hr>
-            <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
-            <p>{{ trans('spenden.lastschrift.2') }}</p>
-            <form role="form" method="POST">
-              {{ csrf_field() }}
-              <div class="form-group">
-                <label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
-                <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
-              </div>
-              <div class="form-group">
-                <label for="email">{{ trans('spenden.lastschrift.4') }}</label>
-                <input type="email" class="form-control" id="email" name="email" placeholder="Email">
-              </div>
-              <div class="form-group">
-                <label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
-                <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
-              </div>
-              <div class="form-group">
-                <label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
-                <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
-              </div>
-              <div class="form-group">
-                <label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
-                <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
-              </div>
-              <div class="form-group">
-                <label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
-                <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
-              </div>
-              <button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
-            </form>
-            <p>{{ trans('spenden.lastschrift.10') }}</p>
-          </div>
-          <div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
-            <h2>{{ trans('spenden.about.0') }}</h2>
-            <p>{{ trans('spenden.about.1.1') }}
-              <a href="https://metager.de/klassik/bform1.htm" target="_blank">{{ trans('spenden.about.1.2') }}</a></p>
-            <p>{{ trans('spenden.about.2.1') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('spenden.about.2.2') }} <a href="http://suma-ev.de/suma-links/index.html#sponsors" target="_blank">{{ trans('spenden.about.2.3') }}</a> {{ trans('spenden.about.2.4') }} <a href="https://metager.de/klassik/spenden1.html" target="_blank">{{ trans('spenden.about.2.5') }}</a></p>
-            <p><a href="http://suma-ev.de/unterstuetzung/index.html" target="_blank">{{ trans('spenden.about.3.1') }}</a> {{ trans('spenden.about.3.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a></p>
-            <p>{{ trans('spenden.about.4.1') }} <a href="https://www.boost-project.com/de" target="_blank">www.boost-project.com</a> {{ trans('spenden.about.4.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a> {{ trans('spenden.about.4.3') }} <a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank">{{ trans('spenden.about.4.4') }}</a> {{ trans('spenden.about.4.5') }}</p>
-          </div>
-          <div class="clearfix">
-          </div>
-        </div>
+	<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
+		<h2>{{ trans('spenden.bankinfo.1') }}</h2>
+		<p>{{ trans('spenden.bankinfo.2') }}</p>
+		<p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
+		<hr>
+		<div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
+			<h2>{{ trans('spenden.logos.1') }}</h2>
+			<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+				<input name="cmd" value="_xclick" type="hidden">
+				<input name="business" value="wsb@suma-ev.de" type="hidden">
+				<input name="item_name" value="SuMa-eV Spende" type="hidden">
+				<input name="buyer_credit_promo_code" value="" type="hidden">
+				<input name="buyer_credit_product_category" value="" type="hidden">
+				<input name="buyer_credit_shipping_method" value="" type="hidden">
+				<input name="buyer_credit_user_address_change" value="" type="hidden">
+				<input name="no_shipping" value="0" type="hidden">
+				<input name="no_note" value="1" type="hidden">
+				<input name="currency_code" value="EUR" type="hidden">
+				<input name="tax" value="0" type="hidden">
+				<input name="lc" value="DE" type="hidden">
+				<input name="bn" value="PP-DonationsBF" type="hidden">
+				<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
+			</form>
+		</div>
+		<div class="col-lg-6 col-md-12 col-sm-12 others ppbc">
+			<h2>{{ trans('spenden.logos.2') }}</h2>
+			<a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V"><img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin"></a>
+		</div>
+		<div class="clearfix"></div>
+		<hr>
+		<h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
+		<p>{{ trans('spenden.lastschrift.2') }}</p>
+		<form role="form" method="POST">
+			{{ csrf_field() }}
+			<div class="form-group">
+				<label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
+				<input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
+			</div>
+			<div class="form-group">
+				<label for="email">{{ trans('spenden.lastschrift.4') }}</label>
+				<input type="email" class="form-control" id="email" name="email" placeholder="Email">
+			</div>
+			<div class="form-group">
+				<label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
+				<input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
+			</div>
+			<div class="form-group">
+				<label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
+				<input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
+			</div>
+			<div class="form-group">
+				<label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
+				<input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
+			</div>
+			<div class="form-group">
+				<label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
+				<textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
+			</div>
+			<button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
+		</form>
+		<p>{{ trans('spenden.lastschrift.10') }}</p>
+	</div>
+	<div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
+		<h2>{{ trans('spenden.about.0') }}</h2>
+		<p>{{ trans('spenden.about.1.1') }}
+			<a href="https://metager.de/klassik/bform1.htm" target="_blank">{{ trans('spenden.about.1.2') }}</a></p>
+		<p>{{ trans('spenden.about.2.1') }} <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> {{ trans('spenden.about.2.2') }} <a href="http://suma-ev.de/suma-links/index.html#sponsors" target="_blank">{{ trans('spenden.about.2.3') }}</a> {{ trans('spenden.about.2.4') }} <a href="https://metager.de/klassik/spenden1.html" target="_blank">{{ trans('spenden.about.2.5') }}</a></p>
+		<p><a href="http://suma-ev.de/unterstuetzung/index.html" target="_blank">{{ trans('spenden.about.3.1') }}</a> {{ trans('spenden.about.3.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a></p>
+		<p>{{ trans('spenden.about.4.1') }} <a href="https://www.boost-project.com/de" target="_blank">www.boost-project.com</a> {{ trans('spenden.about.4.2') }} <a href="https://metager.de/" target="_blank">MetaGer.de!</a> {{ trans('spenden.about.4.3') }} <a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank">{{ trans('spenden.about.4.4') }}</a> {{ trans('spenden.about.4.5') }}</p>
+	</div>
+	<div class="clearfix"></div>
+</div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php
index 1d7fb5058145e37e215f92cfbadd5d454e76dcf9..edec879953fdad2811eb9162c53de43fb3d00e7f 100644
--- a/resources/views/team/team.blade.php
+++ b/resources/views/team/team.blade.php
@@ -3,44 +3,33 @@
 @section('title', $title )
 
 @section('content')
-<h1>Team
-</h1>
-<ul id="teamList">
-  <li>
-    <a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang
-    </a>, Dr.-Ing. - {{ trans('team.role.1') }} - 
-    <a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de
-    </a> - 
-    <a href="/team/pubkey-wsb">Public Key
-    </a>
-  </li>
-  <li>Becker, Georg - {{ trans('team.role.2') }} - 
-    <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de
-    </a>
-  </li>
-  <li>Branz, Manuela - {{ trans('team.role.3') }} - 
-    <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de
-    </a>
-  </li>
-  <li>Pfennig, Dominik - {{ trans('team.role.4') }} - 
-    <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de
-    </a>
-  </li>
-  <li>Höfer, Phil - {{ trans('team.role.5') }} - 
-    <a href="mailto:phil@suma-ev.de">phil@suma-ev.de
-    </a>
-  </li>
-  <li>Hasselbring, Karl - {{ trans('team.role.6') }} - 
-    <a href="mailto:karl@suma-ev.de">karl@suma-ev.de
-    </a>
-  </li>
-  <li>Riel, Carsten - {{ trans('team.role.7') }} - 
-    <a href="carsten@suma-ev.de">carsten@suma-ev.de
-    </a>
-  </li>
-</ul>
-<p>{{ trans('team.contact.1') }} 
-  <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> {{ trans('team.contact.2') }} <a href="/kontakt/">{{ trans('team.contact.3') }}</a>{{ trans('team.contact.4') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.5') }}</a> {{ trans('team.contact.6') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.7') }}</a> {{ trans('team.contact.8') }} </p>
-<p>{{ trans('team.contact.9') }}
-</p>
+	<h1>Team</h1>
+	<ul id="teamList">
+		<li>
+			<a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {{ trans('team.role.1') }} - 
+			<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> - 
+			<a href="/team/pubkey-wsb">Public Key</a>
+		</li>
+		<li>Becker, Georg - {{ trans('team.role.2') }} - 
+			<a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a>
+		</li>
+		<li>Branz, Manuela - {{ trans('team.role.3') }} - 
+			<a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a>
+		</li>
+		<li>Pfennig, Dominik - {{ trans('team.role.4') }} - 
+			<a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a>
+		</li>
+		<li>Höfer, Phil - {{ trans('team.role.5') }} - 
+			<a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a>
+		</li>
+		<li>Hasselbring, Karl - {{ trans('team.role.6') }} - 
+			<a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a>
+		</li>
+		<li>Riel, Carsten - {{ trans('team.role.7') }} - 
+			<a href="carsten@suma-ev.de">carsten@suma-ev.de</a>
+		</li>
+	</ul>
+	<p>{{ trans('team.contact.1') }} 
+		<a href="mailto:office@suma-ev.de">office@suma-ev.de</a> {{ trans('team.contact.2') }} <a href="/kontakt/">{{ trans('team.contact.3') }}</a>{{ trans('team.contact.4') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.5') }}</a> {{ trans('team.contact.6') }} <a href="http://forum.suma-ev.de/" target="_blank">{{ trans('team.contact.7') }}</a> {{ trans('team.contact.8') }} </p>
+	<p>{{ trans('team.contact.9') }}</p>
 @endsection
\ No newline at end of file
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 87710acead3f9d3981326d82486a9d109829c86c..a1e35389e3ad307a316494f810b421c2b6ee10af 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,45 +1,15 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <title>Laravel</title>
-
-        <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                display: table;
-                font-weight: 100;
-                font-family: 'Lato';
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 96px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Laravel 5</div>
-            </div>
-        </div>
-    </body>
+	<head>
+		<title>Laravel</title>
+		<link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
+		<link rel="stylesheet" type="text/css" href="/css/welcome.css" />
+	</head>
+	<body>
+		<div class="container">
+			<div class="content">
+				<div class="title">Laravel 5</div>
+			</div>
+		</div>
+	</body>
 </html>
diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php
index c8a558bae64e690f38fc1e6eebdc5897b6e5b179..fa8cdcb2e4e3bff6cd7cba140b4c4abed86fa860 100644
--- a/resources/views/widget.blade.php
+++ b/resources/views/widget.blade.php
@@ -3,8 +3,8 @@
 @section('title', $title )
 
 @section('content')
-<h1>{{ trans('widget.head') }}</h1>
-<p>{{ trans('widget.body.1') }}</p>
-<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
-<p>{{ trans('widget.body.4') }}</p>
+	<h1>{{ trans('widget.head') }}</h1>
+	<p>{{ trans('widget.body.1') }}</p>
+	<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
+	<p>{{ trans('widget.body.4') }}</p>
 @endsection
\ No newline at end of file