Added disabling of buttons