Fix possible issue on payments page

- Also combine document generation into drop down
Merge pull request #46 from pajcho/development

Fix possible issue on payments page