Add a component tag and restructure the navigation.