diff --git a/assets/scss/bergamot.scss b/assets/scss/bergamot.scss
index 826b1f0..f10a9f0 100644
--- a/assets/scss/bergamot.scss
+++ b/assets/scss/bergamot.scss
@@ -2,8 +2,6 @@
 @import "mixins.scss";
 
 .bergamot-exercise {
-    @include bordered-block;
-    padding: 1em;
     counter-increment: bergamot-exercise;
 
     .bergamot-root {
@@ -69,7 +67,7 @@
     }
 
     .bergamot-button-group {
-        margin-top: 0.5em;
+        margin-top: 1em;
     }
 }
 
diff --git a/layouts/shortcodes/bergamot_exercise.html b/layouts/shortcodes/bergamot_exercise.html
index 67244d2..817c3ba 100644
--- a/layouts/shortcodes/bergamot_exercise.html
+++ b/layouts/shortcodes/bergamot_exercise.html
@@ -1,18 +1,21 @@
 <div class="bergamot-exercise">
-    <span class="bergamot-exercise-label">
-        {{ partial "icon.html" "edit-2" }}
-        <span class="bergamot-exercise-number"></span>
-        {{ if or (eq (.Get "label") "") (eq (.Get "label") nil) }}{{ else }}({{ .Get "label" }}){{ end }}:
-    </span>
-    {{ .Inner }}
+    <details open>
+        <summary>
+            <span class="bergamot-exercise-label">
+                <span class="bergamot-exercise-number"></span>
+                {{ if or (eq (.Get "label") "") (eq (.Get "label") nil) }}{{ else }}({{ .Get "label" }}){{ end }}:
+            </span>
+        </summary>
+        {{ .Inner }}
 
-    <div class="bergamot-button-group">
-        {{ if or (eq (.Get "preset") "") (eq (.Get "preset") nil) }}
-        {{ else }}
-        <button class="bergamot-button bergamot-play" onclick='window.Bergamot.runPreset(this.parentElement, "bergamot-widget-container-{{ .Get "id" }}", "{{ .Get "preset" }}")'>{{ partial "icon.html" "play" }}Start Bergamot</button>
-        <button class="bergamot-button bergamot-close bergamot-hidden" onclick='window.Bergamot.close(this.parentElement, "bergamot-widget-container-{{ .Get "id" }}")'>{{ partial "icon.html" "x" }}Close Bergamot</button>
-        {{ end }}
-    </div>
+        <div class="bergamot-button-group">
+            {{ if or (eq (.Get "preset") "") (eq (.Get "preset") nil) }}
+            {{ else }}
+            <button class="bergamot-button bergamot-play" onclick='window.Bergamot.runPreset(this.parentElement, "bergamot-widget-container-{{ .Get "id" }}", "{{ .Get "preset" }}")'>{{ partial "icon.html" "play" }}Start Bergamot</button>
+            <button class="bergamot-button bergamot-close bergamot-hidden" onclick='window.Bergamot.close(this.parentElement, "bergamot-widget-container-{{ .Get "id" }}")'>{{ partial "icon.html" "x" }}Close Bergamot</button>
+            {{ end }}
+        </div>
 
-    <div id="bergamot-widget-container-{{ .Get "id" }}"></div>
+        <div id="bergamot-widget-container-{{ .Get "id" }}"></div>
+    </details>
 </div>
diff --git a/layouts/shortcodes/bergamot_preset.html b/layouts/shortcodes/bergamot_preset.html
index 8da76ee..377e97b 100644
--- a/layouts/shortcodes/bergamot_preset.html
+++ b/layouts/shortcodes/bergamot_preset.html
@@ -2,5 +2,6 @@
     window.Bergamot.presets['{{ .Get "name" }}'] = {
         rules: '{{ .Inner }}',
         inputPrompt: '{{ .Get "prompt" }}',
+        query: '{{ .Get "query" }}',
     };
 </script>