Template goodness
Merge remote-tracking branch 'upstream/pr/16'
removed nav dropdown