Updated layouts to display categories based on NavigationCategories.