(no ticket) Fix navbar styling

Change-Id: I8aca7b7f1036fc25c765b67587bf1ab5167fab8c
Merge "(no ticket) Fix navbar styling"