Revert "Revert "navbar""

This reverts commit 07e6508ac77df3308e781ae9c05daa0231fafa7f.