Pages and templating improvements