Merge pull request #14 from Waterfox/David

Merge changes.
Started implementing extending templates in several pages (all tested) plus did some formatting. Took 50 minutes.