Restructure templating to allow for more flexible pages