diff --git a/templates/404.html b/templates/404.html
index 9814e61..9557227 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block header %}
-<div class="alert alert-error">
+<div class="alert alert-error navmargin">
   <h1>404 - Not found</h1>
 </div>
 {% endblock header %}
diff --git a/templates/index.html b/templates/index.html
index d686827..0d58788 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -73,7 +73,7 @@
               <ul class="nav">
                 {% block navbar %}
                 {% for item in config.extra.zola386_menu %}
-                <li class="{% if item.path == current_path %}active{% endif %}">
+                <li class="{% if item.path == current_path | replace(from="/", to="") %}active{% endif %}">
                   <a href="{{ config.base_url }}/{{ item.path }}"><span>{{ item.name }}</span></a>
                 </li>
                 {% endfor %}
diff --git a/theme.toml b/theme.toml
index 135d1df..4b6e9ae 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.5"
+min_version = "0.1.6"
 demo = "https://zola-386.netlify.com"
 
 [author]