Invoice Texts Page 1 refactored, Page 2 refactoring started