Added button disabling and multiple run support