diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 27a2929d1c..c0737a1880 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -932,6 +932,7 @@
 
     </script>
 </head>
+
 <body class="properties" onload='loaded();'>
     <div id="properties-list">
         <div id="type" class="property">
@@ -939,9 +940,12 @@
                 <label>Type: </label><span id="property-type"></span>
             </div>
         </div>
-        <div class="property">
+        <div id="id" class="property">
+            <span class="label" style="float: left; margin-right: 6px">
+                <label>ID: <label>
+            </span>
             <div class="value">
-                <label id="property-id" class="selectable"></label>
+                <span id="property-id" class="selectable"></span>
             </div>
         </div>
         <div class="property">
@@ -976,6 +980,18 @@
             </span>
         </div>
 
+        <div class="property">
+            <div class="label">User Data</div>
+            <div class="value">
+                <textarea id="property-user-data"></textarea>
+            </div>
+        </div>
+
+
+        <div class="section-header">
+            <label>Spacial Properites</label>
+        </div>
+
         <div class="property">
             <div class="label">Position</div>
             <div class="value">
@@ -1043,6 +1059,11 @@
             </div>
         </div>
 
+
+        <div class="section-header">
+            <label>Physical Properites</label>
+        </div>
+
         <div class="property">
             <div class="label">Linear Velocity</div>
             <div class="value">
@@ -1109,6 +1130,21 @@
             </div>
         </div>
 
+        <div id="color-section" class="property">
+            <div class="label">Color</div>
+            <div class="value">
+                <div id="property-color" class='color-picker'></div>
+                <div class="input-area">R <input class="coord" type='number' id="property-color-red"></input></div>
+                <div class="input-area">G <input class="coord" type='number' id="property-color-green"></input></div>
+                <div class="input-area">B <input class="coord" type='number' id="property-color-blue"></input></div>
+            </div>
+        </div>
+
+
+        <div class="section-header">
+            <label>Behavior</label>
+        </div>
+
         <div class="property">
             <span class="label">Ignore For Collisions</span>
             <span class="value">
@@ -1144,22 +1180,9 @@
             </div>
         </div>
 
-        <div class="property">
-            <div class="label">User Data</div>
-            <div class="value">
-                <textarea id="property-user-data"></textarea>
-            </div>
-        </div>
 
-
-        <div id="color-section" class="property">
-            <div class="label">Color</div>
-            <div class="value">
-                <div id="property-color" class='color-picker'></div>
-                <div class="input-area">R <input class="coord" type='number' id="property-color-red"></input></div>
-                <div class="input-area">G <input class="coord" type='number' id="property-color-green"></input></div>
-                <div class="input-area">B <input class="coord" type='number' id="property-color-blue"></input></div>
-            </div>
+        <div class="section-header web-section">
+            <label>Web</label>
         </div>
 
         <div class="web-section property">
@@ -1169,6 +1192,11 @@
             </div>
         </div>
 
+
+        <div class="section-header particle-section">
+            <label>Particle</label>
+        </div>
+
         <div class="particle-section property">
             <div class="label">Max Particles</div>
             <div class="value">
@@ -1214,6 +1242,11 @@
             </div>
         </div>
 
+
+        <div class="section-header model-section">
+            <label>Model</label>
+        </div>
+
         <div class="model-section property">
             <div class="label">Model URL</div>
             <div class="value">
@@ -1280,8 +1313,13 @@
             </div>
         </div>
 
+
+        <div class="section-header text-section">
+            <label>Text</label>
+        </div>
+
         <div class="text-section property">
-            <div class="label">Text</div>
+            <div class="label">Text Content</div>
             <div class="value">
                 <input type="text" id="property-text-text"></input>
             </div>
@@ -1311,6 +1349,11 @@
             </div>
         </div>
 
+
+        <div class="section-header light-section">
+            <label>Light</label>
+        </div>
+        
         <div class="light-section property">
             <span class="label">Spot Light</span>
             <span class="value">
@@ -1345,6 +1388,11 @@
             </div>
         </div>
 
+
+        <div class="section-header zone-section">
+            <label>Zone</label>
+        </div>
+
         <div class="zone-section property">
             <span class="label">Stage Sun Model Enabled</span>
             <span class="value">
@@ -1495,8 +1543,6 @@
                 <input type='checkbox' id="property-zone-atmosphere-has-stars">
             </span>
         </div>
-
     </div>
-
 </body>
 </html>
diff --git a/examples/html/style.css b/examples/html/style.css
index 4b7d4c825f..ff07411aaf 100644
--- a/examples/html/style.css
+++ b/examples/html/style.css
@@ -50,10 +50,12 @@ body {
     background-color: #333333;
     color: #999;
     padding: 3pt;
+    padding-top: 6pt;
 }
 
 .section-header label {
     font-weight: bold;
+    font-size: 11pt;
 }
 
 .multi-property-section {
@@ -183,11 +185,11 @@ div.input-area {
 input {
 }
 
-#type {
+#type, #id {
     font-size: 9.0pt;
 }
 
-#type label {
+#type label, #id label {
     color: rgb(150, 150, 150);
 }
 
