Shared page refactor