cleaning up a few things and setting up a new invoice page