diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php
index 81bb3c1e..04e0027b 100644
--- a/application/core/Admin/ActionsMenu.php
+++ b/application/core/Admin/ActionsMenu.php
@@ -197,26 +197,40 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_IconPlayers);
 		$itemQuad->setSize($itemSize, $itemSize);
 		$iconFrame->add($itemQuad);
-		$itemQuad->setAction(self::ACTION_OPEN_PLAYER_MENU);
+	//	$itemQuad->setAction(self::ACTION_OPEN_PLAYER_MENU);
 
 
 		/** TEST TOOLTIP */
-		$testf = new Frame();
-		$manialink->add($testf);
-		$testf->setPosition($posX - $itemSize * $itemMarginFactorX, $posY - $itemSize * $itemMarginFactorY);
-		//$testf->setHAlign(Control::RIGHT);
-		$testf->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
+		$popoutFrame = new Frame();
+		$manialink->add($popoutFrame);
+		$popoutFrame->setPosition($posX - $itemSize * 0.5, $posY - $itemSize * $itemMarginFactorY);
+		$popoutFrame->setHAlign(Control::RIGHT);
+		$popoutFrame->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
 
 		$testq = new Quad();
-		$testf->add($testq);
+		$popoutFrame->add($testq);
 		//$testq->setPosition($posX - $itemSize * $itemMarginFactorX, $posY - $itemSize * $itemMarginFactorY);
-		$testq->setHAlign(Control::CENTER);
+		$testq->setHAlign(Control::RIGHT);
 		$testq->setStyles($quadStyle, $quadSubstyle);
 		$testq->setSize(4 * $itemSize * $itemMarginFactorX, $itemSize * $itemMarginFactorY);
 
-		$testf->add($testq);
+		$popoutFrame->add($testq);
+
+		$script->addTooltip($itemQuad, $popoutFrame, Script::OPTION_TOOLTIP_STAYONCLICK);
+
+		// Add items
+		$x = 0.05;
+		foreach($this->adminMenuItems as $menuItems) {
+			foreach($menuItems as $menuItem) {
+				/** @var Quad $menuItem */
+				$menuItem->setSize($itemSize, $itemSize);
+				$popoutFrame->add($menuItem);
+				$menuItem->setX($x);
+				$menuItem->setHAlign(Control::RIGHT);
+				$x -= $itemSize * 1.05;
+			}
+		}
 
-		$script->addTooltip($itemQuad, $testf);
 		/** TEST TOOLTIP */
 
 
diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 61e2d752..c66b94d6 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -10,6 +10,7 @@ use FML\Controls\Labels\Label_Button;
 use FML\Controls\Labels\Label_Text;
 use FML\Controls\Quad;
 use FML\Controls\Quads\Quad_BgsPlayerCard;
+use FML\Controls\Quads\Quad_Icons128x128_1;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\ManiaLink;
 use FML\Script\Script;
@@ -78,11 +79,16 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$this->quadStyle    = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowStyle();
 		$this->quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowSubStyle();
 
-		/** @var just a test $itemQuad
-		 * $itemQuad = new Quad();
-		 * $itemQuad->setStyles('Icons128x32_1', Quad_Icons128x128_1::SUBSTYLE_Create);
-		 * $itemQuad->setAction(self::ACTION_ADD_MAP);
-		 * $this->maniaControl->adminMenu->addMenuItem($itemQuad, 4);*/
+		// @var just a test $itemQuad
+		  $itemQuad = new Quad();
+		 $itemQuad->setStyles('Icons128x32_1', Quad_Icons128x128_1::SUBSTYLE_Create);
+		  $itemQuad->setAction(self::ACTION_ADD_MAP);
+		  $this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 4);
+
+		$itemQuad = new Quad();
+		$itemQuad->setStyles('Icons128x32_1', Quad_Icons128x128_1::SUBSTYLE_Challenge);
+		$itemQuad->setAction(self::ACTION_ADD_MAP);
+		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 4);
 	}