Payments controller out, loans controller in =)
Improved formatter again
Merge branch 'ux' into parser