fixup navbar widgets

Change-Id: Ib2f07a1de4c491d1fbfc5e97dea95f83e9edec53
Merge "fixup navbar widgets" into jb43