added dwolla button, still more clean-up