diff --git a/demo.html b/demo.html
index feb8e78..6fd5c61 100644
--- a/demo.html
+++ b/demo.html
@@ -18,10 +18,35 @@
         </style>
     </head>
     <body>
+        <h1>Heading 1</h1>
+        <h2>Heading 2</h2>
+        <h3>Heading 3</h3>
+        <h4>Heading 4</h4>
+        <h5>Heading 5</h5>
+        <h6>Heading 6</h6>
+
+        <section>
+            <h1>Heading 1 (in section)</h1>
+            <h2>Heading 2 (in section)</h2>
+            <h3>Heading 3 (in section)</h3>
+            <h4>Heading 4 (in section)</h4>
+            <h5>Heading 5 (in section)</h5>
+            <h6>Heading 6 (in section)</h6>
+        </section>
+
+        <article>
+            <h1>Heading 1 (in article)</h1>
+            <h2>Heading 2 (in article)</h2>
+            <h3>Heading 3 (in article)</h3>
+            <h4>Heading 4 (in article)</h4>
+            <h5>Heading 5 (in article)</h5>
+            <h6>Heading 6 (in article)</h6>
+        </article>
+
         <header>
             <hgroup>
-                <h1>Grouped Heading 1</h1>
-                <h2>Grouped Heading 2</h2>
+                <h1>Heading 1 (in hgroup)</h1>
+                <h2>Heading 2 (in hgroup)</h2>
             </hgroup>
             <nav>
                 <ul>
@@ -32,26 +57,14 @@
             </nav>
         </header>
 
-        <h1>Heading 1</h1>
-        <h2>Heading 2</h2>
-        <h3>Heading 3</h3>
-        <h4>Heading 4</h4>
-        <h5>Heading 5</h5>
-        <h6>Heading 6</h6>
+        <h1>Text-level semantics</h1>
 
         <p hidden>This should be hidden in all browsers, apart from IE6</p>
 
-        <section>
-            <h1>Section Heading 1</h1>
-            <article>
-                <h4>Article Heading 2</h4>
-                <address>Address: somewhere, world</address>
-                <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
-                <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
-            </article>
-        </section>
+        <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
+        <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.</p>
 
-        <h1>Text-level semantics</h1>
+        <address>Address: somewhere, world</address>
 
         <p>
         The <a href="#">a element</a> example<br>
