Changes to add navigation bar