diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index 2a5e863d6d..7dabba0809 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -92,35 +92,29 @@
                         </tr>
                     </tbody>
                 </table>
-
-                <?js= self.partial('details.tmpl', doc) ?>
-
-                <?js if (doc.examples && doc.examples.length) { ?>
-                    <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
-                    <?js= self.partial('examples.tmpl', doc.examples) ?>
-                <?js } ?>
+                 <?js= self.partial('details.tmpl', doc) ?>
 
             <?js } else { ?>
                 <h3>Description</h3>
                 <?js if (doc.description) { ?>
                     <p><?js= doc.description ?></p>
                 <?js } ?>
-            <?js
-                var classes = self.find({kind: 'class', memberof: doc.longname});
-                if (!isGlobalPage && classes && classes.length) {
-            ?>
-                <h3 id="#class">Classes</h3>
-                <?js classes.forEach(function(c) { ?>
-                    <p><?js= self.linkto(c.longname, c.name) ?></p>
-                <?js }); ?>
-            <?js } ?>
-
-                <?js= self.partial('details.tmpl', doc) ?>
 
                 <?js if (doc.examples && doc.examples.length) { ?>
                     <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
                     <?js= self.partial('examples.tmpl', doc.examples) ?>
                 <?js } ?>
+                <?js
+                    var classes = self.find({kind: 'class', memberof: doc.longname});
+                    if (!isGlobalPage && classes && classes.length) {
+                ?>
+                    <h3 id="#class">Classes</h3>
+                    <?js classes.forEach(function(c) { ?>
+                        <p><?js= self.linkto(c.longname, c.name) ?></p>
+                        <?js }); ?>
+                    <?js } ?>
+
+                    <?js= self.partial('details.tmpl', doc) ?>
             <?js } ?>
         </div>
 
@@ -245,7 +239,7 @@
             <?js typedefs.forEach(function(e) {
                     if (e.signature) {
                 ?>
-                    <?js= self.partial('method.tmpl', e) ?>
+                    <?js= self.partial('members.tmpl', e) ?>
                 <?js
                     }
                     else {