General updates, page templates added