Merge "Add navigation bar story"