Revert "Navbar: fixes & blank target"

This reverts commit 940305993dc848f8d525cd7532e932b12e461fef
Merge "Revert "Navbar: fixes & blank target"" into jb42