Added a template for information pages.
Resolved some merge conflicts.