Revert "Finished static/slightly dynamic pages"

This reverts commit a0c837557d763c78fd15465be5722bb390261e2c.
Finished static pages (again) - no tests