Merged changes from latest updates to _s
Customized the header template
Restored the "complete" prototype, which somehow got accidentally deleted. #BlameGit