diff --git a/explorer/src/js/explorer.js b/explorer/src/js/explorer.js
index 823d25fd..8f3ba216 100644
--- a/explorer/src/js/explorer.js
+++ b/explorer/src/js/explorer.js
@@ -56,6 +56,30 @@ function selectConnection() {
     }
 }
 
+function downloadCSVFromTable() {
+    var table = document.getElementById("preview");
+    var rows = table.querySelectorAll("tr");
+    var csv = [];
+
+    rows.forEach(function (row) {
+        var cols = row.querySelectorAll("td, th");
+        var rowData = [];
+        cols.forEach(function (col) {
+            rowData.push(col.innerText);
+        });
+        csv.push(rowData.join(","));
+    });
+
+    var csvFile = new Blob([csv.join("\n")], { type: "text/csv" });
+    var downloadLink = document.createElement("a");
+    downloadLink.href = URL.createObjectURL(csvFile);
+    downloadLink.download = "preview.csv";
+
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+    document.body.removeChild(downloadLink);
+}
+
 export class ExplorerEditor {
     constructor(queryId) {
 
@@ -100,7 +124,7 @@ export class ExplorerEditor {
         this.bind();
 
         if (cookie.get("schema_sidebar_open") === 'true') {
-            this.showSchema(true);
+            this.toggleSchema(true, true);
         }
     }
 
@@ -189,28 +213,29 @@ export class ExplorerEditor {
         form.submit();
     }
 
-    showSchema(noAutofocus) {
-        if (noAutofocus === true) {
-            $("#schema_frame").addClass("no-autofocus");
-        }
-        $("#query_area").removeClass("col").addClass("col-9");
-        var schema$ = $("#schema");
-        schema$.addClass("col-md-3");
-        schema$.show();
-        $("#show_schema_button").hide();
-        $("#hide_schema_button").show();
-        cookie.set("schema_sidebar_open", 'true');
-        return false;
-    }
+    toggleSchema(noAutofocus, doShow) {
+        var schema = document.getElementById("schema");
+        var queryArea = document.getElementById("query_area");
+        var toggleBtn = document.getElementById("toggle_schema_button");
 
-    hideSchema() {
-        $("#query_area").removeClass("col-9").addClass("col");
-        var schema$ = $("#schema");
-        schema$.removeClass("col-3");
-        schema$.hide();
-        $("#hide_schema_button").hide();
-        $("#show_schema_button").show();
-        cookie.set("schema_sidebar_open", 'false');
+        if (doShow || schema.style.display === "none" || schema.style.display === "") { // show
+            if (noAutofocus === true) {
+                schema.classList.add("no-autofocus");
+            }
+            queryArea.classList.remove("col");
+            queryArea.classList.add("col-9");
+            schema.classList.add("col-md-3");
+            schema.style.display = "block";
+            toggleBtn.innerHTML = "Hide Schema";
+            cookie.set("schema_sidebar_open", 'true');
+        } else { // hide
+            queryArea.classList.remove("col-9");
+            queryArea.classList.add("col");
+            schema.classList.remove("col-md-3");
+            schema.style.display = "none";
+            toggleBtn.innerHTML = "Show Schema";
+            cookie.set("schema_sidebar_open", 'false');
+        }
         return false;
     }
 
@@ -237,9 +262,9 @@ export class ExplorerEditor {
             element.addEventListener('click', toggleFavorite);
         });
 
-        document.getElementById('show_schema_button')?.addEventListener('click', this.showSchema.bind(this));
-        document.getElementById('hide_schema_button')?.addEventListener('click', this.hideSchema.bind(this));
+        document.getElementById('toggle_schema_button')?.addEventListener('click', this.toggleSchema.bind(this));
 
+        document.getElementById('preview-download')?.addEventListener('click', downloadCSVFromTable)
 
         $("#format_button").click(function(e) {
             e.preventDefault();
@@ -262,6 +287,7 @@ export class ExplorerEditor {
         }.bind(this));
 
         $("#save_only_button").click(function() {
+            console.log("here");
             var params = this.getParams(this);
             if(params) {
                 this.$form.attr('action', '../' + this.queryId + '/?show=0&params=' + this.serializeParams(params));
diff --git a/explorer/src/scss/assistant.scss b/explorer/src/scss/assistant.scss
index 4f9fa7ea..465cd071 100644
--- a/explorer/src/scss/assistant.scss
+++ b/explorer/src/scss/assistant.scss
@@ -22,7 +22,7 @@
 .assistant-icons {
     width: 1rem;
     position: absolute;
-    right: .75rem;
+    right: 1rem;
 }
 
 #table-list {
diff --git a/explorer/templates/assistant/table_description_list.html b/explorer/templates/assistant/table_description_list.html
index 56410c1e..8ba9ccdf 100644
--- a/explorer/templates/assistant/table_description_list.html
+++ b/explorer/templates/assistant/table_description_list.html
@@ -21,7 +21,7 @@ <h3>Table Annotations</h3>
                     <tr>
                         <td>{{ table_description.database_connection }}</td>
                         <td>{{ table_description.table_name }}</td>
-                        <td>{{ table_description.description|truncatewords:20 }}</td>
+                        <td>{{ table_description.description }}</td>
                         <td>
                             <a href="{% url 'table_description_update' table_description.pk %}" class="px-2"><i class="bi-pencil-square"></i></a>
                             <a href="{% url 'table_description_delete' table_description.pk %}"><i class="bi-trash"></i></a>
diff --git a/explorer/templates/explorer/assistant.html b/explorer/templates/explorer/assistant.html
index 4e5bf18a..ba0ec4e6 100644
--- a/explorer/templates/explorer/assistant.html
+++ b/explorer/templates/explorer/assistant.html
@@ -30,24 +30,24 @@
                 <div id="additional_table_container" class="col-3" style="width: 31% !important">
                     <div id="table-list"></div>
                 </div>
-            </div>
-            <div class="assistant-icons" style="">
-                <div>
-                    <i class="bi-check-all" id="select_all_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Add all"></i>
-                </div>
-                <div>
-                    <i class="bi-trash" id="deselect_all_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Remove all"></i>
-                </div>
-                <div>
-                    <i class="bi-repeat" id="refresh_tables_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Refresh autodetect"></i>
-                </div>
-                <div>
-                    <i class="bi-card-list" id="assistant_history" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="History"></i>
-                </div>
-                <div>
-                    <i class="bi-question-circle" style="cursor: pointer;"
-                    data-bs-toggle="tooltip" data-bs-placement="top"
-                    data-bs-title="SQL Assistant builds a prompt with your query, your request, and the tables (schema, sample data, and annotations) referenced here."></i>
+                <div class="assistant-icons" style="">
+                    <div>
+                        <i class="bi-check-all" id="select_all_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Add all"></i>
+                    </div>
+                    <div>
+                        <i class="bi-trash" id="deselect_all_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Remove all"></i>
+                    </div>
+                    <div>
+                        <i class="bi-repeat" id="refresh_tables_button" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="Refresh autodetect"></i>
+                    </div>
+                    <div>
+                        <i class="bi-card-list" id="assistant_history" style="cursor: pointer;" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="History"></i>
+                    </div>
+                    <div>
+                        <i class="bi-question-circle" style="cursor: pointer;"
+                        data-bs-toggle="tooltip" data-bs-placement="top"
+                        data-bs-title="SQL Assistant builds a prompt with your query, your request, and the tables (schema, sample data, and annotations) referenced here."></i>
+                    </div>
                 </div>
             </div>
             <div class="row">
diff --git a/explorer/templates/explorer/play.html b/explorer/templates/explorer/play.html
index ded60a33..ba247616 100644
--- a/explorer/templates/explorer/play.html
+++ b/explorer/templates/explorer/play.html
@@ -59,13 +59,9 @@ <h2>{% translate "Playground" %}</h2>
                                 class="btn btn-outline-primary">{% translate 'Save As New' %}</button>
                         {% export_buttons query %}
 
-                        <button type="button" class="btn btn-outline-primary" id="show_schema_button">
+                        <button type="button" class="btn btn-outline-primary" id="toggle_schema_button">
                             {% translate "Show Schema" %}
                         </button>
-                        <button type="button" class="btn btn-outline-primary" id="hide_schema_button"
-                                style="display: none;">
-                            {% translate "Hide Schema" %}
-                        </button>
                     </div>
                 </div>
                 <input type="hidden" value="{% translate 'Playground Query' %}" name="title" />
diff --git a/explorer/templates/explorer/preview_pane.html b/explorer/templates/explorer/preview_pane.html
index d63ebe52..6fd4985c 100644
--- a/explorer/templates/explorer/preview_pane.html
+++ b/explorer/templates/explorer/preview_pane.html
@@ -48,6 +48,7 @@
                                    title="Fullscreen results">
                                     <i class="bi-arrows-angle-expand"></i>
                                 </a>
+                                <i id="preview-download" class="bi-download ms-1" title="Download table as csv"></i>
                             </div>
                         </div>
                     </div>
diff --git a/explorer/templates/explorer/query.html b/explorer/templates/explorer/query.html
index e07127d9..01063024 100644
--- a/explorer/templates/explorer/query.html
+++ b/explorer/templates/explorer/query.html
@@ -111,19 +111,29 @@ <h2>
                     {% endif %}
                     <div class="btn-group" role="group">
                         {% if can_change %}
-                            <button id="save_button" type="submit" class="btn btn-primary">
-                                {% translate "Save & Run" %}
-                            </button>
-                            <button class="btn btn-outline-primary" id="save_only_button">
-                                {% translate "Save Only" %}
-                            </button>
+                            <div class="btn-group" role="group">
+                                <button id="save_button"
+                                        type="submit"
+                                        class="btn btn-primary">
+                                    {% translate 'Save & Run' %}
+                                </button>
+                                <button type="button"
+                                        class="btn btn-primary dropdown-toggle dropdown-toggle-split"
+                                        data-bs-toggle="dropdown" aria-expanded="false">
+                                    <span class="visually-hidden">Toggle Dropdown</span>
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li>
+                                        <button type="submit" class="dropdown-item" id="save_only_button">
+                                            {% translate 'Save Only' %}
+                                        </button>
+                                    </li>
+                                </ul>
+                            </div>
                             {% export_buttons query %}
-                            <button type="button" class="btn btn-outline-primary" id="show_schema_button">
+                            <button type="button" class="btn btn-outline-primary" id="toggle_schema_button">
                                 {% translate "Show Schema" %}
                             </button>
-                            <button type="button" class="btn btn-outline-primary" id="hide_schema_button" style="display: none;">
-                                {% translate "Hide Schema" %}
-                            </button>
                         {% else %}
                             <button id="refresh_button" type="button" class="btn btn-outline-primary">{% translate "Refresh" %}</button>
                             {% export_buttons query %}