diff --git a/docs/button.html b/docs/button.html
index 7c29a1b86..b4fd2181e 100644
--- a/docs/button.html
+++ b/docs/button.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -101,11 +99,11 @@
         <div class="menu">
           
             <div class="active item">
-              <a href="button.html">Button</a>
+              <a href="button.html">1. Button</a>
             </div>
           
             <div class="item">
-              <a href="label.html">Label</a>
+              <a href="label.html">2. Label</a>
             </div>
           
         </div>
@@ -134,33 +132,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
   <h1>Button</h1>
diff --git a/docs/collection.html b/docs/collection.html
index 53d8b5a75..9af4d6f2f 100644
--- a/docs/collection.html
+++ b/docs/collection.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -93,19 +91,23 @@
       </div>
       <div class="icon previous link item">
         
-        <i class="icon left-open"></i>
+        <a href="download.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
-        2 of 2
+        3 of 3
         <div class="menu">
           
             <div class="item">
-              <a href="index.html">About Semantic</a>
+              <a href="index.html">1. About Semantic</a>
+            </div>
+          
+            <div class="item">
+              <a href="download.html">2. Form</a>
             </div>
           
             <div class="active item">
-              <a href="index.html">UI Collections</a>
+              <a href="index.html">3. UI Collections</a>
             </div>
           
         </div>
@@ -134,33 +136,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>UI Collection</h1>
diff --git a/docs/download.html b/docs/download.html
index a4f22688b..7cf5536f1 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -62,8 +62,6 @@
       <a href="collection.html"><b>UI Collections</b></a>
       <div class="menu">
         
-          <div class="active item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="form.html">Form</a></div>
         
           <div class="item"><a href="header.html">Header</a></div>
@@ -89,42 +87,34 @@
   <div class="ui fixed transparent contrasting main menu">
     <div class="container">
       <div class="title item">
-        <b>Semantic:</b> UI Collection
+        <b>Semantic:</b> Semantic
       </div>
-      <div class="icon previous link disabled item">
+      <div class="icon previous link item">
         
-        <i class="icon left-open"></i>
+        <a href="index.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
-        1 of 6
+        2 of 3
         <div class="menu">
           
-            <div class="active item">
-              <a href="form.html">Form</a>
-            </div>
-          
-            <div class="item">
-              <a href="form.html">Form</a>
-            </div>
-          
             <div class="item">
-              <a href="header.html">Header</a>
+              <a href="index.html">1. About Semantic</a>
             </div>
           
-            <div class="item">
-              <a href="menu.html">Menu</a>
+            <div class="active item">
+              <a href="download.html">2. Form</a>
             </div>
           
             <div class="item">
-              <a href="table.html">Table</a>
+              <a href="index.html">3. UI Collections</a>
             </div>
           
         </div>
       </div>
       <div class="icon next link item">
         
-        <a href="form.html"><i class="icon right-open"></i></a>
+        <a href="index.html"><i class="icon right-open"></i></a>
         
       </div>
       <div class="right menu">
@@ -146,33 +136,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Download</h1>
diff --git a/docs/form.html b/docs/form.html
index 8344ba22a..c0cbe4da0 100644
--- a/docs/form.html
+++ b/docs/form.html
@@ -62,8 +62,6 @@
       <a href="collection.html"><b>UI Collections</b></a>
       <div class="menu">
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="active item"><a href="form.html">Form</a></div>
         
           <div class="item"><a href="header.html">Header</a></div>
@@ -91,33 +89,33 @@
       <div class="title item">
         <b>Semantic:</b> UI Collection
       </div>
-      <div class="icon previous link item">
+      <div class="icon previous link disabled item">
         
-        <a href="form.html"><i class="icon left-open"></i></a>
+        <i class="icon left-open"></i>
         
       </div>
       <div class="section dropdown item">
-        2 of 6
+        1 of 5
         <div class="menu">
           
