diff --git a/config/layouts/default.json b/config/layouts/default.json
index f161fded333811cc2091c9f462a7715840e07083..a11b901a987fb2bc057392eaf61de25a35f487a3 100755
--- a/config/layouts/default.json
+++ b/config/layouts/default.json
@@ -32,11 +32,11 @@
 							},
 							{
 							"filename": "Ankndigung_FVV.png",
-							"enddate": "30.11.2016"
+							"enddate": "30.11.2019"
 							},
 							{
 							"filename": "OpenSourceInfoscreen.jpg",
-							"enddate": "18.11.2017"
+							"enddate": "NEVER"
 							}
 						]
 					}
@@ -44,6 +44,14 @@
 				{
 					"type": "panel",
 					"name": "ufc"
+				},
+				{
+					"type": "panel",
+					"name": "mensaPlan"
+				},
+				{
+					"type": "panel",
+					"name": "lsfView"
 				}
 			]
 		}
diff --git a/panels/werbung/script.js b/panels/werbung/script.js
index 2e779a44d20451857c72127bd3c551b13663488b..f8195e856f6c9bbbc76676e8979847679d2a7ea5 100755
--- a/panels/werbung/script.js
+++ b/panels/werbung/script.js
@@ -40,16 +40,11 @@ function isOver(day, month, year){
 	
 this.checkShowCondition = function() {
 	var werbungOriginalNext = nextWerbung;
-	var enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
-	if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
-		console.log("Werbung: CurrentWerbung = " + nextWerbung);
+	if(werbung_config.files[nextWerbung].enddate == "NEVER"){
+		console.log("Werbung: CurrentWerbung = " + nextWerbung + " Infinit");
 		return 20;
 	} else {
-		console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
-		setNextWerbung();
-	}
-	while(nextWerbung != werbungOriginalNext){
-		enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
+		var enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
 		if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
 			console.log("Werbung: CurrentWerbung = " + nextWerbung);
 			return 20;
@@ -57,6 +52,16 @@ this.checkShowCondition = function() {
 			console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
 			setNextWerbung();
 		}
+		while(nextWerbung != werbungOriginalNext){
+			enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
+			if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
+				console.log("Werbung: CurrentWerbung = " + nextWerbung);
+				return 20;
+			} else {
+				console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
+				setNextWerbung();
+			}
+		}
 	}
 	return 0;
 }