Fixes to NavigationBarView

Change-Id: If06c2454a0420dba3a855335307ef8505a95ab5e