Improve navi #1

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