Add navbar

Change-Id: I6ee6da1a523699a395cd3511a0262acc9ad29cc2
Merge "Add navbar"