diff --git a/client/galaxy/scripts/mvc/tools/tools-form.js b/client/galaxy/scripts/mvc/tools/tools-form.js
index ffe613b0f7d..89ac2d65ca9 100644
--- a/client/galaxy/scripts/mvc/tools/tools-form.js
+++ b/client/galaxy/scripts/mvc/tools/tools-form.js
@@ -8,6 +8,21 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tools/tools-form-base', 'mvc/tools
     var View = ToolFormBase.extend({
         // initialize
         initialize: function(options) {
+            // execute button
+            var self = this;
+            var execute = new Ui.Button({
+                icon     : 'fa-check',
+                tooltip  : 'Execute: ' + options.name,
+                title    : 'Execute',
+                cls      : 'btn btn-primary',
+                floating : 'clear',
+                onclick  : function() {
+                    execute.wait();
+                    ToolJobs.submit(self.form, options, function() {
+                        execute.unwait();
+                    });
+                }
+            });
             // add remap button
             if (options.job_id && options.job_remap) {
                 options.inputs['rerun_remap_job_id'] = {
@@ -22,20 +37,10 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tools/tools-form-base', 'mvc/tools
                 }
             }
             // create options dictionary
-            var self = this;
             options = Utils.merge(options, {
                 update_url  : galaxy_config.root + 'api/tools/' + options.id + '/build',
                 buttons     : {
-                    execute : new Ui.Button({
-                        icon     : 'fa-check',
-                        tooltip  : 'Execute: ' + options.name,
-                        title    : 'Execute',
-                        cls      : 'btn btn-primary',
-                        floating : 'clear',
-                        onclick  : function() {
-                            ToolJobs.submit(self.form, options);
-                        }
-                    })
+                    execute : execute
                 }
             });
             ToolFormBase.prototype.initialize.call(this, options);
diff --git a/client/galaxy/scripts/mvc/tools/tools-jobs.js b/client/galaxy/scripts/mvc/tools/tools-jobs.js
index c78c9d41112..ccd746630bb 100644
--- a/client/galaxy/scripts/mvc/tools/tools-jobs.js
+++ b/client/galaxy/scripts/mvc/tools/tools-jobs.js
@@ -3,7 +3,7 @@
 */
 define(['utils/utils', 'mvc/tools/tools-template'], function(Utils, ToolTemplate) {
 return {
-    submit: function(form, options) {
+    submit: function(form, options, callback) {
         // link this
         var self = this;
 
@@ -20,33 +20,25 @@ return {
         // validate job definition
         if (!this._validation(form, job_def)) {
             console.debug('tools-jobs::submit - Submission canceled. Validation failed.');
+            callback && callback();
             return;
         }
 
         // debug
         console.debug(job_def);
 
-        // show progress modal
-        var user_is_waiting = true;
-        form.modal.show({title: 'Please wait...', body: 'progress', buttons: {
-            'Close' : function () {
-                form.modal.hide();
-                user_is_waiting = false;
-            }
-        }});
-
         // post job
         Utils.request({
             type    : 'POST',
             url     : galaxy_config.root + 'api/tools',
             data    : job_def,
             success : function(response) {
-                form.modal.hide();
+                callback && callback();
                 form.reciept(ToolTemplate.success(response));
                 self._refreshHdas();
             },
             error   : function(response, response_full) {
-                form.modal.hide();
+                callback && callback();
                 if (response && response.message && response.message.data) {
                     var error_messages = form.data.matchResponse(response.message.data);
                     for (var input_id in error_messages) {
@@ -56,7 +48,7 @@ return {
                 } else {
                     // show error message with details
                     console.debug(response);
-                    user_is_waiting && form.modal.show({
+                    response && form.modal.show({
                         title   : 'Job submission failed',
                         body    : ToolTemplate.error(job_def),
                         buttons : {
diff --git a/client/galaxy/scripts/mvc/ui/ui-misc.js b/client/galaxy/scripts/mvc/ui/ui-misc.js
index 69fc8672322..f1d49263f34 100644
--- a/client/galaxy/scripts/mvc/ui/ui-misc.js
+++ b/client/galaxy/scripts/mvc/ui/ui-misc.js
@@ -12,7 +12,7 @@ define(['utils/utils',
 /**
  *  This class contains backbone wrappers for basic ui elements such as Images, Labels, Buttons, Input fields etc.
  */
- 
+
 // plugin
 var Image = Backbone.View.extend({
     // options
@@ -20,7 +20,7 @@ var Image = Backbone.View.extend({
         url  : '',
         cls  : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
@@ -29,7 +29,7 @@ var Image = Backbone.View.extend({
         // create new element
         this.setElement(this._template(this.options));
     },
-    
+
     // template
     _template: function(options) {
         return '<img class="ui-image ' + options.cls + '" src="' + options.url + '"/>';
@@ -43,7 +43,7 @@ var Label = Backbone.View.extend({
         title  : '',
         cls    : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
@@ -52,17 +52,17 @@ var Label = Backbone.View.extend({
         // create new element
         this.setElement(this._template(this.options));
     },
-    
+
     // title
     title: function(new_title) {
         this.$el.html(new_title);
     },
-    
+
     // template
     _template: function(options) {
         return '<label class="ui-label ' + options.cls + '">' + options.title + '</label>';
     },
-    
+
     // value
     value: function() {
         return options.title;
@@ -80,19 +80,19 @@ var Icon = Backbone.View.extend({
         title       : '',
         cls         : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
     // element
     _template: function(options) {
         return  '<div>' +
@@ -112,37 +112,51 @@ var Button = Backbone.View.extend({
         cls         : 'ui-button btn btn-default',
         icon        : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add event
         $(this.el).on('click', function() {
             // hide all tooltips
             $('.tooltip').hide();
-            
+
             // execute onclick callback
             if (options.onclick) {
                 options.onclick();
             }
         });
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
+    // show spinner
+    wait: function() {
+        this.$el.removeClass(this.options.cls).addClass('btn btn-info').prop('disabled', true);
+        this.$('.icon').removeClass(this.options.icon).addClass('fa-spinner fa-spin');
+        this.$('.title').html('Sending...');
+    },
+
+    // hide spinner
+    unwait: function() {
+        this.$el.removeClass('btn btn-info').addClass(this.options.cls).prop('disabled', false);
+        this.$('.icon').removeClass('fa-spinner fa-spin').addClass(this.options.icon);
+        this.$('.title').html(this.options.title);
+    },
+
     // element
     _template: function(options) {
         var str =   '<button id="' + options.id + '" type="submit" style="float: ' + options.floating + ';" type="button" class="' + options.cls + '">';
         if (options.icon) {
-            str +=      '<i class="icon fa ' + options.icon + '"></i>&nbsp;' ;
+            str +=      '<i class="icon fa ' + options.icon + '"></i>&nbsp;';
         }
-        str +=          options.title +
+        str +=          '<span class="title">' + options.title + '</span>' +
                     '</button>';
         return str;
     }
@@ -160,52 +174,52 @@ var ButtonIcon = Backbone.View.extend({
         tooltip     : '',
         onclick     : null
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // link button element
         this.$button = this.$el.find('.button');
-        
+
         // add event
         var self = this;
         $(this.el).on('click', function() {
             // hide all tooltips
             $('.tooltip').hide();
-            
+
             // execute onclick callback
             if (options.onclick && !self.disabled) {
                 options.onclick();
             }
         });
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
     // disable
     disable: function() {
         this.$button.addClass('disabled');
         this.disabled = true;
     },
-    
+
     // enable
     enable: function() {
         this.$button.removeClass('disabled');
         this.disabled = false;
     },
-    
+
     // change icon
     setIcon: function(icon_cls) {
         this.$('i').removeClass(this.options.icon).addClass(icon_cls);
         this.options.icon = icon_cls;
     },
-    
+
     // template
     _template: function(options) {
         // width
@@ -213,10 +227,10 @@ var ButtonIcon = Backbone.View.extend({
         if (options.title) {
             width = 'width: auto;';
         }
-        
+
         // string
         var str =   '<div id="' + options.uid+ '" style="float: ' + options.floating + '; ' + width + '" class="' + options.cls + '">';
-    
+
         // title
         if (options.title) {
             str +=      '<div class="button">' +
@@ -238,19 +252,19 @@ var Anchor = Backbone.View.extend({
         title  : '',
         cls    : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add event
         $(this.el).on('click', options.onclick);
     },
-    
+
     // element
     _template: function(options) {
         return '<div><a href="javascript:void(0)" class="ui-anchor ' + options.cls + '">' + options.title + '</a></div>';
@@ -265,37 +279,37 @@ var Message = Backbone.View.extend({
         status      : 'info',
         persistent  : false
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // create new element
         this.setElement('<div></div>');
-        
+
         // show initial message
         if (this.options.message) {
             this.update(this.options);
         }
     },
-    
+
     // update
     update : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // show message
         if (options.message != '') {
             this.$el.html(this._template(this.options));
             this.$el.find('.alert').append(options.message);
             this.$el.fadeIn();
-            
+
             // clear previous timeouts
             if (this.timeout) {
                 window.clearTimeout(this.timeout);
             }
-            
+
             // set timeout if message is not persistent
             if (!options.persistent) {
                 var self = this;
@@ -311,7 +325,7 @@ var Message = Backbone.View.extend({
             this.$el.fadeOut();
         }
     },
-    
+
     // element
     _template: function(options) {
         return '<div class="ui-message alert alert-' + options.status + '"/>';
@@ -325,15 +339,15 @@ var Searchbox = Backbone.View.extend({
         onclick : null,
         searchword : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add click event
         var self = this;
         if (this.options.onclick) {
@@ -343,7 +357,7 @@ var Searchbox = Backbone.View.extend({
             });
         }
     },
-    
+
     // element
     _template: function(options) {
         return  '<div class="ui-search">' +
@@ -368,30 +382,30 @@ var Input = Backbone.View.extend({
         cls             : '',
         area            : false
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // set initial value
         if (this.options.value !== undefined) {
             this.value(this.options.value);
         }
-        
+
         // disable input field
         if (this.options.disabled) {
             this.$el.prop('disabled', true);
         }
-        
+
         // hide input field
         if (!this.options.visible) {
             this.$el.hide();
         }
-        
+
         // onchange event handler. fires on user activity.
         var self = this;
         this.$el.on('input', function() {
@@ -400,7 +414,7 @@ var Input = Backbone.View.extend({
             }
         });
     },
-    
+
     // value
     value : function (new_val) {
         if (new_val !== undefined) {
@@ -408,7 +422,7 @@ var Input = Backbone.View.extend({
         }
         return this.$el.val();
     },
-    
+
     // element
     _template: function(options) {
         if (options.area) {
@@ -425,16 +439,16 @@ var Hidden = Backbone.View.extend({
     initialize : function(options) {
         // configure options
         this.options = options;
-        
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // set initial value
         if (this.options.value !== undefined) {
             this.value(this.options.value);
         }
     },
-    
+
     // value
     value : function (new_val) {
         if (new_val !== undefined) {
@@ -442,7 +456,7 @@ var Hidden = Backbone.View.extend({
         }
         return this.$('hidden').val();
     },
-    
+
     // element
     _template: function(options) {
         var tmpl =  '<div id="' + options.id + '" >';
diff --git a/static/scripts/mvc/tools/tools-form.js b/static/scripts/mvc/tools/tools-form.js
index ffe613b0f7d..89ac2d65ca9 100644
--- a/static/scripts/mvc/tools/tools-form.js
+++ b/static/scripts/mvc/tools/tools-form.js
@@ -8,6 +8,21 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tools/tools-form-base', 'mvc/tools
     var View = ToolFormBase.extend({
         // initialize
         initialize: function(options) {
+            // execute button
+            var self = this;
+            var execute = new Ui.Button({
+                icon     : 'fa-check',
+                tooltip  : 'Execute: ' + options.name,
+                title    : 'Execute',
+                cls      : 'btn btn-primary',
+                floating : 'clear',
+                onclick  : function() {
+                    execute.wait();
+                    ToolJobs.submit(self.form, options, function() {
+                        execute.unwait();
+                    });
+                }
+            });
             // add remap button
             if (options.job_id && options.job_remap) {
                 options.inputs['rerun_remap_job_id'] = {
@@ -22,20 +37,10 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tools/tools-form-base', 'mvc/tools
                 }
             }
             // create options dictionary
-            var self = this;
             options = Utils.merge(options, {
                 update_url  : galaxy_config.root + 'api/tools/' + options.id + '/build',
                 buttons     : {
-                    execute : new Ui.Button({
-                        icon     : 'fa-check',
-                        tooltip  : 'Execute: ' + options.name,
-                        title    : 'Execute',
-                        cls      : 'btn btn-primary',
-                        floating : 'clear',
-                        onclick  : function() {
-                            ToolJobs.submit(self.form, options);
-                        }
-                    })
+                    execute : execute
                 }
             });
             ToolFormBase.prototype.initialize.call(this, options);
diff --git a/static/scripts/mvc/tools/tools-jobs.js b/static/scripts/mvc/tools/tools-jobs.js
index c78c9d41112..ccd746630bb 100644
--- a/static/scripts/mvc/tools/tools-jobs.js
+++ b/static/scripts/mvc/tools/tools-jobs.js
@@ -3,7 +3,7 @@
 */
 define(['utils/utils', 'mvc/tools/tools-template'], function(Utils, ToolTemplate) {
 return {
-    submit: function(form, options) {
+    submit: function(form, options, callback) {
         // link this
         var self = this;
 
@@ -20,33 +20,25 @@ return {
         // validate job definition
         if (!this._validation(form, job_def)) {
             console.debug('tools-jobs::submit - Submission canceled. Validation failed.');
+            callback && callback();
             return;
         }
 
         // debug
         console.debug(job_def);
 
-        // show progress modal
-        var user_is_waiting = true;
-        form.modal.show({title: 'Please wait...', body: 'progress', buttons: {
-            'Close' : function () {
-                form.modal.hide();
-                user_is_waiting = false;
-            }
-        }});
-
         // post job
         Utils.request({
             type    : 'POST',
             url     : galaxy_config.root + 'api/tools',
             data    : job_def,
             success : function(response) {
-                form.modal.hide();
+                callback && callback();
                 form.reciept(ToolTemplate.success(response));
                 self._refreshHdas();
             },
             error   : function(response, response_full) {
-                form.modal.hide();
+                callback && callback();
                 if (response && response.message && response.message.data) {
                     var error_messages = form.data.matchResponse(response.message.data);
                     for (var input_id in error_messages) {
@@ -56,7 +48,7 @@ return {
                 } else {
                     // show error message with details
                     console.debug(response);
-                    user_is_waiting && form.modal.show({
+                    response && form.modal.show({
                         title   : 'Job submission failed',
                         body    : ToolTemplate.error(job_def),
                         buttons : {
diff --git a/static/scripts/mvc/ui/ui-misc.js b/static/scripts/mvc/ui/ui-misc.js
index 69fc8672322..f1d49263f34 100644
--- a/static/scripts/mvc/ui/ui-misc.js
+++ b/static/scripts/mvc/ui/ui-misc.js
@@ -12,7 +12,7 @@ define(['utils/utils',
 /**
  *  This class contains backbone wrappers for basic ui elements such as Images, Labels, Buttons, Input fields etc.
  */
- 
+
 // plugin
 var Image = Backbone.View.extend({
     // options
@@ -20,7 +20,7 @@ var Image = Backbone.View.extend({
         url  : '',
         cls  : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
@@ -29,7 +29,7 @@ var Image = Backbone.View.extend({
         // create new element
         this.setElement(this._template(this.options));
     },
-    
+
     // template
     _template: function(options) {
         return '<img class="ui-image ' + options.cls + '" src="' + options.url + '"/>';
@@ -43,7 +43,7 @@ var Label = Backbone.View.extend({
         title  : '',
         cls    : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
@@ -52,17 +52,17 @@ var Label = Backbone.View.extend({
         // create new element
         this.setElement(this._template(this.options));
     },
-    
+
     // title
     title: function(new_title) {
         this.$el.html(new_title);
     },
-    
+
     // template
     _template: function(options) {
         return '<label class="ui-label ' + options.cls + '">' + options.title + '</label>';
     },
-    
+
     // value
     value: function() {
         return options.title;
@@ -80,19 +80,19 @@ var Icon = Backbone.View.extend({
         title       : '',
         cls         : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
     // element
     _template: function(options) {
         return  '<div>' +
@@ -112,37 +112,51 @@ var Button = Backbone.View.extend({
         cls         : 'ui-button btn btn-default',
         icon        : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add event
         $(this.el).on('click', function() {
             // hide all tooltips
             $('.tooltip').hide();
-            
+
             // execute onclick callback
             if (options.onclick) {
                 options.onclick();
             }
         });
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
+    // show spinner
+    wait: function() {
+        this.$el.removeClass(this.options.cls).addClass('btn btn-info').prop('disabled', true);
+        this.$('.icon').removeClass(this.options.icon).addClass('fa-spinner fa-spin');
+        this.$('.title').html('Sending...');
+    },
+
+    // hide spinner
+    unwait: function() {
+        this.$el.removeClass('btn btn-info').addClass(this.options.cls).prop('disabled', false);
+        this.$('.icon').removeClass('fa-spinner fa-spin').addClass(this.options.icon);
+        this.$('.title').html(this.options.title);
+    },
+
     // element
     _template: function(options) {
         var str =   '<button id="' + options.id + '" type="submit" style="float: ' + options.floating + ';" type="button" class="' + options.cls + '">';
         if (options.icon) {
-            str +=      '<i class="icon fa ' + options.icon + '"></i>&nbsp;' ;
+            str +=      '<i class="icon fa ' + options.icon + '"></i>&nbsp;';
         }
-        str +=          options.title +
+        str +=          '<span class="title">' + options.title + '</span>' +
                     '</button>';
         return str;
     }
@@ -160,52 +174,52 @@ var ButtonIcon = Backbone.View.extend({
         tooltip     : '',
         onclick     : null
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // link button element
         this.$button = this.$el.find('.button');
-        
+
         // add event
         var self = this;
         $(this.el).on('click', function() {
             // hide all tooltips
             $('.tooltip').hide();
-            
+
             // execute onclick callback
             if (options.onclick && !self.disabled) {
                 options.onclick();
             }
         });
-        
+
         // add tooltip
         $(this.el).tooltip({title: options.tooltip, placement: 'bottom'});
     },
-    
+
     // disable
     disable: function() {
         this.$button.addClass('disabled');
         this.disabled = true;
     },
-    
+
     // enable
     enable: function() {
         this.$button.removeClass('disabled');
         this.disabled = false;
     },
-    
+
     // change icon
     setIcon: function(icon_cls) {
         this.$('i').removeClass(this.options.icon).addClass(icon_cls);
         this.options.icon = icon_cls;
     },
-    
+
     // template
     _template: function(options) {
         // width
@@ -213,10 +227,10 @@ var ButtonIcon = Backbone.View.extend({
         if (options.title) {
             width = 'width: auto;';
         }
-        
+
         // string
         var str =   '<div id="' + options.uid+ '" style="float: ' + options.floating + '; ' + width + '" class="' + options.cls + '">';
-    
+
         // title
         if (options.title) {
             str +=      '<div class="button">' +
@@ -238,19 +252,19 @@ var Anchor = Backbone.View.extend({
         title  : '',
         cls    : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add event
         $(this.el).on('click', options.onclick);
     },
-    
+
     // element
     _template: function(options) {
         return '<div><a href="javascript:void(0)" class="ui-anchor ' + options.cls + '">' + options.title + '</a></div>';
@@ -265,37 +279,37 @@ var Message = Backbone.View.extend({
         status      : 'info',
         persistent  : false
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // create new element
         this.setElement('<div></div>');
-        
+
         // show initial message
         if (this.options.message) {
             this.update(this.options);
         }
     },
-    
+
     // update
     update : function(options) {
         // get options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // show message
         if (options.message != '') {
             this.$el.html(this._template(this.options));
             this.$el.find('.alert').append(options.message);
             this.$el.fadeIn();
-            
+
             // clear previous timeouts
             if (this.timeout) {
                 window.clearTimeout(this.timeout);
             }
-            
+
             // set timeout if message is not persistent
             if (!options.persistent) {
                 var self = this;
@@ -311,7 +325,7 @@ var Message = Backbone.View.extend({
             this.$el.fadeOut();
         }
     },
-    
+
     // element
     _template: function(options) {
         return '<div class="ui-message alert alert-' + options.status + '"/>';
@@ -325,15 +339,15 @@ var Searchbox = Backbone.View.extend({
         onclick : null,
         searchword : ''
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-        
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // add click event
         var self = this;
         if (this.options.onclick) {
@@ -343,7 +357,7 @@ var Searchbox = Backbone.View.extend({
             });
         }
     },
-    
+
     // element
     _template: function(options) {
         return  '<div class="ui-search">' +
@@ -368,30 +382,30 @@ var Input = Backbone.View.extend({
         cls             : '',
         area            : false
     },
-    
+
     // initialize
     initialize : function(options) {
         // configure options
         this.options = Utils.merge(options, this.optionsDefault);
-            
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // set initial value
         if (this.options.value !== undefined) {
             this.value(this.options.value);
         }
-        
+
         // disable input field
         if (this.options.disabled) {
             this.$el.prop('disabled', true);
         }
-        
+
         // hide input field
         if (!this.options.visible) {
             this.$el.hide();
         }
-        
+
         // onchange event handler. fires on user activity.
         var self = this;
         this.$el.on('input', function() {
@@ -400,7 +414,7 @@ var Input = Backbone.View.extend({
             }
         });
     },
-    
+
     // value
     value : function (new_val) {
         if (new_val !== undefined) {
@@ -408,7 +422,7 @@ var Input = Backbone.View.extend({
         }
         return this.$el.val();
     },
-    
+
     // element
     _template: function(options) {
         if (options.area) {
@@ -425,16 +439,16 @@ var Hidden = Backbone.View.extend({
     initialize : function(options) {
         // configure options
         this.options = options;
-        
+
         // create new element
         this.setElement(this._template(this.options));
-        
+
         // set initial value
         if (this.options.value !== undefined) {
             this.value(this.options.value);
         }
     },
-    
+
     // value
     value : function (new_val) {
         if (new_val !== undefined) {
@@ -442,7 +456,7 @@ var Hidden = Backbone.View.extend({
         }
         return this.$('hidden').val();
     },
-    
+
     // element
     _template: function(options) {
         var tmpl =  '<div id="' + options.id + '" >';
diff --git a/static/scripts/packed/mvc/tools/tools-form.js b/static/scripts/packed/mvc/tools/tools-form.js
index 054668f1066..bb7e267d699 100644
--- a/static/scripts/packed/mvc/tools/tools-form.js
+++ b/static/scripts/packed/mvc/tools/tools-form.js
@@ -1 +1 @@
-define(["utils/utils","mvc/ui/ui-misc","mvc/tools/tools-form-base","mvc/tools/tools-jobs"],function(c,e,b,a){var d=b.extend({initialize:function(g){if(g.job_id&&g.job_remap){g.inputs.rerun_remap_job_id={label:"Resume dependencies from this job",name:"rerun_remap_job_id",type:"select",display:"radio",ignore:"__ignore__",value:"__ignore__",options:[["Yes",g.job_id],["No","__ignore__"]],help:"The previous run of this tool failed and other tools were waiting for it to finish successfully. Use this option to resume those tools using the new output(s) of this tool run."}}var f=this;g=c.merge(g,{update_url:galaxy_config.root+"api/tools/"+g.id+"/build",buttons:{execute:new e.Button({icon:"fa-check",tooltip:"Execute: "+g.name,title:"Execute",cls:"btn btn-primary",floating:"clear",onclick:function(){a.submit(f.form,g)}})}});b.prototype.initialize.call(this,g)}});return{View:d}});
\ No newline at end of file
+define(["utils/utils","mvc/ui/ui-misc","mvc/tools/tools-form-base","mvc/tools/tools-jobs"],function(c,e,b,a){var d=b.extend({initialize:function(g){var f=this;var h=new e.Button({icon:"fa-check",tooltip:"Execute: "+g.name,title:"Execute",cls:"btn btn-primary",floating:"clear",onclick:function(){h.wait();a.submit(f.form,g,function(){h.unwait()})}});if(g.job_id&&g.job_remap){g.inputs.rerun_remap_job_id={label:"Resume dependencies from this job",name:"rerun_remap_job_id",type:"select",display:"radio",ignore:"__ignore__",value:"__ignore__",options:[["Yes",g.job_id],["No","__ignore__"]],help:"The previous run of this tool failed and other tools were waiting for it to finish successfully. Use this option to resume those tools using the new output(s) of this tool run."}}g=c.merge(g,{update_url:galaxy_config.root+"api/tools/"+g.id+"/build",buttons:{execute:h}});b.prototype.initialize.call(this,g)}});return{View:d}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/tools/tools-jobs.js b/static/scripts/packed/mvc/tools/tools-jobs.js
index 453a86c4828..a3ccfb7d51f 100644
--- a/static/scripts/packed/mvc/tools/tools-jobs.js
+++ b/static/scripts/packed/mvc/tools/tools-jobs.js
@@ -1 +1 @@
-define(["utils/utils","mvc/tools/tools-template"],function(b,a){return{submit:function(g,e){var c=this;var f={tool_id:e.id,tool_version:e.version,inputs:g.data.create()};g.trigger("reset");if(!this._validation(g,f)){console.debug("tools-jobs::submit - Submission canceled. Validation failed.");return}console.debug(f);var d=true;g.modal.show({title:"Please wait...",body:"progress",buttons:{Close:function(){g.modal.hide();d=false}}});b.request({type:"POST",url:galaxy_config.root+"api/tools",data:f,success:function(h){g.modal.hide();g.reciept(a.success(h));c._refreshHdas()},error:function(h,j){g.modal.hide();if(h&&h.message&&h.message.data){var k=g.data.matchResponse(h.message.data);for(var i in k){g.highlight(i,k[i]);break}}else{console.debug(h);d&&g.modal.show({title:"Job submission failed",body:a.error(f),buttons:{Close:function(){g.modal.hide()}}})}}})},_validation:function(e,i){var f=i.inputs;var o=-1;var j=null;for(var l in f){var g=f[l];var m=e.data.match(l);var d=e.field_list[m];var k=e.input_list[m];if(!m||!k||!d){console.debug("tools-jobs::_validation - Retrieving input objects failed.");continue}if(!k.optional&&g==null){e.highlight(m);return false}if(g&&g.batch){var h=g.values.length;var c=null;if(h>0){c=g.values[0]&&g.values[0].src}if(c){if(j===null){j=c}else{if(j!==c){e.highlight(m,"Please select either dataset or dataset list fields for all batch mode fields.");return false}}}if(o===-1){o=h}else{if(o!==h){e.highlight(m,"Please make sure that you select the same number of inputs for all batch mode fields. This field contains <b>"+h+"</b> selection(s) while a previous field contains <b>"+o+"</b>.");return false}}}}return true},_refreshHdas:function(){if(parent.Galaxy&&parent.Galaxy.currHistoryPanel){parent.Galaxy.currHistoryPanel.refreshContents()}}}});
\ No newline at end of file
+define(["utils/utils","mvc/tools/tools-template"],function(b,a){return{submit:function(f,d,g){var c=this;var e={tool_id:d.id,tool_version:d.version,inputs:f.data.create()};f.trigger("reset");if(!this._validation(f,e)){console.debug("tools-jobs::submit - Submission canceled. Validation failed.");g&&g();return}console.debug(e);b.request({type:"POST",url:galaxy_config.root+"api/tools",data:e,success:function(h){g&&g();f.reciept(a.success(h));c._refreshHdas()},error:function(h,j){g&&g();if(h&&h.message&&h.message.data){var k=f.data.matchResponse(h.message.data);for(var i in k){f.highlight(i,k[i]);break}}else{console.debug(h);h&&f.modal.show({title:"Job submission failed",body:a.error(e),buttons:{Close:function(){f.modal.hide()}}})}}})},_validation:function(e,i){var f=i.inputs;var o=-1;var j=null;for(var l in f){var g=f[l];var m=e.data.match(l);var d=e.field_list[m];var k=e.input_list[m];if(!m||!k||!d){console.debug("tools-jobs::_validation - Retrieving input objects failed.");continue}if(!k.optional&&g==null){e.highlight(m);return false}if(g&&g.batch){var h=g.values.length;var c=null;if(h>0){c=g.values[0]&&g.values[0].src}if(c){if(j===null){j=c}else{if(j!==c){e.highlight(m,"Please select either dataset or dataset list fields for all batch mode fields.");return false}}}if(o===-1){o=h}else{if(o!==h){e.highlight(m,"Please make sure that you select the same number of inputs for all batch mode fields. This field contains <b>"+h+"</b> selection(s) while a previous field contains <b>"+o+"</b>.");return false}}}}return true},_refreshHdas:function(){if(parent.Galaxy&&parent.Galaxy.currHistoryPanel){parent.Galaxy.currHistoryPanel.refreshContents()}}}});
\ No newline at end of file
diff --git a/static/scripts/packed/mvc/ui/ui-misc.js b/static/scripts/packed/mvc/ui/ui-misc.js
index 3ca257f4300..3cbafecd726 100644
--- a/static/scripts/packed/mvc/ui/ui-misc.js
+++ b/static/scripts/packed/mvc/ui/ui-misc.js
@@ -1 +1 @@
-define(["utils/utils","mvc/ui/ui-select-default","mvc/ui/ui-slider","mvc/ui/ui-options","mvc/ui/ui-drilldown","mvc/ui/ui-button-menu","mvc/ui/ui-button-check","mvc/ui/ui-modal"],function(e,h,i,m,l,r,d,b){var q=Backbone.View.extend({optionsDefault:{url:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options))},_template:function(s){return'<img class="ui-image '+s.cls+'" src="'+s.url+'"/>'}});var j=Backbone.View.extend({optionsDefault:{title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options))},title:function(s){this.$el.html(s)},_template:function(s){return'<label class="ui-label '+s.cls+'">'+s.title+"</label>"},value:function(){return options.title}});var c=Backbone.View.extend({optionsDefault:{floating:"right",icon:"",tooltip:"",placement:"bottom",title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).tooltip({title:s.tooltip,placement:"bottom"})},_template:function(s){return'<div><span class="fa '+s.icon+'" class="ui-icon"/>&nbsp;'+s.title+"</div>"}});var g=Backbone.View.extend({optionsDefault:{id:e.uid(),title:"",floating:"right",cls:"ui-button btn btn-default",icon:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).on("click",function(){$(".tooltip").hide();if(s.onclick){s.onclick()}});$(this.el).tooltip({title:s.tooltip,placement:"bottom"})},_template:function(s){var t='<button id="'+s.id+'" type="submit" style="float: '+s.floating+';" type="button" class="'+s.cls+'">';if(s.icon){t+='<i class="icon fa '+s.icon+'"></i>&nbsp;'}t+=s.title+"</button>";return t}});var o=Backbone.View.extend({optionsDefault:{id:e.uid(),title:"",floating:"right",cls:"ui-button-icon",icon:"",tooltip:"",onclick:null},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));this.$button=this.$el.find(".button");var s=this;$(this.el).on("click",function(){$(".tooltip").hide();if(t.onclick&&!s.disabled){t.onclick()}});$(this.el).tooltip({title:t.tooltip,placement:"bottom"})},disable:function(){this.$button.addClass("disabled");this.disabled=true},enable:function(){this.$button.removeClass("disabled");this.disabled=false},setIcon:function(s){this.$("i").removeClass(this.options.icon).addClass(s);this.options.icon=s},_template:function(s){var t="";if(s.title){t="width: auto;"}var u='<div id="'+s.uid+'" style="float: '+s.floating+"; "+t+'" class="'+s.cls+'">';if(s.title){u+='<div class="button"><i class="icon fa '+s.icon+'"/>&nbsp;<span class="title">'+s.title+"</span></div>"}else{u+='<i class="icon fa '+s.icon+'"/>'}u+="</div>";return u}});var p=Backbone.View.extend({optionsDefault:{title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).on("click",s.onclick)},_template:function(s){return'<div><a href="javascript:void(0)" class="ui-anchor '+s.cls+'">'+s.title+"</a></div>"}});var a=Backbone.View.extend({optionsDefault:{message:null,status:"info",persistent:false},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement("<div></div>");if(this.options.message){this.update(this.options)}},update:function(t){this.options=e.merge(t,this.optionsDefault);if(t.message!=""){this.$el.html(this._template(this.options));this.$el.find(".alert").append(t.message);this.$el.fadeIn();if(this.timeout){window.clearTimeout(this.timeout)}if(!t.persistent){var s=this;this.timeout=window.setTimeout(function(){if(s.$el.is(":visible")){s.$el.fadeOut()}else{s.$el.hide()}},3000)}}else{this.$el.fadeOut()}},_template:function(s){return'<div class="ui-message alert alert-'+s.status+'"/>'}});var f=Backbone.View.extend({optionsDefault:{onclick:null,searchword:""},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));var s=this;if(this.options.onclick){this.$el.on("submit",function(v){var u=s.$el.find("#search");s.options.onclick(u.val())})}},_template:function(s){return'<div class="ui-search"><form onsubmit="return false;"><input id="search" class="form-control input-sm" type="text" name="search" placeholder="Search..." value="'+s.searchword+'"><button type="submit" class="btn search-btn"><i class="fa fa-search"></i></button></form></div>'}});var n=Backbone.View.extend({optionsDefault:{type:"text",placeholder:"",disabled:false,visible:true,cls:"",area:false},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));if(this.options.value!==undefined){this.value(this.options.value)}if(this.options.disabled){this.$el.prop("disabled",true)}if(!this.options.visible){this.$el.hide()}var s=this;this.$el.on("input",function(){if(s.options.onchange){s.options.onchange(s.$el.val())}})},value:function(s){if(s!==undefined){this.$el.val(s)}return this.$el.val()},_template:function(s){if(s.area){return'<textarea id="'+s.id+'" class="ui-textarea '+s.cls+'"></textarea>'}else{return'<input id="'+s.id+'" type="'+s.type+'" value="'+s.value+'" placeholder="'+s.placeholder+'" class="ui-input '+s.cls+'">'}}});var k=Backbone.View.extend({initialize:function(s){this.options=s;this.setElement(this._template(this.options));if(this.options.value!==undefined){this.value(this.options.value)}},value:function(s){if(s!==undefined){this.$("hidden").val(s)}return this.$("hidden").val()},_template:function(t){var s='<div id="'+t.id+'" >';if(t.info){s+="<div>"+t.info+"</div>"}s+='<hidden value="'+t.value+'"/></div>';return s}});return{Anchor:p,Button:g,ButtonIcon:o,ButtonCheck:d,ButtonMenu:r,Icon:c,Image:q,Input:n,Label:j,Message:a,Modal:b,RadioButton:m.RadioButton,Checkbox:m.Checkbox,Radio:m.Radio,Searchbox:f,Select:h,Hidden:k,Slider:i,Drilldown:l}});
\ No newline at end of file
+define(["utils/utils","mvc/ui/ui-select-default","mvc/ui/ui-slider","mvc/ui/ui-options","mvc/ui/ui-drilldown","mvc/ui/ui-button-menu","mvc/ui/ui-button-check","mvc/ui/ui-modal"],function(e,h,i,m,l,r,d,b){var q=Backbone.View.extend({optionsDefault:{url:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options))},_template:function(s){return'<img class="ui-image '+s.cls+'" src="'+s.url+'"/>'}});var j=Backbone.View.extend({optionsDefault:{title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options))},title:function(s){this.$el.html(s)},_template:function(s){return'<label class="ui-label '+s.cls+'">'+s.title+"</label>"},value:function(){return options.title}});var c=Backbone.View.extend({optionsDefault:{floating:"right",icon:"",tooltip:"",placement:"bottom",title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).tooltip({title:s.tooltip,placement:"bottom"})},_template:function(s){return'<div><span class="fa '+s.icon+'" class="ui-icon"/>&nbsp;'+s.title+"</div>"}});var g=Backbone.View.extend({optionsDefault:{id:e.uid(),title:"",floating:"right",cls:"ui-button btn btn-default",icon:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).on("click",function(){$(".tooltip").hide();if(s.onclick){s.onclick()}});$(this.el).tooltip({title:s.tooltip,placement:"bottom"})},wait:function(){this.$el.removeClass(this.options.cls).addClass("btn btn-info").prop("disabled",true);this.$(".icon").removeClass(this.options.icon).addClass("fa-spinner fa-spin");this.$(".title").html("Sending...")},unwait:function(){this.$el.removeClass("btn btn-info").addClass(this.options.cls).prop("disabled",false);this.$(".icon").removeClass("fa-spinner fa-spin").addClass(this.options.icon);this.$(".title").html(this.options.title)},_template:function(s){var t='<button id="'+s.id+'" type="submit" style="float: '+s.floating+';" type="button" class="'+s.cls+'">';if(s.icon){t+='<i class="icon fa '+s.icon+'"></i>&nbsp;'}t+='<span class="title">'+s.title+"</span></button>";return t}});var o=Backbone.View.extend({optionsDefault:{id:e.uid(),title:"",floating:"right",cls:"ui-button-icon",icon:"",tooltip:"",onclick:null},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));this.$button=this.$el.find(".button");var s=this;$(this.el).on("click",function(){$(".tooltip").hide();if(t.onclick&&!s.disabled){t.onclick()}});$(this.el).tooltip({title:t.tooltip,placement:"bottom"})},disable:function(){this.$button.addClass("disabled");this.disabled=true},enable:function(){this.$button.removeClass("disabled");this.disabled=false},setIcon:function(s){this.$("i").removeClass(this.options.icon).addClass(s);this.options.icon=s},_template:function(s){var t="";if(s.title){t="width: auto;"}var u='<div id="'+s.uid+'" style="float: '+s.floating+"; "+t+'" class="'+s.cls+'">';if(s.title){u+='<div class="button"><i class="icon fa '+s.icon+'"/>&nbsp;<span class="title">'+s.title+"</span></div>"}else{u+='<i class="icon fa '+s.icon+'"/>'}u+="</div>";return u}});var p=Backbone.View.extend({optionsDefault:{title:"",cls:""},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement(this._template(this.options));$(this.el).on("click",s.onclick)},_template:function(s){return'<div><a href="javascript:void(0)" class="ui-anchor '+s.cls+'">'+s.title+"</a></div>"}});var a=Backbone.View.extend({optionsDefault:{message:null,status:"info",persistent:false},initialize:function(s){this.options=e.merge(s,this.optionsDefault);this.setElement("<div></div>");if(this.options.message){this.update(this.options)}},update:function(t){this.options=e.merge(t,this.optionsDefault);if(t.message!=""){this.$el.html(this._template(this.options));this.$el.find(".alert").append(t.message);this.$el.fadeIn();if(this.timeout){window.clearTimeout(this.timeout)}if(!t.persistent){var s=this;this.timeout=window.setTimeout(function(){if(s.$el.is(":visible")){s.$el.fadeOut()}else{s.$el.hide()}},3000)}}else{this.$el.fadeOut()}},_template:function(s){return'<div class="ui-message alert alert-'+s.status+'"/>'}});var f=Backbone.View.extend({optionsDefault:{onclick:null,searchword:""},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));var s=this;if(this.options.onclick){this.$el.on("submit",function(v){var u=s.$el.find("#search");s.options.onclick(u.val())})}},_template:function(s){return'<div class="ui-search"><form onsubmit="return false;"><input id="search" class="form-control input-sm" type="text" name="search" placeholder="Search..." value="'+s.searchword+'"><button type="submit" class="btn search-btn"><i class="fa fa-search"></i></button></form></div>'}});var n=Backbone.View.extend({optionsDefault:{type:"text",placeholder:"",disabled:false,visible:true,cls:"",area:false},initialize:function(t){this.options=e.merge(t,this.optionsDefault);this.setElement(this._template(this.options));if(this.options.value!==undefined){this.value(this.options.value)}if(this.options.disabled){this.$el.prop("disabled",true)}if(!this.options.visible){this.$el.hide()}var s=this;this.$el.on("input",function(){if(s.options.onchange){s.options.onchange(s.$el.val())}})},value:function(s){if(s!==undefined){this.$el.val(s)}return this.$el.val()},_template:function(s){if(s.area){return'<textarea id="'+s.id+'" class="ui-textarea '+s.cls+'"></textarea>'}else{return'<input id="'+s.id+'" type="'+s.type+'" value="'+s.value+'" placeholder="'+s.placeholder+'" class="ui-input '+s.cls+'">'}}});var k=Backbone.View.extend({initialize:function(s){this.options=s;this.setElement(this._template(this.options));if(this.options.value!==undefined){this.value(this.options.value)}},value:function(s){if(s!==undefined){this.$("hidden").val(s)}return this.$("hidden").val()},_template:function(t){var s='<div id="'+t.id+'" >';if(t.info){s+="<div>"+t.info+"</div>"}s+='<hidden value="'+t.value+'"/></div>';return s}});return{Anchor:p,Button:g,ButtonIcon:o,ButtonCheck:d,ButtonMenu:r,Icon:c,Image:q,Input:n,Label:j,Message:a,Modal:b,RadioButton:m.RadioButton,Checkbox:m.Checkbox,Radio:m.Radio,Searchbox:f,Select:h,Hidden:k,Slider:i,Drilldown:l}});
\ No newline at end of file