diff --git a/_includes/head.html b/_includes/head.html
index 4f22497..c0f73d7 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,9 +10,9 @@
{% endif %}
{% endunless %}
-
+
-
+
{% if site.ga_tracking != nil %}
@@ -27,9 +27,9 @@
{% endif %}
{% if site.search_enabled != false %}
-
+
{% endif %}
-
+
diff --git a/_includes/nav.html b/_includes/nav.html
index f2ec7e5..8f0b089 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -14,12 +14,12 @@
{%- if node.parent == nil and node.title -%}
{%- if page.parent == node.title or page.grand_parent == node.title -%}
- {%- assign first_level_url = node.url | absolute_url -%}
+ {%- assign first_level_url = node.url | relative_url -%}
{%- endif -%}
{%- if node.has_children -%}
{%- endif -%}
- {{ node.title }}
+ {{ node.title }}
{%- if node.has_children -%}
{%- assign children_list = pages_list | where: "parent", node.title -%}
@@ -27,18 +27,18 @@
{%- unless child.nav_exclude -%}
-
{%- if page.url == child.url or page.parent == child.title -%}
- {%- assign second_level_url = child.url | absolute_url -%}
+ {%- assign second_level_url = child.url | relative_url -%}
{%- endif -%}
{%- if child.has_children -%}
{%- endif -%}
- {{ child.title }}
+ {{ child.title }}
{%- if child.has_children -%}
{%- assign grand_children_list = pages_list | where: "parent", child.title | where: "grand_parent", node.title -%}
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index 8e6305a..6b0900e 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -47,7 +47,7 @@ permalink: /assets/js/search-data.json
"doc": {{ page.title | jsonify }},
"title": {{ title | jsonify }},
"content": {{ content | replace: \'