Added disabled buttons and Cancel