Fixing payFee button
Merge branch 'fix-fee-payer'