Fix possible issue on payments page

- Also combine document generation into drop down