Revert "Fix 1/2 for navbar"

This reverts commit 56517cd040b7eacb63866a9c9e8fb932cee11a62.
fix navbar 2/2