incorporated Faye's work on single button click handler

and fixed a bug for new withdrawl