diff --git a/Gemfile.lock b/Gemfile.lock
index 881cda94..a4beb006 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,13 +13,13 @@ GEM
     ffi (1.9.25)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    jekyll (3.4.1)
+    jekyll (3.5.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 3.0)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
       rouge (~> 1.7)
@@ -38,10 +38,12 @@ GEM
       sass (~> 3.4)
     jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
     jekyll-watch (1.5.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (3.0.6)
+    liquid (4.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -52,7 +54,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -72,13 +74,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (= 3.4.1)
+  jekyll (= 3.5)
   jekyll-avatar
   jekyll-feed (~> 0.6)
   jekyll-gist
   jekyll-livereload
   jekyll-paginate (~> 1.1)
   jekyll-seo-tag
+  jekyll-titles-from-headings
   tzinfo-data
 
 RUBY VERSION
diff --git a/README.md b/README.md
index 4bf00057..0f4a93e4 100644
--- a/README.md
+++ b/README.md
@@ -197,7 +197,7 @@ Add the following code at the top of the post:
 * TOC
 {:toc}
 ```
-`{:.no_toc}` exludes `#### Sections in this article` title from indexing in table of contents
+`{:.no_toc}` excludes  the `#### Sections in this article` title from indexing in table of contents
 
 ### Responsive Videos
 Embed local videos:
diff --git a/_config.yml b/_config.yml
index 12b0eb60..22a4c143 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,7 +12,7 @@ description:        Docs
 baseurl:            ""
 
 # Permalink URLs structure, for permalink style options see: https://jekyllrb.com/docs/permalinks/
-permalink:          /:title/
+# permalink:          /:title/
 
 # Site base hostname & protocol, e.g. http://example.com
 url:                "https://zbabystack.netlify.com"
@@ -86,11 +86,18 @@ post_assets:        /assets/posts/
 markdown:           kramdown
 highlighter:        rouge
 
-gems:
+plugins:
   - jekyll-feed
   - jekyll-seo-tag
   - jekyll-gist
   - jekyll-avatar
+  - jekyll-titles-from-headings
+
+titles_from_headings:
+  enabled:     true
+  strip_title: true
+  collections: true
+
 exclude:
   - Gemfile
   - Gemfile.lock
@@ -102,7 +109,7 @@ sass:
 collections:
   android:
     output: true
-  docs:
+  core:
     output: true
   gaia:
     output: true
diff --git a/_data/navigation_home.yml b/_data/navigation_home.yml
index 6b5c9da0..83fbebb5 100644
--- a/_data/navigation_home.yml
+++ b/_data/navigation_home.yml
@@ -13,7 +13,7 @@
 - title: Build Apps and Earn Money
   desc: Learn how to build an application that earns with Blockstack.
   icon: settings
-  doc: docs/about
+  doc: android/tutorial
 
 - title: Use the Naming Service
   desc: Managing your account, create new users and exporting data
diff --git a/_data/navigation_learn.yml b/_data/navigation_learn.yml
index 985a25fd..7bde01c8 100644
--- a/_data/navigation_learn.yml
+++ b/_data/navigation_learn.yml
@@ -1,23 +1,6 @@
 - title: Introduction
   docs:
-  - learn/overview
-  - learn/problems
-  - learn/tokens
 
-- title: Components
+- title: SDKs
   docs:
-  - learn/identity
-  - learn/profiles
-
-- title: Reference
-  docs:
-  - learn/faqs
-  - learn/glossary
-
-
-- title: Contributing
-  docs:
-  - learn/contribute
-  - learn/issues
-  - learn/pullrequest
-  - learn/community
+  - android/tutorial
diff --git a/_layouts/learn.html b/_layouts/learn.html
index 708db7e4..601c9bba 100644
--- a/_layouts/learn.html
+++ b/_layouts/learn.html
@@ -9,23 +9,23 @@ layout: default
             <div class="sidebar-fixed-width uk-visible@m">
                 <div class="sidebar-docs uk-position-fixed">
                     {% for section in site.data.navigation_learn %}
-                    <h5>{{ section.title }}</h5>
-                    <ul class="uk-nav uk-nav-default doc-nav">
-                    {% for doc in section.docs %}
-                      {% assign doc_url = doc | prepend:"/" | append:"/" %}
-                      <!-- {% assign p =  site.docs | where:"url", doc_url | first %} -->
-                      {% for col in site.collections %}
-                        {% for item in col.docs %}
-                            {% if item.url == doc_url %}
-                                 {% assign doc_title = item.title %}
-                             {% else %}
-                               {% comment %}Do nothing{% endcomment %}
-                             {% endif %}
+                        <h5>{{ section.title }}</h5>
+                        <ul class="uk-nav uk-nav-default doc-nav">
+                        {% for doc in section.docs %}
+                            {% assign doc_url = doc | prepend:"/" | append:".html"%}
+                            <!-- {% assign p =  site.docs | where:"url", doc_url | first %} -->
+                            {% for col in site.collections %}
+                              {% for item in col.docs %}
+                                  {% if item.url == doc_url %}
+                                       {% assign doc_title = item.title %}
+                                   {% else %}
+                                     {% comment %}Do nothing{% endcomment %}
+                                   {% endif %}
+                              {% endfor %}
+                            {% endfor %}
+                            <li class="{% if doc_url == page.url %}uk-active{% endif %}"><a href="{{ doc_url }}">{{ doc_title }}</a></li>
                         {% endfor %}
-                      {% endfor %}
-                      <li class="{% if doc_url == page.url %}uk-active{% endif %}"><a href="{{ doc_url }}">{{ doc_title }}</a></li>
-                    {% endfor %}
-                    </ul>
+                        </ul>
                     {% endfor %}
                 </div>
             </div>
diff --git a/_posts/2017-05-25-post63.md b/_posts/2017-05-25-post63.md
index f9af07a1..85eda15d 100644
--- a/_posts/2017-05-25-post63.md
+++ b/_posts/2017-05-25-post63.md
@@ -14,7 +14,7 @@ author: John Black
 
 {{ site.post_assets | absolute_url }}
 
-{{ absolute_url }}
+{{ page.url  }}
 
 Musce libero nunc, dignissim quis turpis quis, semper vehicula dolor. Suspendisse tincidunt consequat quam, ac posuere leo dapibus id. Cras fringilla convallis elit, at eleifend mi interam.