Added payment items to printed invoice.
Also refactored the way it calculates number of pages. No pre-processing this time
Fixed display and search in the Invoice listing