diff --git a/_includes/language-highlights.md b/_includes/language-highlights.md
index f816616..011ab79 100644
--- a/_includes/language-highlights.md
+++ b/_includes/language-highlights.md
@@ -14,15 +14,13 @@ It is important for you to namespace your code so that it may be used by other d
 
 PHP is a flexible, dynamic language that supports a variety of techniques. It has evolved dramatically over the years, notably adding a solid object-oriented model in PHP 5.0 (2004), anonymous functions and namespaces in PHP 5.3 (2009), and traits (or mixins) in PHP 5.4 (2012).
 
- * Object-oriented Programming
+* Object-oriented Programming
   * [Read about Object-oriented PHP][oop]
   * [Read about Traits (also known as Mixins)][traits]
-
- * Functional Programming
+* Functional Programming
   * [Read about Anonymous functions][anonymous-functions]
   * Read about dynamically invoking functions with [`call_user_func_array`][call-user-func-array]
-
- * Meta Programming
+* Meta Programming
   * [Read about Magic Methods][magic-methods]
   * [Read about Reflection][reflection]
 
diff --git a/_layouts/default.html b/_layouts/default.html
index a03bcde..c333a0e 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -30,10 +30,21 @@
             <ul>
                 <li><a href="/index.html#introduction">Introduction</a></li>
                 <li><a href="/index.html#code_style_guide">Code Style Guide</a></li>
-                <li><a href="#language_highlights">Language Highlights</a></li>
+                <li><a href="/index.html#language_highlights">Language Highlights</a>
+                    <ul>
+                        <li><a href="/index.html#namespaces">Namespaces</a></li>
+                        <li><a href="/index.html#programming_paradigms">Programming Paradigms</a></li>
+                        <li><a href="/index.html#standard_php_library">Standard PHP Library</a></li>
+                        <li><a href="/index.html#command_line_interface">Command Line Interface</a></li>
+                    </ul>
+                </li>
                 <li><a href="/index.html#databases_and_pdo">Databases and PDO</a></li>
-                <li><a href="/index.html#password_hashing_with_bcrypt">Password Hashing with Bcrypt</a></li>
-                <li><a href="/index.html#dependency_management">Dependency Management</a></li>
+                <li><a href="/index.html#security">Security</a>
+                    <ul>
+                        <li><a href="/index.html#password_hashing_with_bcrypt">Password Hashing with Bcrypt</a></li>
+                        <li><a href="/index.html#dependency_management">Dependency Management</a></li>
+                    </ul>
+                </li>
                 <li><a href="/index.html#web_application_security">Web Application Security</a></li>
                 <li><a href="/index.html#popular_frameworks">Popular Frameworks</a></li>
                 <li><a href="/index.html#links_and_resources">Links &amp; Resources</a></li>