Revert "mostly working with old page"

This reverts commit 236da6d275cb514b1441eb12cca388e9f8aef878.