Invoice page 2 & templates code update and tidy