Changed button variables from form to button