Improve navi #1

Open
vulporuza wants to merge 16 commits from improve-navi into master
16 Commits