diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index 60602269..a118f9f4 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -3,7 +3,7 @@
 {% set full_width = True %}
 
 {% block page_content %}
-<!-- Query Form -->
+<!-- Query Form and display options -->
 <form id="query-form">
   <div class="col s12">
     <ul class="collapsible expandable">
@@ -107,7 +107,7 @@
       <tr>
         <td>CSV</td>
         <td>
-          <a class="btn waves-effect waves-light" id="download-results-csv">Download
+          <a class="btn waves-effect waves-light disabled" id="download-results-csv">Download
             <i class="material-icons right">file_download</i>
           </a>
         </td>
@@ -135,12 +135,13 @@
   </div>
 </div>
 
-<!-- Loading animation card when query results are being loaded -->
+<!-- Loading animation card when query results are being calculated on the
+server side -->
 <div class="row">
   <div class="col s12 hide" id="getting-query-results">
     <div class="card">
       <div class="card-content">
-        <span class="card-title">Fetching your results!</span>
+        <span class="card-title">Calculating your total results!</span>
         <div>
           <div class="progress">
             <div class="indeterminate" id="getting-query-results-bar"></div>
@@ -151,14 +152,23 @@
   </div>
 </div>
 
-<!-- table showing the query results -->
+<!-- entire results div/card -->
 <div class="col s12" id="recieved-query-results">
   <div class="card">
     <div class="card-content" id="result-list" style="overflow: hidden;">
       <span class="card-title">Query Results</span>
-      <p id="query-results-metadata">
-        <button id="export-query-results" class="waves-effect waves-light btn-small right hide" type="submit">Export Results<i class="material-icons right">file_download</i></button>
-      </p>
+      <div class="row">
+        <div class="col s12" id="query-results-metadata">
+        </div>
+        <div class="col s12">
+          <div class="progress">
+            <div class="determinate" style="width: 70%"></div>
+          </div>
+          <p>&nbsp;</p>
+          <button id="export-query-results" class="waves-effect waves-light btn-small right hide" type="submit">Export Results<i class="material-icons right">file_download</i></button>
+        </div>
+      </div>
+<!-- table showing the query results -->
       <ul class="pagination paginationTop"></ul>
       <table class="responsive-table highlight">
         <thead>
@@ -208,7 +218,8 @@
   </div>
 </div>
 
-<script>
+<script src="{{ url_for('static', filename='js/nopaque.analyse_corpus.js') }}">
+
  // Initialising some modals for later usage
   var contextModal;
   var loadingModal;