More work on invoice page