Fix create_payment
Clean up fund view code. Other fixes and beautifications
Small fixes