Removed header in App, added Site header and footer and restyled headernav.
Removed bug where progression was going backwards when modifying previous choices