diff --git a/public/components/global-nav.tag b/public/components/global-nav.tag
new file mode 100644
index 0000000..033eb7a
--- /dev/null
+++ b/public/components/global-nav.tag
@@ -0,0 +1,30 @@
+<global-nav>
+  <nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+      <nav-header></nav-header>
+      <navbar></navbar>
+    </div>
+  </nav>
+</global-nav>
+
+<nav-header>
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="#">Project name</a>
+  </div>
+</nav-header>
+
+<navbar>
+  <div id="navbar" class="navbar-collapse collapse">
+    <ul class="nav navbar-nav">
+      <li class="active"><a href="#">Home</a></li>
+      <li><a href="#about">About</a></li>
+      <li><a href="#contact">Contact</a></li>
+    </ul>
+  </div>
+</navbar>
diff --git a/public/components/jumbotron.tag b/public/components/jumbotron.tag
new file mode 100644
index 0000000..45c99a6
--- /dev/null
+++ b/public/components/jumbotron.tag
@@ -0,0 +1,5 @@
+<jumbotron>
+  <div class="jumbotron">
+    <yield/>
+  </div>
+</jumbotron>
diff --git a/public/index.html b/public/index.html
index 0e5b8f3..dbcbdfb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,41 +11,27 @@
   </head>
 
   <body>
-
-    <nav class="navbar navbar-default navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Project name</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="#about">About</a></li>
-            <li><a href="#contact">Contact</a></li>
-          </ul>
-        </div>
-      </div>
-    </nav>
+    <global-nav></global-nav>
 
     <div class="container">
-      <div class="jumbotron">
+      <jumbotron>
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>To see the difference between static and fixed top navbars, just scroll.</p>
         <p>
           <a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
         </p>
-      </div>
+      </jumbotron>
     </div>
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
     <script type="text/javascript" src="./javascripts/bootstrap.min.js"></script>
-
+    <script type="text/javascript" src="./javascripts/riot+compiler.min.js"></script>
+    <script type="riot/tag" src="./components/jumbotron.tag"></script>
+    <script type="riot/tag" src="./components/global-nav.tag"></script>
+    <script>
+      riot.mount('*');
+    </script>
   </body>
 
 </html>
