WIP
diff --git a/_includes/left-side-menu.html b/_includes/left-side-menu.html
index ee9388b..6b31ae8 100644
--- a/_includes/left-side-menu.html
+++ b/_includes/left-side-menu.html
@@ -38,11 +38,34 @@
         <a href="/first-example.html">First Example</a>
         {% endif %}
     </li>
+
+    <li class="side-nav-title">Developer Guide</li>
     <li>
-        {% if page.id == api-components" %}
-        <a class="active" href="/api-components.html">API Components</a>
+        {% if page.id == "api-components" %}
+            <a class="active" href="/api-components.html">API Components</a>
         {% else %}
-        <a href="/api-components.html">API Components</a>
+            <a href="/api-components.html">API Components</a>
+        {% endif %}
+    </li>
+    <li>
+        {% if page.id == "custom-components" %}
+            <a class="active" href="/custom-components.html">Custom Components</a>
+        {% else %}
+            <a href="/custom-components.html">Custom Components</a>
+        {% endif %}
+    </li>
+    <li>
+        {% if page.id == "intent_matching" %}
+            <a class="active" href="/intent-matching.html">Intent Matching</a>
+        {% else %}
+            <a href="/intent-matching.html">Intent Matching</a>
+        {% endif %}
+    </li>
+    <li>
+        {% if page.id == "short_term_memory" %}
+            <a class="active" href="/short-term-memory.html">Short-Term Memory</a>
+        {% else %}
+            <a href="/short-term-memory.html">Short-Term Memory</a>
         {% endif %}
     </li>
 
@@ -56,16 +79,16 @@
     </li>
     <li>
         {% if page.id == "built-in-token-parser" %}
-        <a class="active" href="/built-in-token-parser.html">Token parsers</a>
+        <a class="active" href="/built-in-token-parser.html">Token Parsers</a>
         {% else %}
-        <a href="/built-in-token-parser.html">Token parsers</a>
+        <a href="/built-in-token-parser.html">Token Parsers</a>
         {% endif %}
     </li>
     <li>
         {% if page.id == "built-in-token-enricher" %}
-        <a class="active" href="/built-in-token-enricher.html">Token enrichers</a>
+        <a class="active" href="/built-in-token-enricher.html">Token Enrichers</a>
         {% else %}
-        <a href="/built-in-token-enricher.html">Token enrichers</a>
+        <a href="/built-in-token-enricher.html">Token Enrichers</a>
         {% endif %}
     </li>
     <li>
@@ -77,32 +100,9 @@
     </li>
     <li>
         {% if page.id == "built-in-builder" %}
-        <a class="active" href="/built-in-builder.html">Pipeline builder</a>
+        <a class="active" href="/built-in-builder.html">Pipeline Builder</a>
         {% else %}
-        <a href="/built-in-builder.html">Pipeline builder</a>
-        {% endif %}
-    </li>
-
-    <li class="side-nav-title">Developer Guide</li>
-    <li>
-        {% if page.id == "custom-components" %}
-        <a class="active" href="/custom-components.html">Custom Components</a>
-        {% else %}
-        <a href="/custom-components.html">Custom Components</a>
-        {% endif %}
-    </li>
-    <li>
-        {% if page.id == "intent_matching" %}
-        <a class="active" href="/intent-matching.html">Intent Matching</a>
-        {% else %}
-        <a href="/intent-matching.html">Intent Matching</a>
-        {% endif %}
-    </li>
-    <li>
-        {% if page.id == "short_term_memory" %}
-        <a class="active" href="/short-term-memory.html">Short-Term Memory</a>
-        {% else %}
-        <a href="/short-term-memory.html">Short-Term Memory</a>
+        <a href="/built-in-builder.html">Pipeline Builder</a>
         {% endif %}
     </li>
 
diff --git a/examples/calculator.html b/examples/calculator.html
index 9695809..0d6be7a 100644
--- a/examples/calculator.html
+++ b/examples/calculator.html
@@ -31,7 +31,7 @@
         </p>
         <p>
             <b>Complexity:</b> <span class="complexity-one-star"><i class="fas fa-star"></i> <i class="far fa-star"></i> <i class="far fa-star"></i></span><br/>
-            <span class="ex-src">Source code: <a target="github" href="https://github.com/apache/incubator-nlpcraft/tree/master/nlpcraft-examples/caclulator">GitHub <i class="fab fa-fw fa-github"></i></a><br/></span>
+            <span class="ex-src">Source code: <a target="github" href="https://github.com/apache/incubator-nlpcraft/tree/master/nlpcraft-examples/calculator">GitHub <i class="fab fa-fw fa-github"></i></a><br/></span>
             <span class="ex-review-all">Review: <a target="github" href="https://github.com/apache/incubator-nlpcraft/tree/master/nlpcraft-examples">All Examples at GitHub <i class="fab fa-fw fa-github"></i></a></span>
         </p>
     </section>
@@ -41,7 +41,7 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: []">
+        <pre class="brush: js, highlight: [7]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
diff --git a/examples/light_switch.html b/examples/light_switch.html
index b0e7c28..24ebdc9 100644
--- a/examples/light_switch.html
+++ b/examples/light_switch.html
@@ -43,7 +43,7 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: []">
+        <pre class="brush: js, highlight: [7]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
diff --git a/examples/light_switch_fr.html b/examples/light_switch_fr.html
index 7e65f24..3c1e41f 100644
--- a/examples/light_switch_fr.html
+++ b/examples/light_switch_fr.html
@@ -43,7 +43,7 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: [8, 9, 10]">
+        <pre class="brush: js, highlight: [7, 8, 9, 10]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
diff --git a/examples/light_switch_ru.html b/examples/light_switch_ru.html
index 72c4d52..109da51 100644
--- a/examples/light_switch_ru.html
+++ b/examples/light_switch_ru.html
@@ -43,7 +43,7 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: [8, 9, 10]">
+        <pre class="brush: js, highlight: [7, 8, 9, 10]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
diff --git a/examples/pizzeria.html b/examples/pizzeria.html
index f70f6ed..687343b 100644
--- a/examples/pizzeria.html
+++ b/examples/pizzeria.html
@@ -41,7 +41,7 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: []">
+        <pre class="brush: js, highlight: [7]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
diff --git a/examples/time.html b/examples/time.html
index 9e991fb..5b57a63 100644
--- a/examples/time.html
+++ b/examples/time.html
@@ -41,13 +41,15 @@
             You can create new Scala projects in many ways - we'll use SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: []">
+        <pre class="brush: js, highlight: [7]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
               .settings(
-                name := "NLPCraft Time Example",
-                version := "{{site.latest_version}}"
+                name := "NLPCraft Calculator Example",
+                version := "{{site.latest_version}}",
+                libraryDependencies += "org.apache.nlpcraft" % "nlpcraft" % "{{site.latest_version}}",
+                libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.14" % "test"
               )
         </pre>
         <p><b>NOTE: </b>use the latest versions of Scala and ScalaTest.</p>
diff --git a/installation.html b/installation.html
index 89f49c6..f958e6b 100644
--- a/installation.html
+++ b/installation.html
@@ -32,12 +32,12 @@
                 <a target="asf" href="https://www.apache.org/dyn/closer.cgi#verify">verify</a> it and unzip it.
             </li>
             <li>If you <a href="/download.html">cloned</a> GitHub repository or downloaded source archive compile
-                it via <code>SBT</code> command.
+                it via <code>SBT</code> command:
                 <pre class="brush: scala, highlight: []">
                     $ sbt clean compile
                 </pre>
             </li>
-            <li>Also you can use <code>maven</code> command and get same result.
+            <li>Also you can use <code>maven</code> command and get same result:
                 <pre class="brush: scala, highlight: []">
                     $ mvn -B clean package -P stanford-core,examples
                 </pre>
@@ -58,10 +58,10 @@
     <section id="new_project">
         <h2 class="section-title">Create New Project <a href="#"><i class="top-link fas fa-fw fa-angle-double-up"></i></a></h2>
         <p>
-            You can create new Scala projects in many ways - we'll use SBT
+            You can create new Scala projects in many ways - we recommend SBT
             to accomplish this task. Make sure that <code>build.sbt</code> file has the following content:
         </p>
-        <pre class="brush: js, highlight: []">
+        <pre class="brush: js, highlight: [7]">
             ThisBuild / version := "0.1.0-SNAPSHOT"
             ThisBuild / scalaVersion := "3.1.3"
             lazy val root = (project in file("."))
@@ -73,10 +73,11 @@
               )
         </pre>
 
-        <p><b>NOTE: </b>use the latest versions of Scala and ScalaTest.</p>
-
         <p>
-            Go to <a href="first-example.html">First example</a> section to look at concrete example.
+            <b>NOTE: </b>make sure to use the latest versions of Scala and ScalaTest.
+        </p>
+        <p>
+            Check out <a href="first-example.html">First Example</a> for a quick deep dive.
         </p>
     </section>
  </div>