-            <div class="item">
-              <a href="form.html">Form</a>
+            <div class="active item">
+              <a href="form.html">1. Form</a>
             </div>
           
-            <div class="active item">
-              <a href="form.html">Form</a>
+            <div class="item">
+              <a href="header.html">2. Header</a>
             </div>
           
             <div class="item">
-              <a href="header.html">Header</a>
+              <a href="menu.html">3. Menu</a>
             </div>
           
             <div class="item">
-              <a href="menu.html">Menu</a>
+              <a href="table.html">4. Table</a>
             </div>
           
             <div class="item">
-              <a href="table.html">Table</a>
+              <a href="text.html">5. Text Block</a>
             </div>
           
         </div>
@@ -146,33 +144,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Form</h1>
diff --git a/docs/header.html b/docs/header.html
index a6d69255c..e81111e0c 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="active item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -97,27 +95,27 @@
         
       </div>
       <div class="section dropdown item">
-        3 of 6
+        2 of 5
         <div class="menu">
           
             <div class="item">
-              <a href="form.html">Form</a>
+              <a href="form.html">1. Form</a>
             </div>
           
-            <div class="item">
-              <a href="form.html">Form</a>
+            <div class="active item">
+              <a href="header.html">2. Header</a>
             </div>
           
-            <div class="active item">
-              <a href="header.html">Header</a>
+            <div class="item">
+              <a href="menu.html">3. Menu</a>
             </div>
           
             <div class="item">
-              <a href="menu.html">Menu</a>
+              <a href="table.html">4. Table</a>
             </div>
           
             <div class="item">
-              <a href="table.html">Table</a>
+              <a href="text.html">5. Text Block</a>
             </div>
           
         </div>
@@ -146,33 +144,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Text Block</h1>
diff --git a/docs/label.html b/docs/label.html
index eb20e1c82..8eb3cde17 100644
--- a/docs/label.html
+++ b/docs/label.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -93,7 +91,7 @@
       </div>
       <div class="icon previous link item">
         
-        <i class="icon left-open"></i>
+        <a href="button.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
@@ -101,11 +99,11 @@
         <div class="menu">
           
             <div class="item">
-              <a href="button.html">Button</a>
+              <a href="button.html">1. Button</a>
             </div>
           
             <div class="active item">
-              <a href="label.html">Label</a>
+              <a href="label.html">2. Label</a>
             </div>
           
         </div>
@@ -134,33 +132,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Label</h1>
diff --git a/docs/menu.html b/docs/menu.html
index d1e78747f..272ca5a17 100644
--- a/docs/menu.html
+++ b/docs/menu.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="active item"><a href="menu.html">Menu</a></div>
@@ -93,38 +91,38 @@
       </div>
       <div class="icon previous link item">
         
-        <a href="menu.html"><i class="icon left-open"></i></a>
+        <a href="header.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
-        4 of 6
+        3 of 5
         <div class="menu">
           
             <div class="item">
-              <a href="form.html">Form</a>
+              <a href="form.html">1. Form</a>
             </div>
           
             <div class="item">
-              <a href="header.html">Header</a>
+              <a href="header.html">2. Header</a>
             </div>
           
             <div class="active item">
-              <a href="menu.html">Menu</a>
+              <a href="menu.html">3. Menu</a>
             </div>
           
             <div class="item">
-              <a href="table.html">Table</a>
+              <a href="table.html">4. Table</a>
             </div>
           
             <div class="item">
-              <a href="text.html">Text Block</a>
+              <a href="text.html">5. Text Block</a>
             </div>
           
         </div>
       </div>
       <div class="icon next link item">
         
-        <a href="text.html"><i class="icon right-open"></i></a>
+        <a href="table.html"><i class="icon right-open"></i></a>
         
       </div>
       <div class="right menu">
