revamp navbar

Change-Id: Ice3ca1d25f4a53215ab2c6e34d62a7f3db01f19f