diff --git a/woodwind/templates/_entry.jinja2 b/woodwind/templates/_entry.jinja2
index 6f8d27d..896ff85 100644
--- a/woodwind/templates/_entry.jinja2
+++ b/woodwind/templates/_entry.jinja2
@@ -10,7 +10,7 @@
       {{ context.permalink | domain_for_url }}
     </header>
     {% if context.title %}
-      <h1>{{ context.title }}</h1>
+      <h1>{{ context.title|e }}</h1>
     {% endif %}
     {% if context.content %}
       <div class="content">
@@ -28,7 +28,7 @@
 {% endfor %}
 
 <article>
-  <header>
+  <details><summary><header>
     {% if entry.author_photo %}
       <img src="{{entry.author_photo|proxy_image}}"/>
     {% endif %}
@@ -43,9 +43,9 @@
     {% endif %}
   </header>
   {% if entry.title %}
-    <h1>{{ entry.title }}</h1>
+    <h1>{{ entry.title|e }}</h1>
   {% endif %}
-
+  </summary>
   {% if entry.get_property('event') %}
     <p>
       {% if entry.get_property('start') %}
@@ -71,7 +71,7 @@
     </div>
   {% endif %}
 
-
+ </details>
   <footer>
     {% set location = entry.get_property('location') %}
     {% if location and 'name' in location %}
diff --git a/woodwind/templates/subscriptions.jinja2 b/woodwind/templates/subscriptions.jinja2
index e6dd9e3..45ceccb 100644
--- a/woodwind/templates/subscriptions.jinja2
+++ b/woodwind/templates/subscriptions.jinja2
@@ -30,7 +30,8 @@
           <i class="fa fa-warning"></i> Last {{ s.feed.failure_count }} Attempt(s) Failed
         </div>
       {% endif %}
-      <form class="edit-subscription" action="{{ url_for('.edit_subscription') }}" method="POST">
+      <details><summary><b>{{ s.name }}</b> checked {{s.feed.last_checked | relative_time}}</summary>
+        <form class="edit-subscription" action="{{ url_for('.edit_subscription') }}" method="POST">
         <input type="hidden" name="id" value="{{ s.id }}"/>
         <label>Name</label>
         <input type="text" name="name" value="{{ s.name }}"/>
@@ -55,7 +56,7 @@
       </div>
 
       <div class="feed-details" id="details-{{loop.index}}">
-        <strong>Details</strong>
+        <details><summary><strong>Details</strong></summary>
         <ul>
           <li>Last checked: {{s.feed.last_checked | relative_time}}</li>
           <li>Last updated: {{s.feed.last_updated | relative_time}}</li>
@@ -66,9 +67,10 @@
           <li>PuSH last ping: {{s.feed.last_pinged | relative_time}}</li>
           <li>PuSH expiry: {{s.feed.push_expiry | relative_time}}</li>
         </ul>
+        </details>
       </div>
 
-
+     </details>
       <form class="poll-now" action="{{ url_for('.update_feed') }}" method="POST" style="display:inline">
         <input type="hidden" name="id" value="{{ s.feed.id }}"/>
         <button type="submit">Poll Now</button> <span class="poll-status"></span>