Fix paging and add invoice stuff.