Navigation Improvements

fixes #8