Nav bar highlights

Change-Id: Ib7e8660675616066d844a5236565d93a4099d054