diff --git a/core/ManiaExchange/ManiaExchangeList.php b/core/ManiaExchange/ManiaExchangeList.php
index 5b9e9ec2..a1ffabab 100644
--- a/core/ManiaExchange/ManiaExchangeList.php
+++ b/core/ManiaExchange/ManiaExchangeList.php
@@ -199,12 +199,12 @@ class ManiaExchangeList implements CallbackListener, ManialinkPageAnswerListener
 		$headFrame->setY($posY - 12);
 
 		$labelLine = new LabelLine($headFrame);
-		$labelLine->addLabelEntryText('Id', $posX + 3.5, 9);
-		$labelLine->addLabelEntryText('Name', $posX + 12.5, 38.5);
-		$labelLine->addLabelEntryText('Author', $posX + 59, 44);
-		$labelLine->addLabelEntryText('Type', $posX + 103, 15);
-		$labelLine->addLabelEntryText('Mood', $posX + 118, 12);
-		$labelLine->addLabelEntryText('Last Update', $posX + 130, $width - ($posX + 130));
+		$labelLine->addLabelEntryText('Id', $posX + 3.5, 8);
+		$labelLine->addLabelEntryText('Name', $posX + 12.5, 37.5);
+		$labelLine->addLabelEntryText('Author', $posX + 59, 43);
+		$labelLine->addLabelEntryText('Type', $posX + 103, 14);
+		$labelLine->addLabelEntryText('Mood', $posX + 118, 11);
+		$labelLine->addLabelEntryText('Last Update', $posX + 130, $width - ($posX + 131));
 
 		$labelLine->render();
 
diff --git a/core/Manialinks/ManialinkManager.php b/core/Manialinks/ManialinkManager.php
index b2209959..03aa6c79 100644
--- a/core/Manialinks/ManialinkManager.php
+++ b/core/Manialinks/ManialinkManager.php
@@ -34,7 +34,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener,
 	const ACTION_CLOSEWIDGET     = 'ManiaLinkManager.CloseWidget';
 	const CB_MAIN_WINDOW_CLOSED  = 'ManialinkManagerCallback.MainWindowClosed';
 	const CB_MAIN_WINDOW_OPENED  = 'ManialinkManagerCallback.MainWindowOpened';
-	const MAIN_MANIALINK_Z_VALUE = 20;
+	const MAIN_MANIALINK_Z_VALUE = 150;
 
 
 	/*
diff --git a/core/Manialinks/StyleManager.php b/core/Manialinks/StyleManager.php
index 2ed93c9c..fafe0552 100644
--- a/core/Manialinks/StyleManager.php
+++ b/core/Manialinks/StyleManager.php
@@ -111,11 +111,13 @@ class StyleManager implements UsageInformationAble {
 		return $descriptionLabel;
 	}
 
+
 	/**
 	 * Gets the default buttons and textbox for a map search
 	 *
-	 * @param string $actionMapNameSearch
-	 * @param string $actionAuthorSearch
+	 * @param      $actionMapNameSearch
+	 * @param      $actionAuthorSearch
+	 * @param null $actionReset
 	 * @return \FML\Controls\Frame
 	 */
 	public function getDefaultMapSearch($actionMapNameSearch, $actionAuthorSearch, $actionReset = null) {
@@ -229,13 +231,7 @@ class StyleManager implements UsageInformationAble {
 
 		// mainframe
 		$frame = new Frame();
-		$frame->setSize($width, $height)->setZ(ManialinkManager::MAIN_MANIALINK_Z_VALUE); //TODO place before scoreboards
-
-		//TODO remove: (just temporary fix for tm bug)
-		if ($this->maniaControl->getMapManager()->getCurrentMap()->getGame() === 'tm') {
-			$frame->setSize($width, $height)->setZ(32);
-		}
-
+		$frame->setSize($width, $height)->setZ(ManialinkManager::MAIN_MANIALINK_Z_VALUE);
 
 		// Background Quad
 		$backgroundQuad = new Quad();
diff --git a/core/Plugins/InstallMenu.php b/core/Plugins/InstallMenu.php
index 3319b4c8..fce92fc8 100644
--- a/core/Plugins/InstallMenu.php
+++ b/core/Plugins/InstallMenu.php
@@ -97,6 +97,7 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 			$pagerNext = clone $pagerPrev;
 			$frame->addChild($pagerNext);
 			$pagerNext->setX($width * 0.45);
+			$pagerNext->setSubStyle($pagerPrev::SUBSTYLE_ArrowNext);
 
 			$pageCountLabel = new Label_Text();
 			$frame->addChild($pageCountLabel);