diff --git a/server/documents/collections/menu.html.eco b/server/documents/collections/menu.html.eco
index 6071d1fca..2f54884de 100755
--- a/server/documents/collections/menu.html.eco
+++ b/server/documents/collections/menu.html.eco
@@ -1,6 +1,7 @@
 ---
 layout      : 'default'
 css         : 'menu'
+standalone  : true
 
 element     : 'menu'
 elementType : 'collection'
@@ -24,6 +25,9 @@ themes      : ['Default', 'GitHub']
 
     <p>A menu</p>
     <div class="ui menu">
+      <div class="item">
+        <img class="ui tiny image" src="/images/logo.png">
+      </div>
       <a class="active item">
         <i class="home icon"></i> Home
       </a>
diff --git a/server/documents/hotfix.html.eco b/server/documents/hotfix.html.eco
index eac867ee9..0c5787678 100755
--- a/server/documents/hotfix.html.eco
+++ b/server/documents/hotfix.html.eco
@@ -10,19 +10,6 @@ type       : 'Library'
 <script type="text/javascript">
 $(document).ready(function() {
 
-$("#el1").popup({
-    on : "click",
-    position : "bottom center"
-});
-
-$("#el2").popup({
-    on : "click",
-    position : "bottom center"
-});
-
-$("#el1").data("html", "<b>LEFT POPUP</b>");
-$("#el2").data("html", "<b>RIGHT POPUP</b>");
-
 });
 </script>
 
@@ -30,10 +17,16 @@ $("#el2").data("html", "<b>RIGHT POPUP</b>");
 <style type="text/css">
 </style>
 <div class="ui page grid">
-    <div class="column">
-        <h2 class="ui dividing header">
-            <div id="el1" class="ui button">left</div>
-            <div id="el2" class="ui button">right</div>
-        </h2>
+  <div class="column">
+    <div class="ui hidden divider"></div>
+    <div class="ui hidden divider"></div>
+    <div class="ui hidden divider"></div>
+    <div class="ui top attached tabular menu">
+      <div class="active item">Tab 1</div>
+      <div class="item">Tab 2</div>
+    </div>
+    <div class="ui bottom attached segment">
+      2
     </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/server/documents/modules/dimmer.html.eco b/server/documents/modules/dimmer.html.eco
index 12a6e56ed..283f78a77 100755
--- a/server/documents/modules/dimmer.html.eco
+++ b/server/documents/modules/dimmer.html.eco
@@ -1,6 +1,7 @@
 ---
 layout      : 'default'
 css         : 'dim'
+standalone  : true
 
 element     : 'dimmer'
 elementType : 'module'
@@ -80,14 +81,10 @@ themes      : ['Default']
         </div>
         <img class="ui medium wireframe image" src="/images/wireframe/media-paragraph.png">
         <div class="ui dimmer">
-          <div class="content">
-            <div class="center">
-              <h2 class="ui inverted icon header">
-                <i class="heart icon"></i>
-                Dimmed Message!
-              </h2>
-            </div>
-          </div>
+          <h2 class="ui inverted icon header">
+            <i class="heart icon"></i>
+            Dimmed Message!
+          </h2>
         </div>
       </div>
       <div class="ui ignored icon buttons">
diff --git a/server/files/javascript/docs.js b/server/files/javascript/docs.js
index 111b9ffb0..439132d07 100755
--- a/server/files/javascript/docs.js
+++ b/server/files/javascript/docs.js
@@ -95,9 +95,14 @@ semantic.ready = function() {
     createIcon: function() {
       $example
         .each(function(){
+          var
+            $insertPoint = $(this).is('.another')
+              ? $(this).children().eq(0)
+              : $(this).children().eq(1)
+          ;
           $('<i/>')
             .addClass('icon code')
-            .insertAfter( $(this).children(':first-child') )
+            .insertBefore( $insertPoint )
           ;
         })
       ;
@@ -597,9 +602,14 @@ semantic.ready = function() {
           ? lines[1]
           : lines[0],
         spacesPerIndent = 2,
-        leadingSpaces   = firstLine.length - firstLine.replace(/^\s*/g, '').length,
+        leadingSpaces   = (firstLine !== undefined)
+          ? firstLine.length - firstLine.replace(/^\s*/g, '').length
+          : false,
         indent
       ;
+      if(!leadingSpaces) {
+        return 4;
+      }
       if(leadingSpaces !== 0) {
         indent = leadingSpaces;
       }
diff --git a/server/files/javascript/menu.js b/server/files/javascript/menu.js
index b2127b948..7d9dfe285 100755
--- a/server/files/javascript/menu.js
+++ b/server/files/javascript/menu.js
@@ -5,8 +5,9 @@ semantic.menu.ready = function() {
 
   // selector cache
   var
-    $menuItem = $('.menu a.item, .menu .link.item'),
-    $dropdown = $('.main.container .menu .dropdown'),
+    $dropdownItem = $('.main.container .menu .dropdown .item'),
+    $menuItem     = $('.main.container .menu a.item, .menu .link.item').not($dropdownItem),
+    $dropdown     = $('.main.container .menu .dropdown'),
     // alias
     handler = {
 
diff --git a/server/files/stylesheets/docs.css b/server/files/stylesheets/docs.css
index ffb30b16f..b9562010c 100755
--- a/server/files/stylesheets/docs.css
+++ b/server/files/stylesheets/docs.css
@@ -757,13 +757,15 @@ body#example {
   padding-top: 0px;
   border-top: none;
 }
-#example .another.example i.code,
 #example .example:first-child i.code,
 #example h2 + .example i.code,
 #example h3 + .example i.code,
 #example h4 + .example i.code {
   top: 0.4em;
 }
+#example .another.example i.code {
+  top: 1em;
+}
 
 /* Spaced */
 #example .spaced.example .buttons,