diff --git a/.gitignore b/.gitignore
index 1efc0f7784..d759c1e2c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ packages
 .buildlog
 .pub
 .idea
+.packages
 .settings/
 .DS_Store
 
diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index 6f46867696..159df0c263 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -179,6 +179,7 @@ header h1 {
 }
 
 header a,
+header a:hover,
 header p,
 header li {
   color: white;
diff --git a/lib/src/html_generator.dart b/lib/src/html_generator.dart
index 6573cd27b6..f6d94f4a4c 100644
--- a/lib/src/html_generator.dart
+++ b/lib/src/html_generator.dart
@@ -4,18 +4,18 @@
 
 library dartdoc.html_generator;
 
+import 'dart:async' show Future;
 import 'dart:io';
 import 'dart:profiler';
-import 'dart:async' show Future;
 
 import 'package:mustache4dart/mustache4dart.dart';
 import 'package:path/path.dart' as path;
 
 import 'model.dart';
 import 'package_meta.dart';
+import 'resources.g.dart' as resources;
 import '../generator.dart';
 import '../markdown_processor.dart';
-import 'resources.g.dart' as resources;
 import '../resource_loader.dart' as loader;
 
 typedef String TemplateRenderer(context,
@@ -23,6 +23,24 @@ typedef String TemplateRenderer(context,
 
 final UserTag _HTML_GENERATE = new UserTag('HTML GENERATE');
 
+// Generation order for libraries:
+//   constants
+//   typedefs
+//   properties
+//   functions
+//   enums
+//   classes
+//   exceptions
+//
+// Generation order for classes:
+//   constants
+//   static properties
+//   static methods
+//   properties
+//   constructors
+//   operators
+//   methods
+
 class Templates {
   TemplateRenderer indexTemplate;
   TemplateRenderer libraryTemplate;
@@ -188,9 +206,8 @@ class HtmlGeneratorInstance {
         generateTypeDef(package, lib, typeDef);
       });
     });
-    if (_url != null) {
-      //generateSiteMap();
-    }
+
+    //if (_url != null) generateSiteMap();
 
     await _copyResources();
 
@@ -281,7 +298,6 @@ class HtmlGeneratorInstance {
       'htmlBase': '..'
     };
 
-    // TODO: `clazz.href` can be null here.
     _build(path.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
diff --git a/lib/templates/class.html b/lib/templates/class.html
index 2b06224268..cb8ec2da9d 100644
--- a/lib/templates/class.html
+++ b/lib/templates/class.html
@@ -59,28 +59,6 @@
     </section>
     {{/class.hasModifiers}}
 
-    {{#class.hasConstructors}}
-    <section class="summary" id="constructors">
-        <h2>Constructors</h2>
-
-        <dl class="constructor-summary-list">
-            {{#class.constructors}}
-            <dt id="{{htmlId}}" class="callable">
-                <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
-            </dt>
-            <dd>
-                {{#isConst}}
-                <div class="constructor-modifier">
-                    const
-                </div>
-                {{/isConst}}
-                {{{ oneLineDoc }}}
-            </dd>
-            {{/class.constructors}}
-        </dl>
-    </section>
-    {{/class.hasConstructors}}
-
     {{#class.hasConstants}}
     <section class="summary" id="constants">
         <h2>Constants</h2>
@@ -118,7 +96,7 @@ <h2>Static Methods</h2>
 
     {{#class.hasProperties}}
     <section class="summary" id="instance-properties">
-        <h2>Instance Properties</h2>
+        <h2>Properties</h2>
 
         <dl class="properties">
             {{#class.instanceProperties}}
@@ -132,20 +110,27 @@ <h2>Instance Properties</h2>
     </section>
     {{/class.hasProperties}}
 
-    {{#class.hasMethods}}
-    <section id="instance-methods-summary" class="summary">
-        <h2>Instance Methods</h2>
-        <dl class="callables">
-            {{#class.instanceMethods}}
-            {{>callable}}
-            {{/class.instanceMethods}}
+    {{#class.hasConstructors}}
+    <section class="summary" id="constructors">
+        <h2>Constructors</h2>
 
-            {{#class.inheritedMethods}}
-            {{>callable}}
-            {{/class.inheritedMethods}}
+        <dl class="constructor-summary-list">
+            {{#class.constructors}}
+            <dt id="{{htmlId}}" class="callable">
+                <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
+            </dt>
+            <dd>
+                {{#isConst}}
+                <div class="constructor-modifier">
+                    const
+                </div>
+                {{/isConst}}
+                {{{ oneLineDoc }}}
+            </dd>
+            {{/class.constructors}}
         </dl>
     </section>
-    {{/class.hasMethods}}
+    {{/class.hasConstructors}}
 
     {{#class.hasOperators}}
     <section id="operators-summary" class="summary">
@@ -162,4 +147,19 @@ <h2>Operators</h2>
     </section>
     {{/class.hasOperators}}
 
+    {{#class.hasMethods}}
+    <section id="instance-methods-summary" class="summary">
+        <h2>Methods</h2>
+        <dl class="callables">
+            {{#class.instanceMethods}}
+            {{>callable}}
+            {{/class.instanceMethods}}
+
+            {{#class.inheritedMethods}}
+            {{>callable}}
+            {{/class.inheritedMethods}}
+        </dl>
+    </section>
+    {{/class.hasMethods}}
+
 {{>footer}}
diff --git a/lib/templates/library.html b/lib/templates/library.html
index 8a65601e55..4b4bd25580 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -4,39 +4,29 @@
     {{>documentation}}
     {{/library}}
 
-    {{#library.hasClasses}}
-    <section class="summary" id="classes">
-        <h2>Classes</h2>
+    {{#library.hasConstants}}
+    <section class="summary" id="constants">
+        <h2>Constants</h2>
 
-        <dl>
-            {{#library.classes}}
-            <dt id="{{htmlId}}">
-                <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
-            </dt>
-            <dd>
-                {{{ oneLineDoc }}}
-            </dd>
-            {{/library.classes}}
+        <dl class="properties">
+            {{#library.constants}}
+            {{>constant}}
+            {{/library.constants}}
         </dl>
     </section>
-    {{/library.hasClasses}}
+    {{/library.hasConstants}}
 
-    {{#library.hasEnums}}
-    <section class="summary" id="enums">
-        <h2>Enums</h2>
+    {{#library.hasTypedefs}}
+    <section class="summary" id="typedefs">
+        <h2>Typedefs</h2>
 
-        <dl class="dl-horizontal">
-            {{#library.enums}}
-            <dt id="{{htmlId}}">
-                {{{linkedName}}}
-            </dt>
-            <dd>
-                {{{ oneLineDoc }}}
-            </dd>
-            {{/library.enums}}
+        <dl class="callables">
+            {{#library.typedefs}}
+            {{>callable}}
+            {{/library.typedefs}}
         </dl>
     </section>
-    {{/library.hasEnums}}
+    {{/library.hasTypedefs}}
 
     {{#library.hasProperties}}
     <section class="summary" id="properties">
@@ -50,18 +40,6 @@ <h2>Properties</h2>
     </section>
     {{/library.hasProperties}}
 
-    {{#library.hasConstants}}
-    <section class="summary" id="constants">
-        <h2>Constants</h2>
-
-        <dl class="properties">
-            {{#library.constants}}
-            {{>constant}}
-            {{/library.constants}}
-        </dl>
-    </section>
-    {{/library.hasConstants}}
-
     {{#library.hasFunctions}}
     <section class="summary" id="functions">
         <h2>Functions</h2>
@@ -74,17 +52,39 @@ <h2>Functions</h2>
     </section>
     {{/library.hasFunctions}}
 
-    {{#library.hasTypedefs}}
-    <section class="summary" id="typedefs">
-        <h2>Typedefs</h2>
+    {{#library.hasEnums}}
+    <section class="summary" id="enums">
+        <h2>Enums</h2>
 
-        <dl class="callables">
-            {{#library.typedefs}}
-            {{>callable}}
-            {{/library.typedefs}}
+        <dl class="dl-horizontal">
+            {{#library.enums}}
+            <dt id="{{htmlId}}">
+                {{{linkedName}}}
+            </dt>
+            <dd>
+                {{{ oneLineDoc }}}
+            </dd>
+            {{/library.enums}}
         </dl>
     </section>
-    {{/library.hasTypedefs}}
+    {{/library.hasEnums}}
+
+    {{#library.hasClasses}}
+    <section class="summary" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+            {{#library.classes}}
+            <dt id="{{htmlId}}">
+                <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
+            </dt>
+            <dd>
+                {{{ oneLineDoc }}}
+            </dd>
+            {{/library.classes}}
+        </dl>
+    </section>
+    {{/library.hasClasses}}
 
     {{#library.hasExceptions}}
     <section class="summary" id="exceptions">