Structural change to Invoice Page2