Refactored code & added some new page templates.