Revert "some code cleanup, added page numbers to page titles"

This reverts commit 78da01406e0f00d3f2ee103983ae770ee378ede8.