added tags for the different types of components. grouping at the menu level.