Added button disabling