fixed subscriptions, added navbar
Merge pull request #2 from scotthillson/scotts-branch

fixed subscriptions, added navbar