No longer need to double click on buttons