diff --git a/README.md b/README.md
index da9ec38..824225a 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ zola386_menu = [
 ### Social
 ZOLA.386 is also prepared to deal with Google Analytics, Disqus, and Twitter --[Open Graph Protocol](https://ogp.me/) is welcome.  This theme is prepared to use the output of [Favicon Generator](https://www.favicon-generator.org/), to do so, you'll just need to download the output of that site and extract in `static/images`. 
 
-As said, Disqus is supportted, but besides setting the username in `config.toml`, you also must to put a `disqus = true` extra option on the pages where Disqus will be enable --this gives you the freedom to enable or disable comments on certain posts.  You can use the extra option `image` on each page, to represent that post.
+As said, Disqus is supportted, but besides setting the username in `config.toml`, you also must to put a `comments = true` extra option on the pages where Disqus will be enabled --this gives you the freedom to enable or disable comments on certain posts.  You can use the extra option `image` on each page, to represent that post.
 
 ### Animations
 All JavaScript animations can be set at `static/js/zola386.js`.  Basically you can disable all animations, use one or two scans, and change the scan speed.  Personally, I prefer only one scan with a speed factor of 5.
diff --git a/config.toml b/config.toml
index 3c58ea9..b28fb14 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,7 @@ base_url = "https://zola386.netlify.app"
 
 default_language = "en"
 title = "ZOLA.386"
-description = "ZOLA.386 is a port of the BOOTSTRA.386 theme."
+description = "A port of the BOOTSTRA.386 theme."
 
 highlight_code = true
 compile_sass = true
@@ -22,7 +22,7 @@ year = "2020"
 keywords = "zola, theme, retro, hacking"
 theme_color = "#000084"
 zola386_menu = [
-  {path="/", name="Home"},
+  {path="", name="Home"},
   {path="categories", name="Categories"},
   {path="tags", name="Tags"},
   {path="about", name="About"},
diff --git a/content/lorem-ipsum/index.md b/content/lorem-ipsum/index.md
index 3ceedc9..f4dde60 100644
--- a/content/lorem-ipsum/index.md
+++ b/content/lorem-ipsum/index.md
@@ -10,7 +10,7 @@ categories = ["pellentesque"]
 tags = ["hac", "velit", "risus"]
 
 [extra]
-disqus = true
+comments = true
 lang = "br"
 +++
 
diff --git a/content/sem-nulla.md b/content/sem-nulla.md
index 28339d6..6c5eec0 100644
--- a/content/sem-nulla.md
+++ b/content/sem-nulla.md
@@ -10,7 +10,7 @@ categories = ["laoreet"]
 tags = ["risus", "platea", "nunc"]
 
 [extra]
-disqus = true
+comments = true
 +++
 
 Sem nulla pharetra diam sit amet nisl suscipit. Quis blandit turpis cursus in hac habitasse platea dictumst. Id diam vel quam elementum pulvinar. Fermentum dui faucibus in ornare quam. Libero justo laoreet sit amet cursus sit amet dictum sit. Lacus luctus accumsan tortor posuere. Turpis egestas maecenas pharetra convallis posuere morbi leo. At varius vel pharetra vel turpis nunc eget lorem dolor. Tristique senectus et netus et. In hac habitasse platea dictumst vestibulum rhoncus. Gravida rutrum quisque non tellus orci ac. Nulla facilisi morbi tempus iaculis urna id volutpat. Porta lorem mollis aliquam ut porttitor leo. Dictum sit amet justo donec enim diam vulputate. Dapibus ultrices in iaculis nunc sed augue lacus. Mattis pellentesque id nibh tortor id aliquet. Quisque egestas diam in arcu cursus euismod quis viverra. Laoreet non curabitur gravida arcu. Risus commodo viverra maecenas accumsan lacus vel facilisis volutpat est. Ut venenatis tellus in metus.
diff --git a/sass/site.scss b/sass/site.scss
index 37a9977..9255163 100644
--- a/sass/site.scss
+++ b/sass/site.scss
@@ -12,5 +12,5 @@
 }
 
 .navmargin {
-	margin-top: 40px;
+	margin-top: 20px;
 }
diff --git a/templates/index.html b/templates/index.html
index 3e3cfb6..72b4b88 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -42,7 +42,9 @@
   <meta property="og:description" content="{% block ogdesc %}{{ config.description }}{% endblock ogdesc %}">
   <meta property="og:url" content="{% block ogurl %}{{ config.base_url }}{% endblock ogurl%}">
   <meta property="og:site_name" content="{{ config.title }}">
+  {% if config.extra.image %}
   <meta property="og:image" content="{% block ogimg %}{{ config.extra.image }}{% endblock ogimg %}">
+  {% endif %}
   <meta name="twitter:card" content="summary">
   {% if config.extra.twitter_user %}
   <meta name="twitter:site" content="{{ config.extra.twitter_user }}">
@@ -87,7 +89,7 @@
       {% block breadcrumb %}{% endblock breadcrumb %}
       {% block header %}
       <div class="page-header">
-        <h1>{{ config.extra.label_welcome}}{{ config.title }}</h1>
+        <h1>{{ config.title }} <small>{{ config.description }}</small></h1>
       </div>
       {% endblock header %}
       {% block meta %}{% endblock meta %}
@@ -97,8 +99,6 @@
 
       <div class="span9 bs-docs-sidebar">
       {% block main %}
-        <p class="lead">{{ config.description }}</p>
-
         {% for page in paginator.pages %}
           {{ macro::post_max(page=page) }}
         {% endfor %}
diff --git a/templates/page.html b/templates/page.html
index 35f8757..7449f30 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -15,14 +15,14 @@
 <p class="lead">
   <span>&gt;&gt;</span>
   <a href="{{ config.base_url }}">Home</a>
-  <span class="divider">/</span>
-  <a class="category" href="{{ get_taxonomy_url(kind="categories", name=page.taxonomies.categories[0]) }}">
-    {{ page.taxonomies.categories[0] }}
-  </a>
-  <span class="divider">/</span>
-    {% for tag in page.taxonomies.tags %}
-      <a href="{{ get_taxonomy_url(kind="tags", name=tag) }}">{{ tag }}</a>{% if page.taxonomies.tags | length > 1 %}{% if loop.index != page.taxonomies.tags | length %},{% endif %}{% endif %}
-    {% endfor %}
+  {% if page.taxonomies %}
+    <span class="divider">/</span>
+    <a class="category" href="{{ get_taxonomy_url(kind="categories", name=page.taxonomies.categories[0]) }}">{{ page.taxonomies.categories[0] }}</a>
+    <span class="divider">/</span>
+      {% for tag in page.taxonomies.tags %}
+        <a href="{{ get_taxonomy_url(kind="tags", name=tag) }}">{{ tag }}</a>{% if page.taxonomies.tags | length > 1 %}{% if loop.index != page.taxonomies.tags | length %},{% endif %}{% endif %}
+      {% endfor %}
+  {% endif %}
 </p>
 {% endblock breadcrumb %}
 
@@ -49,7 +49,7 @@
 
 {% block main %}
 {{ page.content | safe }}
-{% if config.extra.disqus and page.extra.disqus %}
+{% if config.extra.disqus and page.extra.comments %}
 <div id="disqus">
   <div id="disqus_thread"></div>
   <script>
diff --git a/theme.toml b/theme.toml
index a932bb3..3740291 100644
--- a/theme.toml
+++ b/theme.toml
@@ -2,7 +2,7 @@ name = "zola.386"
 description = "Zola port of the BOOTSTRA.386 theme."
 license = "MIT"
 homepage = "https://github.com/lopes/zola.386"
-min_version = "0.1.3"
+min_version = "0.1.4"
 demo = "https://zola-386.netlify.com"
 
 [author]