Few NavBar fixes

Change-Id: I9e80dee51b1db9999da3ee999aca9a999aca644f