re-organized page templates