fixes and started navigation
navigation
Merge pull request #12 from 28msec/navigation

Navigation