diff --git a/webroot/config.php b/webroot/config.php
index 7cd2a1b44c7f87e069cf6b3549fd9651f87ee863..dbe856d4e8ba0733c6cd11137229f50f020ab343 100644
--- a/webroot/config.php
+++ b/webroot/config.php
@@ -9,13 +9,12 @@
 		//array("widget_name", "style_name", position_x, position_y, size_x, size_y);
 		array("Logo",				"widget",			0,0,	2,1),
 		array("ZoneOffen",			"widget_dark",		4,0,	2,1),
-		array("Dummy",				"widget_light",		0,1,	4,2),
-		array("Marvin",				"widget_light",		4,1,	2,1),
-		array("TwitterWall",		"widget_light",		4,2,	2,4),
-		array("Dummy",				"widget_light",		0,3,	1,2),
-		array("Dummy",				"widget_dark",		1,3,	2,2),
-		array("Wettervorhersage",	"widget_light",		3,3,	1,2),
-		array("Dummy",				"widget_light",		0,5,	2,1),
-		array("Dummy",				"widget_light",		2,5,	2,1)
+		array("Dummy",				"widget_light",		0,1,	3,2),
+		array("Wettervorhersage",	"widget_light",		3,1,	1,2),
+		array("TwitterWall",		"widget_light",		4,1,	2,4),
+		array("Dummy",				"widget_light",		0,3,	2,2),
+		array("Dummy",				"widget_dark",		2,3,	2,2),
+		array("Dummy",				"widget_light",		0,5,	4,1),
+		array("Marvin",				"widget_light",		4,5,	2,1)
 	);
 ?>
diff --git a/webroot/widgets/TwitterWall/TwitterWall.php b/webroot/widgets/TwitterWall/TwitterWall.php
index 418a6b74a449abb0a7e712ab943c267b8741b951..775041f2f057cedad59fdab3156e4f4559e3d9fb 100644
--- a/webroot/widgets/TwitterWall/TwitterWall.php
+++ b/webroot/widgets/TwitterWall/TwitterWall.php
@@ -26,7 +26,7 @@ class TwitterWall implements iWidget
           });
         });
       </script>'."\n";
-    $widgetOutput .= '<div class="box"><div class="tweet" style="height:auto;top:0;bottom:0;"></div></div>'."\n";
+    $widgetOutput .= '<div class="box"><div class="tweet"></div></div>'."\n";
    
     return $widgetOutput;
   }
diff --git a/webroot/widgets/Wettervorhersage/Wettervorhersage.php b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
index 21bddfaa3cc6dec5369a5de08705edec561c8d02..d714c0b7add910be1324b2fa5a8fef05a25f39c7 100644
--- a/webroot/widgets/Wettervorhersage/Wettervorhersage.php
+++ b/webroot/widgets/Wettervorhersage/Wettervorhersage.php
@@ -9,10 +9,11 @@ class Wettervorhersage implements iWidget
 
   }
 
-
   public function giveOutput() 
   {
-    $widgetOutput = '<div id="cont_5c241a8806783c9482d9f72bd16e1de2"><script type="text/javascript" src="http://www.daswetter.net/wid_loader/5c241a8806783c9482d9f72bd16e1de2"></script></div>';
+    $widgetOutput  = '<h1>Das Wetter in M&uuml;nster:</h1><br>'."\n";
+    $widgetOutput .= '<div id="cont_5c241a8806783c9482d9f72bd16e1de2"><script type="text/javascript" src="http://www.daswetter.net/wid_loader/5c241a8806783c9482d9f72bd16e1de2"></script></div>'."\n";
+    //TODO: automatisch Aktualisieren
     return $widgetOutput;
   }
 }