Revert "navbar changes"

This reverts commit 3f720e92601d81bf78fdafc2fdeaddbd486ce935.
Revert "Revert "navbar changes""

This reverts commit 8ed082d86d756212cef7035663e564b7877c07f1.
..