Fix issue with disabled buttons. Closes #15