Update page module to new version

Please check it, if changes is good please margin it