Better page creation, working on cleaning up/fixing templating