Updated the categories field to include the same markup as the component so styling is easier.