Merge pull request #725 from leider/master

payment views now self containing
Merge commit 'e458b52746ecb5bc08cbde2578d8fc99118b12ab'