diff --git a/application/core/Libs/FML/Script/Features/Paging.php b/application/core/Libs/FML/Script/Features/Paging.php
index 4f46372c..5ea3f7d4 100644
--- a/application/core/Libs/FML/Script/Features/Paging.php
+++ b/application/core/Libs/FML/Script/Features/Paging.php
@@ -273,7 +273,6 @@ Void {$updatePageFunction}(Text _PagingId, Text _PageLabelId, Integer _BrowseAct
 	protected function getMinPage() {
 		$minPageNumber = null;
 		$minPage = null;
-		var_dump($this->pages);
 		foreach ($this->pages as $page) {
 			$pageNumber = $page->getPageNumber();
 			if ($minPageNumber === null || $pageNumber < $minPageNumber) {
diff --git a/application/core/Update/PluginInstallMenu.php b/application/core/Plugins/PluginInstallMenu.php
similarity index 98%
rename from application/core/Update/PluginInstallMenu.php
rename to application/core/Plugins/PluginInstallMenu.php
index 5629d3c1..8113ebb3 100644
--- a/application/core/Update/PluginInstallMenu.php
+++ b/application/core/Plugins/PluginInstallMenu.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Update;
+namespace ManiaControl\Plugins;
 
 use FML\Controls\Control;
 use FML\Controls\Frame;
@@ -17,7 +17,6 @@ use ManiaControl\Files\FileUtil;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
-use ManiaControl\Plugins\Plugin;
 
 /**
  * Configurator for enabling and disabling Plugins
@@ -27,6 +26,9 @@ use ManiaControl\Plugins\Plugin;
  * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
 class PluginInstallMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAnswerListener {
+	/*
+	 * Constants
+	 */
 	const SETTING_PERMISSION_INSTALL_PLUGINS  = 'Install plugins';
 	const ACTION_PREFIX_INSTALLPLUGIN         = 'PluginInstallMenu.Install.';
 
diff --git a/application/core/Plugins/PluginManager.php b/application/core/Plugins/PluginManager.php
index ba82540f..319eb4ee 100644
--- a/application/core/Plugins/PluginManager.php
+++ b/application/core/Plugins/PluginManager.php
@@ -23,7 +23,8 @@ class PluginManager {
 	 * Private Properties
 	 */
 	private $maniaControl = null;
-	private $pluginMenu = null;
+    private $pluginMenu = null;
+    private $pluginInstallMenu = null;
 	private $activePlugins = array();
 	private $pluginClasses = array();
 
@@ -38,6 +39,9 @@ class PluginManager {
 
 		$this->pluginMenu = new PluginMenu($maniaControl);
 		$this->maniaControl->configurator->addMenu($this->pluginMenu);
+
+        $this->pluginInstallMenu = new PluginInstallMenu($maniaControl);
+        $this->maniaControl->configurator->addMenu($this->pluginInstallMenu);
 	}
 
 	/**
diff --git a/application/core/Update/UpdateManager.php b/application/core/Update/UpdateManager.php
index a71ab423..7f66cd4b 100644
--- a/application/core/Update/UpdateManager.php
+++ b/application/core/Update/UpdateManager.php
@@ -12,6 +12,7 @@ use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 use ManiaControl\Players\PlayerManager;
 use ManiaControl\Plugins\Plugin;
+use ManiaControl\Plugins\PluginInstallMenu;
 use ManiaControl\Plugins\PluginMenu;
 
 /**
@@ -77,9 +78,6 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
 		$this->maniaControl->commandManager->registerCommandListener('pluginupdate', $this, 'handle_PluginUpdate', true);
 
 		$this->currentBuildDate = $this->getNightlyBuildDate();
-
-		$this->pluginInstallMenu = new PluginInstallMenu($maniaControl);
-		$this->maniaControl->configurator->addMenu($this->pluginInstallMenu);
 	}
 
 	/**