Fixed page numbering
Revert "Fixed page numbering"

This reverts commit 0c0746a0e9190a9cfde1698e61c09e41c7405689.
Revert "Revert "Fixed page numbering""

This reverts commit 82cfb0e62c354a343e6015c1ec0138a8f138a78a.