Improve the pass button