Merge pull request #7 from DeX3/qa

Navigation now actually works