Fixes the content structure for some components