navigation updates
Merge pull request #35 from shutter111/master

navigation updates