diff --git a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml
index 196c000b92593999e07021700950ad3de449cc44..21b091606b40cdd1cf8a33939e9faf33bc064c56 100644
--- a/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml
+++ b/TapSchemaManagerWebApp/src/main/webapp/WEB-INF/templates/master.xhtml
@@ -18,10 +18,17 @@
         <h:outputStylesheet library="css" name="style.css"></h:outputStylesheet>
         <h:outputScript library="js" name="lib/jquery-1.11.3.min.js"></h:outputScript>
         <h:outputScript library="js" name="lib/bootstrap.min.js"></h:outputScript>
+        <h:outputScript library="js" name="script.js"></h:outputScript>
         <ui:insert name="scripts"></ui:insert>
     </h:head>
 
     <h:body>
         <ui:insert name="content" />
+
+        <div class="loading hide">
+            <div class="icon-wrapper">
+                <span class="glyphicon glyphicon-refresh animate-spin"></span>
+            </div>
+        </div>
     </h:body>
 </html>
\ No newline at end of file
diff --git a/TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml b/TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml
index ec7ef80d846c62f6bab39c72249bbe0a135f36c9..5fa250362dacd437cb96d10053965ce2faac475b 100644
--- a/TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml
+++ b/TapSchemaManagerWebApp/src/main/webapp/consistencyChecks.xhtml
@@ -82,7 +82,7 @@
                                 Back
                             </h:commandLink>
                             &#160;
-                            <h:commandLink action="#{consistency.proceed()}" class="btn btn-primary">
+                            <h:commandLink action="#{consistency.proceed()}" class="btn btn-primary" onclick="showWaiting()">
                                 Proceed
                                 <span class="glyphicon glyphicon-arrow-right"></span>
                             </h:commandLink>
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js
index 99ab01d76d2c214572a5d628f1342b414f958078..5d09fcd1ffad61533d95f2d5ec83d6c42137d115 100644
--- a/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js
+++ b/TapSchemaManagerWebApp/src/main/webapp/resources/js/edit-tapschema.js
@@ -162,10 +162,10 @@
             }
             switch (data.status) {
                 case "begin":
-                    $('.loading').removeClass('hide');
+                    showWaiting();
                     break;
                 case "complete":
-                    $('.loading').addClass('hide');
+                    hideWaiting();
                     break;
             }
         });
diff --git a/TapSchemaManagerWebApp/src/main/webapp/resources/js/script.js b/TapSchemaManagerWebApp/src/main/webapp/resources/js/script.js
new file mode 100644
index 0000000000000000000000000000000000000000..a20c4305fbe225811f502eb776032fdfb99aa563
--- /dev/null
+++ b/TapSchemaManagerWebApp/src/main/webapp/resources/js/script.js
@@ -0,0 +1,7 @@
+
+window.showWaiting = function () {
+    $('.loading').removeClass('hide');
+};
+window.hideWaiting = function () {
+    $('.loading').addClass('hide');
+};
diff --git a/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml b/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml
index a7f422f7748e22c4eb227b4a8fcff35d2b66c908..01bd503812f6719a28a942f18c87869b557a48c7 100644
--- a/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml
+++ b/TapSchemaManagerWebApp/src/main/webapp/schemaSelection.xhtml
@@ -54,7 +54,7 @@
                                         </p>
                                     </div>
                                     <div class="form-group">
-                                        <h:commandButton value="Edit Tapschema" class="btn btn-primary" action="#{schemaSelection.edit()}"></h:commandButton>
+                                        <h:commandButton value="Edit Tapschema" class="btn btn-primary" action="#{schemaSelection.edit()}" onclick="showWaiting()"></h:commandButton>
                                     </div>
                                 </div>
                             </h:panelGroup>
@@ -78,7 +78,7 @@
                                     </div>
 
                                     <div class="form-group">
-                                        <h:commandButton value="Create TAP_SCHEMA" class="btn btn-primary" action="#{schemaSelection.create()}"></h:commandButton>
+                                        <h:commandButton value="Create TAP_SCHEMA" class="btn btn-primary" action="#{schemaSelection.create()}" onclick="showWaiting()"></h:commandButton>
                                     </div>
                                 </div>
                             </h:panelGroup>
diff --git a/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml b/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml
index 8440fa0f6b131e8866f3735e84fb3df161536e5f..113af63e1c8adb02ebb45c9e6ce268f5b601833b 100644
--- a/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml
+++ b/TapSchemaManagerWebApp/src/main/webapp/tapSchemaEditing.xhtml
@@ -35,7 +35,7 @@
                     <f:ajax execute="@form" render="@form" onevent="TSM.notifyUpdate"/>
                 </h:commandLink>
                 &#160;
-                <h:commandLink class="btn btn-info" action="#{tapSchemaEditing.reload()}">
+                <h:commandLink class="btn btn-info" action="#{tapSchemaEditing.reload()}" onclick="showWaiting()">
                     <span class="glyphicon glyphicon-refresh"></span>
                     Reload all
                 </h:commandLink>
@@ -788,11 +788,5 @@
                 </div>
             </div>
         </div>
-
-        <div class="loading hide">
-            <div class="icon-wrapper">
-                <span class="glyphicon glyphicon-refresh animate-spin"></span>
-            </div>
-        </div>
     </ui:define>
 </ui:composition>
\ No newline at end of file