Update Navbar PS17 - do not merge

Change-Id: I26fd3f2a7e7c49b6b5b355a124a7102b92ec4605
Revert "Update Navbar PS17 - do not merge"

This reverts commit 92f58e7f914d0dafb5deafae6d6a456c28e9229f.