Merge pull request #5 from MorganAJ/master

Nav + feed fix