Invoice page 2 code update and tidy