Merge pull request #11457 from mukeshcompucorp/fix-page-structure