diff --git a/panels/mensaPlan/script.js b/panels/mensaPlan/script.js
index fc1595f3ce14e43409721f33820e9b07a22ce53f..65f2aa83a3833a9a0caaeaabc7a5bb65133873b0 100755
--- a/panels/mensaPlan/script.js
+++ b/panels/mensaPlan/script.js
@@ -2,7 +2,7 @@ this.loaded = function(panel, config) {
 	setInterval(function() {
 		getMensaPlan();
 	}, 1800000);
-	
+
 	setInterval(function() {
 		var currentTab = $("#tabs").tabs('option', 'active');
 		if (currentTab == 0) {
@@ -27,10 +27,10 @@ this.loaded = function(panel, config) {
 	function fillTable(json) {
 		var date = new Date();
 		var next = 0;
-		if(date.getHours() > 14 || (date.getHours() == 14 && date.getMinutes() >15)){
+		if (date.getHours() >= 15) {
 			next = 1;
 		}
-		switch (date.getDay()+next) {
+		switch (date.getDay() + next) {
 		case 0:
 			var day = json.montag;
 			break;
@@ -52,9 +52,18 @@ this.loaded = function(panel, config) {
 		case 6:
 			var day = json.montag;
 			break;
+		case 7:
+			var day = json.montag;
+			break;
 		}
 		var gerichte = day.gerichte;
-		document.getElementById("head").innerHTML = "Mensaplan vom "+day.date;
+		if (next) {
+			document.getElementById("head").innerHTML = "Mensaplan von MORGEN dem  "
+					+ day.date;
+		} else {
+			document.getElementById("head").innerHTML = "Mensaplan von HEUTE dem  "
+					+ day.date;
+		}
 		var tableBody1 = document.getElementById("mensaPlanTable1Body");
 		var tableBody2 = document.getElementById("mensaPlanTable2Body");
 		tableBody1.innerHTML = "";
@@ -63,7 +72,10 @@ this.loaded = function(panel, config) {
 		var b = 0;
 		for (var i = 0; i < gerichte.length; i++) {
 			var gericht = gerichte[i];
-			if(gericht.kategorie == "icon-menue-1.png" || gericht.kategorie == "icon-menue-2.png" ||  gericht.kategorie == "icon-tagesgericht.png" || gericht.kategorie == "icon-aktionsteller.png"){
+			if (gericht.kategorie == "icon-menue-1.png"
+					|| gericht.kategorie == "icon-menue-2.png"
+					|| gericht.kategorie == "icon-tagesgericht.png"
+					|| gericht.kategorie == "icon-aktionsteller.png") {
 				var row = tableBody1.insertRow(a);
 				a++;
 			} else {