Fixed button click bugs...