Tweaks to Component listing.