diff --git a/apidoc/template/static/styles/jaguar.css b/apidoc/template/static/styles/jaguar.css
index 996d0f12f3..c105655f41 100644
--- a/apidoc/template/static/styles/jaguar.css
+++ b/apidoc/template/static/styles/jaguar.css
@@ -190,9 +190,9 @@ li {
   border-radius: 3px;
   background-color: #1F6B75 !important;
   color: #fff;
-  font-size: 0.7em;
+  vertical-align: top;
+  font-size: 0.8em;
   padding: 2px 4px;
-  margin-right: 8px;
 }
 .main span.number {
   background-color: #ccc !important;
@@ -263,7 +263,8 @@ li {
   display: inline-block;
   border-radius: 3px;
   background-color: #888!important;
-  font-size: 0.7em;
+  vertical-align: top;
+  font-size: 0.8em;
   padding: 2px 4px;
   margin-right: 5px;
 }
diff --git a/apidoc/template/tmpl/members.tmpl b/apidoc/template/tmpl/members.tmpl
index 839dddfc11..4116c40bfc 100644
--- a/apidoc/template/tmpl/members.tmpl
+++ b/apidoc/template/tmpl/members.tmpl
@@ -11,10 +11,11 @@ if (data.type && data.type.names) {
 ?>
 <dt>
     <div class="nameContainer">
-        <h4 class="name" id="<?js= id ?>"><?js= this.partial('stability.tmpl', data) ?>
-        <?js= data.attribs + (data.scope === 'static' ? longname : name)  + typeSignature ?></h4>
+        <h4 class="name" id="<?js= id ?>">
+            <?js= data.attribs + (data.scope === 'static' ? longname : name)  + typeSignature ?>
+            <?js= this.partial('stability.tmpl', data) ?>
+        </h4>
     </div>
-    
     <?js if (data.summary) { ?>
     <p class="summary"><?js= summary ?></p>
     <?js } ?>
diff --git a/apidoc/template/tmpl/method.tmpl b/apidoc/template/tmpl/method.tmpl
index 4e98c5283f..c8ff2ee5e3 100644
--- a/apidoc/template/tmpl/method.tmpl
+++ b/apidoc/template/tmpl/method.tmpl
@@ -5,13 +5,13 @@ var self = this;
 <dt>
     <div class="nameContainer<?js if (data.inherited) { ?> inherited<?js } ?>">
         <?js if (data.stability || kind !== 'class') { ?>
-        <h4 class="name" id="<?js= id ?>"><?js= this.partial('stability.tmpl', data) ?>
+        <h4 class="name" id="<?js= id ?>">
+            <?js= data.attribs + (kind === 'class' ? 'new ' : '') + (data.scope === 'static' ? longname : name) + (kind !== 'event' ? data.signature : '') ?>
             <?js if (data.inherited || data.inherits) { ?>
                 <span class="inherited"><?js= this.linkto(data.inherits, 'inherited') ?></span>
             <?js } ?>
-            <?js= data.attribs + (kind === 'class' ? 'new ' : '') + (data.scope === 'static' ? longname : name) + (kind !== 'event' ? data.signature : '') ?>
+            <?js= this.partial('stability.tmpl', data) ?>
         </h4>
-    
         <?js if (data.meta) {?>
         <div class="tag-source">
             <?js= self.linkto(meta.filename) ?>, <?js= self.linkto(meta.filename, 'line ' + meta.lineno, null, 'line' + meta.lineno) ?>
@@ -19,7 +19,6 @@ var self = this;
         <?js } ?>
         <?js } ?>
     </div>
-
     <?js if (data.summary) { ?>
     <p class="summary"><?js= summary ?></p>
     <?js } ?>
@@ -60,7 +59,6 @@ var self = this;
             var parts = f.split(/#?event:/);
         ?>
         <li><?js var eventDoclet = self.find({longname: f})[0]; ?>
-            <?js= (eventDoclet ? self.partial('stability.tmpl', eventDoclet) : '') ?>
             <code><?js= self.linkto(f, parts[1]) ?></code>
             <?js if (parts[0]) {
               var eventClass = self.find({longname: parts[0]})[0];
@@ -68,8 +66,9 @@ var self = this;
                 (<?js= self.linkto(eventClass.longname) ?>)
               <?js } ?>
             <?js } ?>
-            <?js if (eventDoclet && eventDoclet.description) { ?>
-            - <?js= eventDoclet.description.replace(/<[^>]*>/g, '') ?>
+            <?js if (eventDoclet && eventDoclet.description) { ?> -
+            <?js= (eventDoclet ? self.partial('stability.tmpl', eventDoclet) : '') ?>
+            <?js= eventDoclet.description.replace(/<[^>]*>/g, '') ?>
             <?js } ?>
         </li>
     <?js }); ?></ul>