BUGFIX layout incorrectly calculated 23-24
defaults renamed to refer to payment
Payment refactoring