[TASK] Make the submit button clicks less fragile