diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php
index 48edb9e3..9f386430 100644
--- a/application/core/Configurators/ServerSettings.php
+++ b/application/core/Configurators/ServerSettings.php
@@ -322,7 +322,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 	 * @return bool
 	 */
 	private function applyNewServerSettings(array $newSettings, Player $player) {
-		var_dump($newSettings);
 		if (!$newSettings) {
 			return true;
 		}
diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php
index 2794a16f..af46aaef 100644
--- a/application/core/Server/Server.php
+++ b/application/core/Server/Server.php
@@ -135,10 +135,13 @@ class Server implements CallbackListener {
 	 * @param bool $teamMode
 	 */
 	public function setTeamMode($teamMode = true) {
+		$oldStatus      = $this->teamMode;
 		$this->teamMode = $teamMode;
 
 		// Trigger  callback
-		$this->maniaControl->callbackManager->triggerCallback(self::CB_TEAM_STATUS_CHANGED, array(self::CB_TEAM_STATUS_CHANGED, $teamMode));
+		if ($oldStatus != $this->teamMode) {
+			$this->maniaControl->callbackManager->triggerCallback(self::CB_TEAM_STATUS_CHANGED, array(self::CB_TEAM_STATUS_CHANGED, $teamMode));
+		}
 	}
 
 	/**
diff --git a/application/plugins/QueuePlugin.php b/application/plugins/QueuePlugin.php
index 21ecb2d4..07166100 100644
--- a/application/plugins/QueuePlugin.php
+++ b/application/plugins/QueuePlugin.php
@@ -355,12 +355,13 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
 		$quadStyle    = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowStyle();
 		$quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowSubStyle();
 		$max_queue    = $this->maniaControl->settingManager->getSetting($this, self::QUEUE_MAX);
+		//TODO position setting
 
 		// Main frame
 		$frame = new Frame();
 		$maniaLink->add($frame);
 		$frame->setSize(60, 6);
-		$frame->setPosition(0, 67, 0);
+		$frame->setPosition(0, -46, 0);
 
 		// Background
 		$backgroundQuad = new Quad();
@@ -447,7 +448,8 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
 		$frame = new Frame();
 		$maniaLink->add($frame);
 		$frame->setSize(60, 6);
-		$frame->setPosition(0, 67, 0);
+		$frame->setPosition(0, -46, 0);
+		//TODO position setting
 
 		// Background
 		$backgroundQuad = new Quad();