@@ -146,33 +144,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Menu</h1>
diff --git a/docs/scripts/all.min.js.REMOVED.git-id b/docs/scripts/all.min.js.REMOVED.git-id
deleted file mode 100644
index b09dd7b70..000000000
--- a/docs/scripts/all.min.js.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-6bff0f6a2bf45d3ac1d50166558c67417b8338d2
\ No newline at end of file
diff --git a/docs/sink.html b/docs/sink.html
index cac4d0650..73a62ab1a 100644
--- a/docs/sink.html
+++ b/docs/sink.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -101,7 +99,7 @@
         <div class="menu">
           
             <div class="active item">
-              <a href="sink.html">Kitchen Sink</a>
+              <a href="sink.html">1. Kitchen Sink</a>
             </div>
           
         </div>
@@ -130,33 +128,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <!DOCTYPE HTML>
 <html>
 <head>
diff --git a/docs/styles/all.min.css.REMOVED.git-id b/docs/styles/all.min.css.REMOVED.git-id
deleted file mode 100644
index ffbc01851..000000000
--- a/docs/styles/all.min.css.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-2f8c644bf7532c2de2e2ee5d9fc53d85f4ce05c1
\ No newline at end of file
diff --git a/docs/table.html b/docs/table.html
index 9a7e7a965..f6fcf3366 100644
--- a/docs/table.html
+++ b/docs/table.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -93,38 +91,38 @@
       </div>
       <div class="icon previous link item">
         
-        <i class="icon left-open"></i>
+        <a href="menu.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
-        5 of 6
+        4 of 5
         <div class="menu">
           
             <div class="item">
-              <a href="form.html">Form</a>
+              <a href="form.html">1. Form</a>
             </div>
           
             <div class="item">
-              <a href="header.html">Header</a>
+              <a href="header.html">2. Header</a>
             </div>
           
             <div class="item">
-              <a href="menu.html">Menu</a>
+              <a href="menu.html">3. Menu</a>
             </div>
           
             <div class="active item">
-              <a href="table.html">Table</a>
+              <a href="table.html">4. Table</a>
             </div>
           
             <div class="item">
-              <a href="text.html">Text Block</a>
+              <a href="text.html">5. Text Block</a>
             </div>
           
         </div>
       </div>
       <div class="icon next link item">
         
-        <i class="icon right-open"></i>
+        <a href="text.html"><i class="icon right-open"></i></a>
         
       </div>
       <div class="right menu">
@@ -146,33 +144,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Tables</h1>
diff --git a/docs/text.html b/docs/text.html
index 8d6a9f237..5e469b913 100644
--- a/docs/text.html
+++ b/docs/text.html
@@ -64,8 +64,6 @@
         
           <div class="item"><a href="form.html">Form</a></div>
         
-          <div class="item"><a href="form.html">Form</a></div>
-        
           <div class="item"><a href="header.html">Header</a></div>
         
           <div class="item"><a href="menu.html">Menu</a></div>
@@ -93,31 +91,31 @@
       </div>
       <div class="icon previous link item">
         
-        <i class="icon left-open"></i>
+        <a href="table.html"><i class="icon left-open"></i></a>
         
       </div>
       <div class="section dropdown item">
-        6 of 6
+        5 of 5
         <div class="menu">
           
             <div class="item">
-              <a href="form.html">Form</a>
+              <a href="form.html">1. Form</a>
             </div>
           
             <div class="item">
-              <a href="header.html">Header</a>
+              <a href="header.html">2. Header</a>
             </div>
           
             <div class="item">
-              <a href="menu.html">Menu</a>
+              <a href="menu.html">3. Menu</a>
             </div>
           
             <div class="item">
-              <a href="table.html">Table</a>
+              <a href="table.html">4. Table</a>
             </div>
           
             <div class="active item">
-              <a href="text.html">Text Block</a>
+              <a href="text.html">5. Text Block</a>
             </div>
           
         </div>
