Merged changes from the product page update + header into the master
Versioning