diff --git a/Changelog b/Changelog
index 6ed415d58..ad2ef4199 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-04-01 DariusIII
+	* Chg: Update Base and Browse controllers
 	* Chg: Allow disabling of captcha on login page
 2018-03-31 DariusIII
 	* Chg: Add barryvdh/laravel-debugbar as dev requirement
diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php
index d75b2b3fa..fc4ac4185 100644
--- a/app/Http/Controllers/BasePageController.php
+++ b/app/Http/Controllers/BasePageController.php
@@ -322,7 +322,7 @@ class BasePageController extends Controller
     public function pagerender(): void
     {
         $this->smarty->assign('page', $this);
-        $this->page_template = $this->theme.'/basepage.tpl';
+        $this->page_template = 'basepage.tpl';
 
         $this->render();
     }
diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php
index 84b269ada..21bdb394c 100644
--- a/app/Http/Controllers/BrowseController.php
+++ b/app/Http/Controllers/BrowseController.php
@@ -64,6 +64,7 @@ class BrowseController extends BasePageController
         $this->meta_description = 'Browse for Nzbs';
 
         $this->content = $this->smarty->fetch('browse.tpl');
+        $this->smarty->assign('content', $this->content);
         $this->pagerender();
     }
 }