diff --git a/src/core/DependencyInjection/Configuration.php b/src/core/DependencyInjection/Configuration.php
index e007c9c..86ef226 100644
--- a/src/core/DependencyInjection/Configuration.php
+++ b/src/core/DependencyInjection/Configuration.php
@@ -51,12 +51,10 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('name')
                             ->defaultValue('Murph')
                             ->isRequired()
-                            ->cannotBeEmpty()
                         ->end()
                         ->scalarNode('logo')
                             ->defaultValue('build/images/core/logo.svg')
                             ->isRequired()
-                            ->cannotBeEmpty()
                         ->end()
                         ->arrayNode('controllers')
                             ->prototype('array')
diff --git a/src/core/Resources/views/account/admin/edit.html.twig b/src/core/Resources/views/account/admin/edit.html.twig
index fca56d1..2de0219 100644
--- a/src/core/Resources/views/account/admin/edit.html.twig
+++ b/src/core/Resources/views/account/admin/edit.html.twig
@@ -2,7 +2,7 @@
 
 {% import _self as macros %}
 
-{% block title %}{{ 'My account'|trans }} - {{ parent() }}{% endblock %}
+{% block title %}{{ 'My account'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
diff --git a/src/core/Resources/views/admin/crud/edit.html.twig b/src/core/Resources/views/admin/crud/edit.html.twig
index 027b699..72372a8 100644
--- a/src/core/Resources/views/admin/crud/edit.html.twig
+++ b/src/core/Resources/views/admin/crud/edit.html.twig
@@ -4,7 +4,7 @@
 
 {% block body_class %}has-form{% endblock %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/crud/index.html.twig b/src/core/Resources/views/admin/crud/index.html.twig
index 7a588cc..34e5eaf 100644
--- a/src/core/Resources/views/admin/crud/index.html.twig
+++ b/src/core/Resources/views/admin/crud/index.html.twig
@@ -2,7 +2,7 @@
 
 {% set context = context ?? 'index' %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans }} - {{ parent() }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/crud/new.html.twig b/src/core/Resources/views/admin/crud/new.html.twig
index f3b8cfe..1936986 100644
--- a/src/core/Resources/views/admin/crud/new.html.twig
+++ b/src/core/Resources/views/admin/crud/new.html.twig
@@ -4,7 +4,7 @@
 
 {% block body_class %}has-form{% endblock %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/crud/show.html.twig b/src/core/Resources/views/admin/crud/show.html.twig
index 365653e..2cefa56 100644
--- a/src/core/Resources/views/admin/crud/show.html.twig
+++ b/src/core/Resources/views/admin/crud/show.html.twig
@@ -2,7 +2,7 @@
 
 {% set context = context ?? 'show' %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/layout.html.twig b/src/core/Resources/views/admin/layout.html.twig
index ffd170c..f6195ed 100644
--- a/src/core/Resources/views/admin/layout.html.twig
+++ b/src/core/Resources/views/admin/layout.html.twig
@@ -15,7 +15,9 @@
 
         <nav class="navbar fixed-top navbar-expand-md navbar-light bg-light border-bottom">
             <a class="navbar-brand" href="{{ path('admin_dashboard_index') }}">
-                <img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
+                {% if site_logo %}
+                    <img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
+                {% endif %}
 
                 <span class="ml-2 d-none d-md-inline">{{ site_name }}</span>
             </a>
diff --git a/src/core/Resources/views/setting/setting_admin/index.html.twig b/src/core/Resources/views/setting/setting_admin/index.html.twig
index 23ed354..19110cc 100644
--- a/src/core/Resources/views/setting/setting_admin/index.html.twig
+++ b/src/core/Resources/views/setting/setting_admin/index.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Settings'|trans }} - {{ parent() }}{% endblock %}
+{% block title %}{{ 'Settings'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
diff --git a/src/core/Resources/views/site/tree_admin/navigation.html.twig b/src/core/Resources/views/site/tree_admin/navigation.html.twig
index a106cf6..a9ae8d1 100644
--- a/src/core/Resources/views/site/tree_admin/navigation.html.twig
+++ b/src/core/Resources/views/site/tree_admin/navigation.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Tree'|trans }} - {{ parent() }}{% endblock %}
+{% block title %}{{ 'Tree'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
diff --git a/src/core/Resources/views/task/task_admin/index.html.twig b/src/core/Resources/views/task/task_admin/index.html.twig
index 8600eda..70e0f35 100644
--- a/src/core/Resources/views/task/task_admin/index.html.twig
+++ b/src/core/Resources/views/task/task_admin/index.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Tasks'|trans }} - {{ parent() }}{% endblock %}
+{% block title %}{{ 'Tasks'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">