diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2
index c0412425..b5fc9d6d 100644
--- a/web/app/templates/corpora/analyse_corpus.html.j2
+++ b/web/app/templates/corpora/analyse_corpus.html.j2
@@ -12,25 +12,25 @@
                              padding-bottom: 0px;">
       <!-- Query form -->
       <div class="row">
-      <form id="query-form">
-          <div class="col s12 m10">
-            <div class="input-field">
-              <i class="material-icons prefix">search</i>
-              {{ query_form.query() }}
-              {{ query_form.query.label }}
-              <span class="helper-text">
-                <a href="http://cwb.sourceforge.net/files/CQP_Tutorial/">
-                  <i class="material-icons" style="font-size: inherit;">help
-                  </i>
-                  CQP query language tutorial
-                </a>
-              </span>
-            </div>
+      <form class="col s12" id="query-form">
+        <div class="row">
+          <div class="input-field col s12 m10">
+            <i class="material-icons prefix">search</i>
+            {{ query_form.query() }}
+            {{ query_form.query.label }}
+            <span class="helper-text">
+              <a href="http://cwb.sourceforge.net/files/CQP_Tutorial/">
+                <i class="material-icons" style="font-size: inherit;">help
+                </i>
+                CQP query language tutorial
+              </a>
+            </span>
           </div>
-          <div class="col s12 m2 right-align">
-            <br class="hide-on-small-only">
-            {{ M.render_field(query_form.submit, material_icon='send') }}
+          <div class="col s12 m2 center-align" style="margin-top: 2em;">
+            {{ M.render_field(query_form.submit, material_icon='send',
+                              style='width:100%;') }}
           </div>
+        </div>
       </form>
     </div>
     </div>
diff --git a/web/app/templates/modals/context_modal.html.j2 b/web/app/templates/modals/context_modal.html.j2
index 320a18ee..cb0baa92 100644
--- a/web/app/templates/modals/context_modal.html.j2
+++ b/web/app/templates/modals/context_modal.html.j2
@@ -1,6 +1,6 @@
 <!-- Modal showing detailed context info for one match. -->
 
-<div id="context-modal" class="modal modal-fixed-footer">
+<div id="context-modal" class="modal">
   <div class="modal-content">
     <form>
       <div class="row" style="margin-bottom: 0px; margin-top: -20px;">
diff --git a/web/app/templates/utils/materialize.html.j2 b/web/app/templates/utils/materialize.html.j2
index a20006d3..fe5153b3 100644
--- a/web/app/templates/utils/materialize.html.j2
+++ b/web/app/templates/utils/materialize.html.j2
@@ -77,24 +77,17 @@
 {% endmacro %}
 
 {% macro render_submit_field(field) %}
-  <button class="btn waves-effect waves-light" id="{{ field.id }}" name="{{ field.name }}" type="submit" value="{{ field.label.text }}">
+  <button class="btn waves-effect waves-light"
+          id="{{ field.id }}"
+          name="{{ field.name }}"
+          type="submit"
+          value="{{ field.label.text }}"
+          {% if 'style' in kwargs %}
+            style={{ kwargs.pop('style') }}
+          {% endif %}>
     {{ field.label.text }}
     {% if 'material_icon' in kwargs %}
       <i class="material-icons right">{{ kwargs.pop('material_icon') }}</i>
     {% endif %}
   </button>
 {% endmacro %}
-
-{# maybe create a modal template later on for actions like delete etc #}
-{# {% macro delete_modal_file(file) %}
-<div id="delete-corpus-file-{{ file.id }}-modal" class="modal">
-  <div class="modal-content">
-    <h4>Confirm corpus file deletion</h4>
-    <p>Do you really want to delete the corpus file {{ file.filename }}? The file will be permanently deleted!</p>
-  </div>
-  <div class="modal-footer">
-    <a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
-    <a class="btn modal-close red waves-effect waves-light" href="{{ url_for('corpora.delete_corpus_file', corpus_file_id=resource_id, corpus_id=corpus.id) }}"><i class="material-icons left">delete</i>Delete</a>
-  </div>
-</div>
-{% endmacro %} #}