remove click on grid button and add wait