Revert "Cleanup of page"

This reverts commit b80a23aaf3274aa604861baad7cf487277ed024d.