@@ -146,33 +144,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  
-    Button 
-  
-    UI Collections 
-  
-    Form 
-  
-    Form 
-  
-    Header 
-  
-    About Semantic 
-  
-    Label 
-  
-    Menu 
-  
-    Kitchen Sink 
-  
-    Table 
-  
-    Text Block 
-  
-    Shape 
-  
-    null 
-  
   <div class="segment">
   <div class="container">
     <h1>Text Block</h1>
diff --git a/node/src/documents/download.html b/node/src/documents/download.html
index 4af0501ad..a0077690c 100755
--- a/node/src/documents/download.html
+++ b/node/src/documents/download.html
@@ -1,10 +1,10 @@
 ---
 layout : 'default'
-url    : 'form.html'
-css    : 'form'
+url    : 'download.html'
+css    : 'download'
 
 title  : 'Form'
-type   : 'UI Collection'
+type   : 'Semantic'
 ---
 <div class="segment">
   <div class="container">
diff --git a/node/src/layouts/default.html.eco b/node/src/layouts/default.html.eco
index 2441c71aa..5c21232b4 100755
--- a/node/src/layouts/default.html.eco
+++ b/node/src/layouts/default.html.eco
@@ -37,10 +37,10 @@
   <script src="modules/ui/shape.js"></script>
   <script src="javascript/semantic.js"></script>
 </head> 
-<% uiElements        = @getCollection("html").findAllLive({type: $in: ['UI Element']},[{title: 1}]).toJSON() %>
-<% uiCollections     = @getCollection("html").findAllLive({type: $in: ['UI Collection']},[{title: 1}]).toJSON() %>
-<% uiModules         = @getCollection("html").findAllLive({type: $in: ['UI Module']},[{title: 1}]).toJSON() %>
-<% currentCollection = @getCollection("html").findAllLive({type: $in: [@document.type]},[{title: 1}]).toJSON() %>
+<% uiElements        = @getCollection("documents").findAllLive({type: $in: ['UI Element']},[{title: 1}]).toJSON() %>
+<% uiCollections     = @getCollection("documents").findAllLive({type: $in: ['UI Collection']},[{title: 1}]).toJSON() %>
+<% uiModules         = @getCollection("documents").findAllLive({type: $in: ['UI Module']},[{title: 1}]).toJSON() %>
+<% currentCollection = @getCollection("documents").findAllLive({type: $in: [@document.type]},[{title: 1}]).toJSON() %>
 <% pageCount         = @pageCount(currentCollection) %>
 <% pageNumber        = @getPage(currentCollection, @document.id) %>
 <% pageCollection    = @getPageCollection(currentCollection, @document.id) %>
@@ -80,7 +80,7 @@
         <b>Semantic:</b> <%= @document.type %>
       </div>
       <div class="icon previous link<%= if pageNumber is 1 then " disabled" %> item">
-        <% if pageNumber > 1 and pageCollection[pageNumber]?: %>
+        <% if pageNumber > 1 and pageCollection[pageNumber - 2]?: %>
         <a href="<%= pageCollection[pageNumber - 2].url %>"><i class="icon left-open"></i></a>
         <% else: %>
         <i class="icon left-open"></i>
@@ -91,7 +91,7 @@
         <div class="menu">
           <% for element, index in pageCollection: %>
             <div class="<%= if element.id is @document.id then 'active ' %>item">
-              <a href="<%= element.url %>"><%= element.title %></a>
+              <a href="<%= element.url %>"><%= (index+1) %>. <%= element.title %></a>
             </div>
           <% end %>
         </div>
@@ -122,9 +122,6 @@
   <div class="ui huge left attached vertical side buttons">
     <div class="ui large blue sidebar button"><i class="icon th-list"></i></div>
   </div>
-  <% for element in @getCollection("html").toJSON(): %>
-    <%= "#{element.title} " %>
-  <% end %>
   <%- @content %>
 </body>