Merge pull request #36 from yurikuzn/fixes

New portion of fixes and enhancements
Navigation fixes