diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index 7118c3ec..7aa747df 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -4,19 +4,6 @@
 <div class="col s12 m4">
   <h3 id="title">{{ corpus.title }}</h3>
   <p id="description">{{ corpus.description }}</p>
-  <div class="position: relative; height: 70px;">
-    <div class="fixed-action-btn">
-      <a class="btn-floating btn-large red">
-        <i class="large material-icons">mode_edit</i>
-      </a>
-      <ul>
-        <li><a class="btn-floating red"><i class="material-icons">insert_chart</i></a></li>
-        <li><a class="btn-floating yellow darken-1"><i class="material-icons">format_quote</i></a></li>
-        <li><a class="btn-floating green"><i class="material-icons">publish</i></a></li>
-        <li><a class="btn-floating blue"><i class="material-icons">attach_file</i></a></li>
-      </ul>
-    </div>
-  </div>
 </div>
 
 <div class="col s12 m8">
@@ -38,7 +25,7 @@
       <a data-target="add-corpus-file-modal" class="waves-effect waves-light btn modal-trigger">
         <i class="material-icons left">add</i>Add corpus file
       </a>
-      <a href="#modal-confirm-delete" class="waves-effect waves-light btn red modal-trigger right">
+      <a data-target="delete-corpus-modal" class="waves-effect waves-light btn red modal-trigger right">
         <i class="material-icons left">delete</i>Delete Corpus
       </a>
     </div>
@@ -81,8 +68,7 @@
   </div>
 </div>
 
-
-
+<!-- Modals -->
 <div id="add-corpus-file-modal" class="modal">
   <div class="modal-content">
     <h4>Add corpus file</h4>
@@ -135,21 +121,20 @@
         </div>
       </div>
       <div class="modal-footer">
-        {{ add_corpus_file_form.submit(class='btn') }}
+        <button class="btn waves-effect waves-light" id="submit" name="submit" type="submit">Submit<i class="material-icons right">send</i></button>
       </div>
     </form>
   </div>
 </div>
 
-<div id="modal-confirm-delete" class="modal">
+<div id="delete-corpus-modal" class="modal">
   <div class="modal-content">
-    <h4>Confirm deletion</h4>
-      <p>Do you really want to delete the Corpus {{corpus.title}}?
-      All files will be permanently deleted.</p>
+    <h4>Confirm corpus deletion</h4>
+    <p>Do you really want to delete the Corpus {{corpus.title}}? All files will be permanently deleted!</p>
   </div>
   <div class="modal-footer">
-    <a href="{{ url_for('corpora.delete_corpus', corpus_id=corpus.id) }}" class="modal-close waves-effect waves-green btn red"><i class="material-icons left">delete</i>Delete Corpus</a>
     <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
+    <a href="{{ url_for('corpora.delete_corpus', corpus_id=corpus.id) }}" class="modal-close waves-effect waves-green btn red">Confirm<i class="material-icons right">send</i></a>
   </div>
 </div>
 {% endblock %}