diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php
index 8b96fa75..29d68833 100644
--- a/application/core/Admin/ActionsMenu.php
+++ b/application/core/Admin/ActionsMenu.php
@@ -199,6 +199,7 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 			$popoutFrame->setPosition($posX - $itemSize * 0.5, $posY);
 			$popoutFrame->setHAlign(Control::RIGHT);
 			$popoutFrame->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
+			$popoutFrame->setVisible(false);
 
 			$backgroundQuad = new Quad();
 			$popoutFrame->add($backgroundQuad);
@@ -267,6 +268,7 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 		$popoutFrame->setPosition($posX - $itemSize * 0.5, $posY - $itemSize * $itemMarginFactorY);
 		$popoutFrame->setHAlign(Control::RIGHT);
 		$popoutFrame->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
+		$popoutFrame->setVisible(false);
 
 		$backgroundQuad = new Quad();
 		$popoutFrame->add($backgroundQuad);
diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 40e749c9..dee4b3a3 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -535,9 +535,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$eraseLabel->setTextColor('a00');
 
 				$confirmFrame = $this->buildConfirmFrame($maniaLink, $y, $id, $map->uid);
-				//$script->addToggle($eraseLabel, $confirmFrame); //TODO
-				$script->addTooltip($eraseLabel, $confirmFrame, Script::OPTION_TOOLTIP_STAYONCLICK);
-
+				$script->addToggle($eraseLabel, $confirmFrame);
 				$script->addTooltip($eraseLabel, $descriptionLabel, array(Script::OPTION_TOOLTIP_TEXT => 'Remove Map: $<' . $map->name . '$>'));
 
 			}
@@ -554,8 +552,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$switchLabel->setTextColor('0f0');
 
 				$confirmFrame = $this->buildConfirmFrame($maniaLink, $y, $id);
-				$script->addTooltip($switchLabel, $confirmFrame, Script::OPTION_TOOLTIP_STAYONCLICK); //TODO
-				//$script->addToggle($switchLabel, $confirmFrame);
+				$script->addToggle($switchLabel, $confirmFrame);
 
 				$script->addTooltip($switchLabel, $descriptionLabel, array(Script::OPTION_TOOLTIP_TEXT => 'Switch Directly to Map: $<' . $map->name . '$>'));
 
@@ -615,6 +612,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$confirmFrame = new Frame();
 		$maniaLink->add($confirmFrame);
 		$confirmFrame->setPosition($width / 2 + 6, $y);
+		$confirmFrame->setVisible(false);
 
 		$quad = new Quad();
 		$confirmFrame->add($quad);
diff --git a/application/plugins/CustomVotes.php b/application/plugins/CustomVotes.php
index b6517d18..7a0a91c8 100644
--- a/application/plugins/CustomVotes.php
+++ b/application/plugins/CustomVotes.php
@@ -575,6 +575,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
 		$popoutFrame->setPosition($posX - $itemSize * 0.5, $posY);
 		$popoutFrame->setHAlign(Control::RIGHT);
 		$popoutFrame->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
+		$popoutFrame->setVisible(false);
 
 		$backgroundQuad = new Quad();
 		$popoutFrame->add($backgroundQuad);
diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php
index 1e0108c1..4b1f0fa2 100644
--- a/application/plugins/Donations.php
+++ b/application/plugins/Donations.php
@@ -223,6 +223,7 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 		$popoutFrame->setPosition($posX - $itemSize * 0.5, $posY);
 		$popoutFrame->setHAlign(Control::RIGHT);
 		$popoutFrame->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
+		$popoutFrame->setVisible(false);
 
 		$quad = new Quad();
 		$popoutFrame->add($quad);