Re-organise and add info about invoice signups