diff --git a/_includes/template.html b/_includes/template.html
index fb7b70f..9dcce5f 100644
--- a/_includes/template.html
+++ b/_includes/template.html
@@ -93,15 +93,37 @@
 
       {%- for component in allSelections %}
 
-        {% if component.id == current_id %}
-  
-          {% for example in component.examples %}
+          {% if component.id == current_id %}
+
+            {% assign grouped_examples = component.examples | group_by: "group" %}
+
+            {% for group in grouped_examples %}
+
+              {% if group.name != "" %}
+
+                <optgroup label="{{ group.name }}">
+
+                  {% for example in group.items %}
+
+                    <option value="#{{ example.id }}">{{ example.name }}</option>
+
+                  {% endfor %}
 
-            <option value="#{{ example.id }}">{{ example.name }}</option>
+                </optgroup>
 
-          {% endfor %}
+              {% else %}
 
-        {% endif %}
+                {% for example in group.items %}
+
+                  <option value="#{{ example.id }}">{{ example.name }}</option>
+
+                {% endfor %}
+
+              {% endif %}
+
+            {% endfor %}
+
+          {% endif %}
 
       {%- endfor %}
 
@@ -748,6 +770,10 @@ <h2 id="properties">Properties</h2>
 
 {%- endif %}
 
-<h2 id="issues">Report Issues</h2>
+<div class="reminder">
+
+  <h2 id="issues">Report Issues</h2>
+
+  <p>Find a bug? Want a new feature? Report it on <a href="https://jira.radancy.com/secure/Dashboard.jspa#create_link">JIRA</a>. You're so awesome!</p>
 
-<p>Find a bug? Want a new feature? Report it on <a href="https://jira.radancy.com/secure/Dashboard.jspa#create_link">JIRA</a>. You're so awesome!</p>
\ No newline at end of file
+</div>
\ No newline at end of file