Wrap navbar in container class

Change-Id: Ia7208fd93fa42039da7b568a16c18fd9d5ff5ca5
Merge "Wrap navbar in container class"