Various updates, particularly with page templates