diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 01d8d88..e66d213 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -2,19 +2,18 @@
 
 namespace OCA\BigBlueButton\Controller;
 
+use OCA\BigBlueButton\TemplateProvider;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
 use OCP\IRequest;
 
 class PageController extends Controller {
-	/** @var IConfig */
-	private $config;
+	/** @var TemplateProvider */
+	private $templateProvider;
 
-	public function __construct(string $appName, IRequest $request, IConfig $config) {
+	public function __construct(string $appName, IRequest $request, TemplateProvider $templateProvider) {
 		parent::__construct($appName, $request);
 
-		$this->config = $config;
+		$this->templateProvider = $templateProvider;
 	}
 
 	/**
@@ -22,8 +21,6 @@ class PageController extends Controller {
 	 * @NoCSRFRequired
 	 */
 	public function index() {
-		return new TemplateResponse($this->appName, 'manager', [
-			'shortener' => $this->config->getAppValue('bbb', 'app.shortener', ''),
-		]);
+		return $this->templateProvider->getManager();
 	}
 }
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 9e0527e..d58cf9a 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -2,42 +2,29 @@
 
 namespace OCA\BigBlueButton\Settings;
 
-use \OCP\IL10N;
+use OCA\BigBlueButton\TemplateProvider;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
 
 class Personal implements ISettings {
-	/** @var IConfig */
-	private $config;
-
-	/** @var IL10N */
-	private $l;
+	/** @var TemplateProvider */
+	private $templateProvider;
 
 	/**
 	 * Admin constructor.
 	 *
 	 * @param IConfig $config
 	 */
-	public function __construct(IConfig $config, IL10N $l) {
-		$this->config = $config;
-		$this->l = $l;
+	public function __construct(TemplateProvider $templateProvider) {
+		$this->templateProvider = $templateProvider;
 	}
 
 	/**
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		$warning = '';
-
-		if (empty($this->config->getAppValue('bbb', 'api.url')) || empty($this->config->getAppValue('bbb', 'api.secret'))) {
-			$warning = $this->l->t('API URL or secret not configured. Please contact your administrator.');
-		}
-
-		return new TemplateResponse('bbb', 'manager', [
-			'warning' => $warning,
-			'shortener' => $this->config->getAppValue('bbb', 'app.shortener', ''),
-		]);
+		return $this->templateProvider->getManager();
 	}
 
 	/**
diff --git a/lib/TemplateProvider.php b/lib/TemplateProvider.php
new file mode 100644
index 0000000..8e885d2
--- /dev/null
+++ b/lib/TemplateProvider.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace OCA\BigBlueButton;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IL10N;
+
+class TemplateProvider {
+	/** @var IConfig */
+	private $config;
+
+	/** @var IL10N */
+	private $l;
+
+	/**
+	 * Admin constructor.
+	 *
+	 * @param IConfig $config
+	 */
+	public function __construct(IConfig $config, IL10N $l) {
+		$this->config = $config;
+		$this->l = $l;
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getManager(): TemplateResponse {
+		$warning = '';
+
+		if (empty($this->config->getAppValue('bbb', 'api.url')) || empty($this->config->getAppValue('bbb', 'api.secret'))) {
+			$warning = $this->l->t('API URL or secret not configured. Please contact your administrator.');
+		}
+
+		return new TemplateResponse('bbb', 'manager', [
+			'warning' => $warning,
+			'shortener' => $this->config->getAppValue('bbb', 'app.shortener', ''),
+		]);
+	}
+}
diff --git a/templates/manager.php b/templates/manager.php
index 7166836..9ae9afa 100644
--- a/templates/manager.php
+++ b/templates/manager.php
@@ -2,10 +2,12 @@
 script('bbb', 'manager');
 ?>
 
-<div id="bbb-root" data-shortener="<?php p($_['shortener']); ?>"></div>
+<div id="bbb-app">
+    <div id="bbb-root" data-shortener="<?php p($_['shortener']); ?>"></div>
 
-<?php if (!empty($_['warning'])): ?>
-    <div id="bbb-warning">
-        <span class="icon icon-error-color icon-visible"></span> <?php p($_['warning']); ?>
-    </div>
-<?php endif; ?>
+    <?php if (!empty($_['warning'])): ?>
+        <div id="bbb-warning">
+            <span class="icon icon-error-color icon-visible"></span> <?php p($_['warning']); ?>
+        </div>
+    <?php endif; ?>
+</div>
diff --git a/ts/Manager/App.scss b/ts/Manager/App.scss
index 29d12b7..bdc1469 100644
--- a/ts/Manager/App.scss
+++ b/ts/Manager/App.scss
@@ -35,7 +35,7 @@
   opacity: 0.6;
 }
 
-#bbb-root {
+#bbb-root, #bbb-app {
   width: 100%;
 }