diff --git a/app/Handlers/Registrators/TemplateRegistrator.php b/app/Handlers/Registrators/TemplateRegistrator.php
index b64c8730..b2cd83db 100644
--- a/app/Handlers/Registrators/TemplateRegistrator.php
+++ b/app/Handlers/Registrators/TemplateRegistrator.php
@@ -112,13 +112,16 @@ class TemplateRegistrator
         }
 
         foreach ($this->paths as $path) {
-            $this->setNamespace($path['namespace'] . '::');
+            if (!empty($path['namespace'])) {
+                $this->setNamespace($path['namespace'] . '::');
+            }
             $this->setModuleId($path['moduleId']);
             $this->setBaseDirectory($path['baseDirectory']);
 
             $this->registeredPath = $this->baseDirectory . DIRECTORY_SEPARATOR . $path['path'];
             // register path
             $this->registerPath($this->registeredPath, $path['name']);
+            $this->unsetNamespace();
         }
     }
 
diff --git a/app/Http/Middleware/AdminMenuRegistrator.php b/app/Http/Middleware/AdminMenuRegistrator.php
index 6c35d6f6..88d9549d 100644
--- a/app/Http/Middleware/AdminMenuRegistrator.php
+++ b/app/Http/Middleware/AdminMenuRegistrator.php
@@ -33,6 +33,9 @@ class AdminMenuRegistrator
 
         // iterate over all enabled modules
         foreach ($modules as $key => $module) {
+            if (!is_callable([$module->handler, 'registerAdminMenu']))
+                continue;
+
             // try to register menus
             try {
                 call_user_func([$module->handler, 'registerAdminMenu'], $user);
diff --git a/templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php b/templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php
index b50a2d83..f8d3ea58 100644
--- a/templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php
+++ b/templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php
@@ -38,7 +38,7 @@ class SetHomepage extends Controller
     public function getPages()
     {
         // get pages which are assigned as homepage parts
-        $usedPagesIds = (array)json_decode(Settings::get(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY, '{}'));
+        $usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
 
         // get all pages - they will be separated for used and not used on next lines
         $allPages = $this->content->getOverview()
@@ -128,7 +128,7 @@ class SetHomepage extends Controller
      */
     public function removePage($id)
     {
-        $pages = (array)json_decode(Settings::get(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY, '{}'));
+        $pages = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
 
         $page = Content::findOrFail($id);
 
diff --git a/templates/DoucovaniNeratovice/Handlers/Handler.php b/templates/DoucovaniNeratovice/Handlers/Handler.php
index bd821cbc..d3710284 100644
--- a/templates/DoucovaniNeratovice/Handlers/Handler.php
+++ b/templates/DoucovaniNeratovice/Handlers/Handler.php
@@ -66,7 +66,7 @@ class Handler extends OnePage
         return [
             [
                 'module'       => 'StaticPages',
-                'templateName' => 'staticpages::admin/adminMenu.templatePath'
+                'templateName' => 'staticpages::admin.templatePath'
             ],
             [
                 'module'       => 'ContactForm',