Basic navigation work completed
Merge pull request #10 from nhr/template_work

Basic navigation work completed