diff --git a/ref-test/app/admin/templates/admin/settings/index.html b/ref-test/app/admin/templates/admin/settings/index.html
index 1f87503..43a2215 100644
--- a/ref-test/app/admin/templates/admin/settings/index.html
+++ b/ref-test/app/admin/templates/admin/settings/index.html
@@ -57,7 +57,7 @@
                                     <thead>
                                         <tr>
                                             <th>
-                                                Uploaded
+                                                Name
                                             </th>
                                             <th>
                                                 Exams
@@ -68,7 +68,9 @@
                                         {% for dataset in datasets %}
                                             <tr>
                                                 <td>
-                                                    {{ dataset.date.strftime('%d %b %Y %H:%M') }}
+                                                    <a href="{{ url_for('editor._editor_console', id=dataset.id) }}">
+                                                        {{ dataset.get_name() }}
+                                                    </a>
                                                 </td>
                                                 <td>
                                                     {{ dataset.tests|length }}
diff --git a/ref-test/app/admin/templates/admin/settings/questions.html b/ref-test/app/admin/templates/admin/settings/questions.html
index 9c2ea08..eed4611 100644
--- a/ref-test/app/admin/templates/admin/settings/questions.html
+++ b/ref-test/app/admin/templates/admin/settings/questions.html
@@ -9,9 +9,12 @@
                 <tr>
                     <th>
 
+                    </th>
+                    <th data-priority="1">
+                        Name
                     </th>
                     <th data-priority="2">
-                        Uploaded
+                        Updated
                     </th>
                     <th data-priority="3">
                         Author
@@ -36,6 +39,9 @@
                                 </div>
                             {% endif %}
                         </td>
+                        <td>
+                            {{ element.get_name() }}
+                        </td>
                         <td>
                             {{ element.date.strftime('%d %b %Y %H:%M') }}
                         </td>
@@ -47,18 +53,27 @@
                         </td>
                         <td class="row-actions">
                             <a
-                                href="#"
-                                class="btn btn-primary edit-question-dataset {% if element.filename == default %}disabled{% endif %}"
-                                data-filename="{{ element.filename }}"
-                                data-action="default"
-                                title="Make Default"
+                                href="javascript:void(0)"
+                                class="btn btn-primary edit-question-dataset"
+                                data-id="{{ element.id }}"
+                                data-action="download"
+                                title="Download Dataset"
+                            >
+                                <i class="bi bi-cloud-arrow-down-fill button-icon"></i>
+                            </button>
+                            <a
+                                href="javascript:void(0)"
+                                class="btn btn-primary edit-question-dataset"
+                                data-id="{{ element.id }}"
+                                data-action="edit"
+                                title="Edit Dataset"
                             >
                                 <i class="bi bi-file-earmark-text-fill button-icon"></i>
                             </button>
                             <a
-                                href="#"
-                                class="btn btn-danger edit-question-dataset {% if element.filename == default %}disabled{% endif %}"
-                                data-filename="{{ element.filename }}"
+                                href="javascript:void(0)"
+                                class="btn btn-danger edit-question-dataset {% if element.default %}disabled{% endif %}"
+                                data-id="{{ element.id }}"
                                 data-action="delete"
                                 title="Delete Dataset"
                             >
@@ -72,13 +87,23 @@
     {% else %}
         <div class="alert alert-primary alert-db-empty">
             <i class="bi bi-info-circle-fill" aria-title="Alert" title="Alert"></i>
-            There are no question datasets uploaded. Please use the panel below to upload a new question dataset.
+            There are no question datasets uploaded. Please use the panel below to upload a new question dataset or create a new dataset using the editor console.
         </div>
     {% endif %}
+    <div class="col text-center">
+        <button title="Create New" class="btn btn-md btn-primary btn-block create-new-dataset">
+            <i class="bi bi-cloud-plus-fill button-icon"></i>
+            Create New Dataset
+        </button>
+    </div>
     <div class="form-container">
         <form name="form-upload-questions" class="form-display" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="" enctype="multipart/form-data">
             <h2 class="form-heading">Upload Question Dataset</h2>
             {{ form.hidden_tag() }}
+            <div class="form-label-group">
+                {{ form.name(class_="form-control", autofocus=true, placeholder="Enter Name of Dataset") }}
+                {{ form.name.label }}
+            </div>
             <div class="form-upload">
                 {{ form.data_file() }}
             </div>
@@ -89,8 +114,8 @@
             <div class="container form-submission-button">
                 <div class="row">
                     <div class="col text-center">
-                        <button title="Create User" class="btn btn-md btn-success btn-block" type="submit">
-                            <i class="bi bi-file-earmark-arrow-up-fill button-icon"></i>
+                        <button title="Upload Dataset" class="btn btn-md btn-success btn-block" type="submit">
+                            <i class="bi bi-cloud-arrow-up-fill button-icon"></i>
                             Upload Dataset
                         </button>
                     </div>
@@ -106,10 +131,10 @@
             $(document).ready(function() {
                 $('#question-datasets-table').DataTable({
                     'columnDefs': [
-                        {'sortable': false, 'targets': [0,4]},
-                        {'searchable': false, 'targets': [0,3,4]}
+                        {'sortable': false, 'targets': [0,5]},
+                        {'searchable': false, 'targets': [1,2,3]}
                     ],
-                    'order': [[1, 'desc'], [2, 'asc']],
+                    'order': [[1, 'asc'], [2, 'desc'], [3, 'asc']],
                     'responsive': 'true',
                     'fixedHeader': 'true',
                 });