Rework navbar logic

We wiped out google's code, that's never good

Change-Id: Ic407f0b301bcb1c10b2e38de8c56a5bcdc6add26